泛型和迭代器

zhiyuan0101 · zhiyuan0101 · commit 749c2856ea7f · 2017-02-25T17:42:28.000+08:00
diff --git a/group17/1264835468/src/assignment/BinaryTree.java b/group17/1264835468/src/assignment/BinaryTree.java
@@ -77,6 +77,7 @@ public BinaryTreeNode<T> deQueue() {
 			throw new QueueIsEmptyException();
 		}
 
+		// 把所有出队节点放进另一个队列中
 		public MyQueue<BinaryTreeNode<T>> getResult() {
 			prepare();
 			MyQueue<BinaryTreeNode<T>> result = new MyQueue<>();
@@ -86,20 +87,21 @@ public MyQueue<BinaryTreeNode<T>> getResult() {
 			return result;
 		}
 
+		private void prepare() {
+			clearQueue();
+			enQueue(root);
+		}
+
 		public void clearQueue() {
 			while (!isEmpty()) {
 				deQueue();
 			}
 		}
 
-		private void prepare() {
-			clearQueue();
-			enQueue(root);
-		}
-
 		@Override
 		public String toString() {
 			StringBuilder stringBuilder = new StringBuilder();
+
 			Iterator<BinaryTreeNode<T>> iterator = iterator();
 			while (iterator.hasNext()) {
 				stringBuilder.append(iterator.next() + "\n");
@@ -114,16 +116,26 @@ public Iterator<BinaryTreeNode<T>> iterator() {
 	}
 
 	private class BFSIterator implements Iterator<BinaryTreeNode<T>> {
-		MyQueue<BinaryTreeNode<T>> BFSQueue = new BFSNodeQueue().getResult();
+		MyArrayList<BinaryTreeNode<T>> list;
+		Iterator<BinaryTreeNode<T>> iterator;
+
+		public BFSIterator() {
+			MyQueue<BinaryTreeNode<T>> BFSQueue = new BFSNodeQueue().getResult();
+			list = new MyArrayList<>();
+			while (!BFSQueue.isEmpty()) {
+				list.add(BFSQueue.deQueue());
+			}
+			iterator = list.iterator();
+		}
 
 		@Override
 		public boolean hasNext() {
-			return !BFSQueue.isEmpty();
+			return iterator.hasNext();
 		}
 
 		@Override
 		public BinaryTreeNode<T> next() {
-			return BFSQueue.deQueue();
+			return iterator.next();
 		}
 	}
 
diff --git a/group17/1264835468/src/assignment/Iterable.java b/group17/1264835468/src/assignment/Iterable.java
@@ -0,0 +1,5 @@
+package assignment;
+
+public interface Iterable<T> {
+	Iterator<T> iterator();
+}
diff --git a/group17/1264835468/src/assignment/List.java b/group17/1264835468/src/assignment/List.java
@@ -0,0 +1,13 @@
+package assignment;
+
+public interface List<E> {
+	public void add(E o);
+
+	public void add(int index, E o);
+
+	public E get(int index);
+
+	public E remove(int index);
+
+	public int size();
+}
