added iterator for improved array

Eugene Karpenko · Eugene Karpenko · commit 927209cf74e3 · 2015-05-07T23:54:46.000+03:00
diff --git a/src/com/hillel/java/dataStructures/ArrayIterator.java b/src/com/hillel/java/dataStructures/ArrayIterator.java
@@ -0,0 +1,27 @@
+package com.hillel.java.dataStructures;
+
+import com.hillel.java.dataStructures.arrayList.ImprovedArray;
+
+import java.util.Iterator;
+
+/**
+ * Created by Eugene Karpenko on 25.04.2015.
+ */
+public class ArrayIterator implements Iterator {
+    private int pointer;
+    private IDataStructure dataStructure;
+
+    public ArrayIterator(IDataStructure dataStructure) {
+        this.dataStructure = dataStructure;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return pointer < dataStructure.size();
+    }
+
+    @Override
+    public Object next() {
+        return dataStructure.get(pointer++);
+    }
+}
diff --git a/src/com/hillel/java/dataStructures/arrayList/ImprovedArray.java b/src/com/hillel/java/dataStructures/arrayList/ImprovedArray.java
@@ -1,13 +1,15 @@
 package com.hillel.java.dataStructures.arrayList;
 
+import com.hillel.java.dataStructures.ArrayIterator;
 import com.hillel.java.dataStructures.IDataStructure;
 
 import java.util.Arrays;
+import java.util.Iterator;
 
 /**
  * Created by EKarpenko on 15.04.2015.
  */
-public class ImprovedArray implements IDataStructure {
+public class ImprovedArray implements IDataStructure, Iterable {
     private Object[] array = new Object[10];
     private int arrayCounter = 0;
 
@@ -86,10 +88,10 @@ public boolean equals(Object other) {
 
     public String toString() {
         String string = "[";
-        for (int i = 0; i < array.length; i++)
+        for (int i = 0; i < size(); i++)
         {
-            string += array[i] != null ? array[i] : " ";
-            string += (i < array.length - 1 ? ", " : "");
+            string += get(i) != null ? get(i).toString() : " ";
+            string += (i < size() - 1 ? ", " : "");
         }
         string += "]";
         return string;
@@ -100,4 +102,9 @@ private void resize() {
             array = Arrays.copyOf(array, array.length * 2);
         }
     }
+
+    @Override
+    public Iterator iterator() {
+        return new ArrayIterator(this);
+    }
 }
diff --git a/test/ImprovedArrayTest.java b/test/ImprovedArrayTest.java
@@ -44,5 +44,9 @@ public void arrTest() {
         //Assert.assertEquals(null, improvedArray.get(55));
         Assert.assertEquals(12, improvedArray.size());
         Assert.assertTrue("arrays equal", improvedArray2.equals(improvedArray));
+
+        for (Object num:improvedArray) {
+            System.out.println(num);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,9 @@ public void arrTest() {`
`44`	`44`	`//Assert.assertEquals(null, improvedArray.get(55));`
`45`	`45`	`Assert.assertEquals(12, improvedArray.size());`
`46`	`46`	`Assert.assertTrue("arrays equal", improvedArray2.equals(improvedArray));`
	`47`	`+`
	`48`	`+ for (Object num:improvedArray) {`
	`49`	`+ System.out.println(num);`
	`50`	`+ }`
`47`	`51`	`}`
`48`	`52`	`}`