Commit edf84c5

committed

Fixed a bug in the ArrayQueue iterator

1 parent b982482 commit edf84c5Copy full SHA for edf84c5

File tree

+29

-1

lines changed

src/com/jwetherell/algorithms/data_structures
- Queue.java
test/com/jwetherell/algorithms/data_structures/test
- QueueTests.java
- common
  - JavaCollectionTest.java

+29

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ public boolean hasNext() {`
`563`	`563`	`public T next() {`
`564`	`564`	`if (queue.firstIndex+index < queue.lastIndex) {`
`565`	`565`	`last = queue.firstIndex+index;`
`566`		`- return queue.array[queue.firstIndex+index++];`
	`566`	`+ return queue.array[(queue.firstIndex + index++) % queue.array.length];`
`567`	`567`	`}`
`568`	`568`	`return null;`
`569`	`569`	`}`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import static org.junit.Assert.assertTrue;`
`4`	`4`
`5`	`5`	`import java.util.Collection;`
	`6`	`+import java.util.Iterator;`
`6`	`7`
`7`	`8`	`import org.junit.Test;`
`8`	`9`
`@@ -26,6 +27,17 @@ public void testArrayQueue() {`
`26`	`27`	`data.unsorted, data.invalid));`
`27`	`28`	`assertTrue(JavaCollectionTest.testCollection(aCollection, Integer.class, aName,`
`28`	`29`	`data.unsorted, data.sorted, data.invalid));`
	`30`	`+`
	`31`	`+ // Specific test based on bug`
	`32`	`+ aQueue = new Queue.ArrayQueue<Integer>();`
	`33`	`+ for (int i = 0; i < 1024; i++) {`
	`34`	`+ aQueue.offer(i);`
	`35`	`+ }`
	`36`	`+ aQueue.poll();`
	`37`	`+ aQueue.offer(1024);`
	`38`	`+ Iterator it = aQueue.toQueue().iterator();`
	`39`	`+ while (it.hasNext())`
	`40`	`+ it.next();`
`29`	`41`	`}`
`30`	`42`
`31`	`43`	`@Test`
`@@ -40,5 +52,15 @@ public void testLinkedQueue() {`
`40`	`52`	`data.unsorted, data.invalid));`
`41`	`53`	`assertTrue(JavaCollectionTest.testCollection(lCollection, Integer.class, lName,`
`42`	`54`	`data.unsorted, data.sorted, data.invalid));`
	`55`	`+`
	`56`	`+ lQueue = new Queue.LinkedQueue<Integer>();`
	`57`	`+ for (int i = 0; i < 1024; i++) {`
	`58`	`+ lQueue.offer(i);`
	`59`	`+ }`
	`60`	`+ lQueue.poll();`
	`61`	`+ lQueue.offer(1024);`
	`62`	`+ Iterator it = lQueue.toQueue().iterator();`
	`63`	`+ while (it.hasNext())`
	`64`	`+ it.next();`
`43`	`65`	`}`
`44`	`66`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,12 @@ private static <T extends Comparable<T>> boolean addAndRemoveInOrder(Collection<`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ if (!IteratorTest.testIterator(collection.iterator())) {`
	`82`	`+ System.err.println(name+" addAndRemoveInOrder iterator failed.");`
	`83`	`+ Utils.handleError(data,collection);`
	`84`	`+ return false;`
	`85`	`+ }`
	`86`	`+`
`81`	`87`	`for (int i = 0; i < data.length; i++) {`
`82`	`88`	`Integer value = data[i];`
`83`	`89`	`T item = Utils.parseT(value, type);`

Comments

(0)