From 99acb926b2c20648a767b57042f1f8bc91123c49 Mon Sep 17 00:00:00 2001 From: Peter McCormick Date: Thu, 8 Mar 2018 17:43:54 -0500 Subject: [PATCH 1/5] Starting lab --- .idea/.name | 1 + .idea/compiler.xml | 16 + .idea/libraries/Maven__junit_junit_4_12.xml | 13 + .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 + .idea/misc.xml | 13 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 562 ++++++++++++++++++ generics.iml | 16 + src/main/java/.deleteme | 0 src/main/java/MyArrayList.java | 44 ++ src/test/java/.deleteme | 0 src/test/java/MyArrayListTest.java | 61 ++ 13 files changed, 753 insertions(+) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 generics.iml delete mode 100644 src/main/java/.deleteme create mode 100644 src/main/java/MyArrayList.java delete mode 100644 src/test/java/.deleteme create mode 100644 src/test/java/MyArrayListTest.java diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..1f58a0f --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +generics \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..c20d346 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b2526f7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..ca63f44 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..897567c --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,562 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + isEmpty + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + Android + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -200,7 +207,7 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -322,29 +420,44 @@ - - + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + + + + - @@ -358,9 +471,9 @@ - + - + @@ -387,7 +500,7 @@ - @@ -411,10 +524,26 @@ + + + + + + + + + + + + + + + + - + @@ -422,39 +551,29 @@ - - - - - - - - - - + + - - - - - - - - - + + + + + + + + - - + + - diff --git a/generics.iml b/generics.iml index 9717c26..10ba022 100644 --- a/generics.iml +++ b/generics.iml @@ -1,6 +1,6 @@ - + diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java index 3c52eb8..54e0622 100644 --- a/src/main/java/MyArrayList.java +++ b/src/main/java/MyArrayList.java @@ -1,44 +1,74 @@ -import java.util.ArrayList; -import java.util.Collection; +import java.util.Arrays; public class MyArrayList { public E[] myArray; - public MyArrayList(){ - this.myArray = (E[]) new Object(); + public MyArrayList() { + this.myArray = (E[]) new Object[5]; } - public MyArrayList(int size){ + public MyArrayList(int size) { this.myArray = (E[]) new Object[size]; } - public int size() { return myArray.length;} + public int size() { + return myArray.length; + } - public void add(E e, int index){} - public void add(E e){} + public void add(int index, E e) { + E[] myArrayNew = Arrays.copyOf(this.myArray, index + 1); + myArrayNew[index] = e; + this.myArray = myArrayNew; + } - public void addAll(Collection c){} + public void add(E e) { + E[] myArrayNew = Arrays.copyOf(this.myArray, this.myArray.length + 1); + myArrayNew[myArrayNew.length - 1] = e; + this.myArray = myArrayNew; + } - public E get(int index){ - return null; + public void addAll(E[] c) { + int counter = 0; + E[] combinedArray = Arrays.copyOf(myArray, myArray.length + c.length); + for (int i = myArray.length; i < combinedArray.length; i++ ) { + combinedArray[i] = c[counter]; + counter++; + } this.myArray = combinedArray; } - public void remove(int index){} + public E get(int index) { + return myArray[index]; + } - public void set(E e, int index){} + public void remove(int index) { - public void clear(){} + this.myArray = Arrays.copyOf(this.myArray, this.myArray.length - 1); + } + + public void set(int index, E e) { + myArray[index] = e; + } + + public void clear() { + E[] myClearedArray = Arrays.copyOf(this.myArray, 0); + this.myArray = myClearedArray; + } - public boolean isEmpty(){ - return false; + public boolean isEmpty() { + for (int i = 0; i < myArray.length; i ++) { + if (myArray[i] != null) + return false; + } return true; } - public boolean contains(E e){ - return false; + public boolean contains(E e) { + for (int i = 0; i < myArray.length; i++) { + if (myArray[i] == e) return true; + } return false; } } diff --git a/src/test/java/MyArrayListTest.java b/src/test/java/MyArrayListTest.java index bc8f92a..cfe19e7 100644 --- a/src/test/java/MyArrayListTest.java +++ b/src/test/java/MyArrayListTest.java @@ -1,61 +1,228 @@ import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; - public class MyArrayListTest { @Test - public void addTest() { + public void addIntegerTest() { //Given - MyArrayList testArray = new MyArrayList(3); + MyArrayList testArray = new MyArrayList<>(); //When - int expected = 4; + int expected = 6; testArray.add(1); + int actual = testArray.size(); //Then + Assert.assertEquals(expected, actual); + } + + @Test + public void addStringTest() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + int expected = 6; + testArray.add("Ain't no thang!"); int actual = testArray.size(); + //Then Assert.assertEquals(expected, actual); } @Test - public void addTest2() { + public void addIntegerTestTwoArgs() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + int expected = 7; + testArray.add(6, 22); + int actual = testArray.size(); + //Then + Assert.assertEquals(expected, actual); } + @Test + public void addStringTestTwoArgs() { + + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + int expected = 7; + testArray.add(6, "Isn't it ironic?"); + int actual = testArray.size(); + //Then + Assert.assertEquals(expected, actual); + } + @Test public void addAll() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + String[] people = {"Dan Stooser", "Martin Kleadman", "Freudman Rachborn", "Seanly Priborg"}; + testArray.add(0, "Reinhardt Massvender"); + testArray.add(1, "Cloryfa Dergen"); + testArray.add(2, "Sudentra Swalmner"); + testArray.add(3, "Clarrifa Mantfloyva"); + testArray.add(4, "Blunth Deshman"); + testArray.addAll(people); + int expected = 9; + int actual = testArray.size(); + //Then + Assert.assertEquals(expected, actual); + } + @Test + public void addAllIntegers() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + Integer[] people = {12, 21, 344, 3234, 324344}; + testArray.add(0, 98372); + testArray.add(1, 23421); + testArray.add(2, 2343144); + testArray.add(3, 234234322); + testArray.add(4, 2382); + testArray.addAll(people); + int expected = 10; + int actual = testArray.size(); + //Then + Assert.assertEquals(expected, actual); } @Test public void get() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + Assert.assertTrue(testArray.get(3) == null); + //Then + } + @Test + public void getInteger() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + testArray.set(4, 3); + //Then + Assert.assertTrue(testArray.get(4) == 3 ); } @Test public void remove() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + int expected = 4; + testArray.remove(6); + //Then + int actual = testArray.size(); + Assert.assertEquals(expected, actual); + } @Test public void set() { + //Given + MyArrayList testArray = new MyArrayList<>(); + int testIndex = 3; + //When + testArray.set(testIndex, 5); + //Then + Integer expected = 5; + Integer actual = testArray.get(testIndex); + Assert.assertEquals(expected, actual); + } @Test public void clear() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + testArray.clear(); + //Then + Assert.assertTrue(testArray.isEmpty()); + } + @Test + public void isEmptyTrue() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + testArray.add(0, "Hoobastank"); + testArray.add(1, "Coldplay"); + testArray.add(2, "Green Day"); + testArray.add(3, "Blue Jupiter"); + testArray.add(4, "Blue Monday"); + testArray.remove(0); + testArray.remove(1); + testArray.remove(2); + testArray.remove(3); + testArray.remove(4); + //Then + Assert.assertTrue(testArray.isEmpty()); } @Test - public void isEmpty() { + public void isEmptyStringFalse() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + testArray.set(0, "Twilight"); + testArray.set(1, "Princess"); + testArray.set(2, "Filter"); + testArray.set(3, "Zone"); + testArray.set(4, "Sparkle"); + //Then + Assert.assertFalse(testArray.isEmpty()); + } + @Test + public void isEmptyFalse() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + testArray.set(0, 221); + testArray.set(1, 12); + testArray.set(2, 33); + testArray.set(3, 345); + testArray.set(4, 6546); + //Then + Assert.assertFalse(testArray.isEmpty()); } @Test - public void contains() { + public void containsFalse() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + String searchCriteria = "Imperium"; + testArray.set(0, "Twilight"); + testArray.set(1, "Princess"); + testArray.set(2, "Filter"); + testArray.set(3, "Zone"); + testArray.set(4, "Sparkle"); + //Then + Assert.assertFalse(testArray.contains(searchCriteria)); + } + @Test + public void containsTrue() { + //Given + MyArrayList testArray = new MyArrayList<>(); + //When + String searchCriteria = "Imperium"; + testArray.set(0, "Twilight"); + testArray.set(1, "Princess"); + testArray.set(2, searchCriteria); + testArray.set(3, "Zone"); + testArray.set(4, "Sparkle"); + //Then + Assert.assertTrue(testArray.contains(searchCriteria)); } } From 977ec615fafccf65ce3cc3127de7d901aae37e4e Mon Sep 17 00:00:00 2001 From: Peter McCormick Date: Fri, 9 Mar 2018 17:02:50 -0500 Subject: [PATCH 3/5] Recoded part 1 for out of bounds indexes --- .idea/workspace.xml | 214 +++++++++++++++++------------ src/main/java/MyArrayList.java | 62 +++++++-- src/main/java/MySet.java | 77 +++++++++++ src/test/java/MyArrayListTest.java | 76 +++++++++- src/test/java/MySetTest.java | 136 ++++++++++++++++++ 5 files changed, 463 insertions(+), 102 deletions(-) create mode 100644 src/main/java/MySet.java create mode 100644 src/test/java/MySetTest.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1288f89..f4c543d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,9 @@ + + - @@ -17,46 +18,24 @@ - - - - - - - - - - - - - - - + + - - + + - - - - - - - - + - - + + - - - - - + + + @@ -88,6 +67,8 @@ @@ -420,44 +401,44 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - @@ -482,7 +463,7 @@ - + @@ -500,7 +481,7 @@ - @@ -540,6 +521,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -551,33 +592,32 @@ - + - - - - - - - - - - - - + + + - - + + + + + + + + + + diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java index 54e0622..fa55d0b 100644 --- a/src/main/java/MyArrayList.java +++ b/src/main/java/MyArrayList.java @@ -6,69 +6,113 @@ public class MyArrayList { public E[] myArray; public MyArrayList() { + this.myArray = (E[]) new Object[5]; } public MyArrayList(int size) { + this.myArray = (E[]) new Object[size]; } public int size() { - return myArray.length; - } + return this.myArray.length; + } public void add(int index, E e) { + E[] myArrayNew = Arrays.copyOf(this.myArray, index + 1); myArrayNew[index] = e; this.myArray = myArrayNew; } public void add(E e) { + E[] myArrayNew = Arrays.copyOf(this.myArray, this.myArray.length + 1); myArrayNew[myArrayNew.length - 1] = e; this.myArray = myArrayNew; } public void addAll(E[] c) { + int counter = 0; E[] combinedArray = Arrays.copyOf(myArray, myArray.length + c.length); - for (int i = myArray.length; i < combinedArray.length; i++ ) { + + for (int i = myArray.length; i < combinedArray.length; i++) { combinedArray[i] = c[counter]; counter++; - } this.myArray = combinedArray; + } + this.myArray = combinedArray; } public E get(int index) { - return myArray[index]; + + if (myArray.length > index) return myArray[index]; + + return null; } public void remove(int index) { - this.myArray = Arrays.copyOf(this.myArray, this.myArray.length - 1); + if (myArray.length > index && myArray.length > 0) { + + E[] removedArray = Arrays.copyOf(this.myArray, this.myArray.length - 1); + int count = 0; + + for (int i = 0; i < removedArray.length; i++) { + + if (i != index) { + removedArray[count] = myArray[i]; + count++; + } + } + this.myArray = removedArray; + + } + } + + public void remove(E e) { + + E[] removedArray = Arrays.copyOf(this.myArray, this.myArray.length - 1); + int count = 0; + + for (int i = 0; i < removedArray.length; i++) { + + if (myArray != e) { + removedArray[count] = myArray[i]; + count++; + } + } + this.myArray = removedArray; } public void set(int index, E e) { + myArray[index] = e; } public void clear() { + E[] myClearedArray = Arrays.copyOf(this.myArray, 0); this.myArray = myClearedArray; } public boolean isEmpty() { - for (int i = 0; i < myArray.length; i ++) { + + for (int i = 0; i < myArray.length; i++) { if (myArray[i] != null) return false; - } return true; + } + return true; } public boolean contains(E e) { for (int i = 0; i < myArray.length; i++) { if (myArray[i] == e) return true; - } return false; + } + return false; } } diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java new file mode 100644 index 0000000..c7e7781 --- /dev/null +++ b/src/main/java/MySet.java @@ -0,0 +1,77 @@ +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; + +public class MySet { + + public E[] mySet; + + public MySet() { + this.mySet = (E[]) new Object[2]; + } + + public void add(E e) { + if (!contains(e)) { + E[] mySet1 = Arrays.copyOf(mySet, mySet.length + 1); + mySet1[mySet.length -1] = e; + mySet = mySet1; + } + + } + + public void addAll(E[] e) { + + } + + public void clear() { + + } + + public boolean contains(E e) { + return false; + } + + public boolean containsAll(E[] e) { + return false; + } + + public boolean setEquals(E e){ + return false; + } + + public int mySetHashCode() { + return 0; + } + + public boolean isEmpty() { + return false; + } + + public Iterator iterator() { + return null; + } + + public void remove(E e) { + + } + + public void removeAll(E[] e) { + + } + + public E[] retainAll(E[] e) { + return null; + } + + public int size() { + return this.mySet.length; + } + + public E[] toArray() { + return null; + } + + public E[] toArray(E e) { + return null; + } +} diff --git a/src/test/java/MyArrayListTest.java b/src/test/java/MyArrayListTest.java index cfe19e7..e6a2bd8 100644 --- a/src/test/java/MyArrayListTest.java +++ b/src/test/java/MyArrayListTest.java @@ -116,12 +116,76 @@ public void remove() { //Given MyArrayList testArray = new MyArrayList<>(); //When + int expected = 5; + testArray.remove(5); + //Then + int actual = testArray.size(); + Assert.assertEquals(expected, actual); + + } + + @Test + public void removeFalse() { + + MyArrayList testArray = new MyArrayList<>(); + //When + testArray.add(0, "Hoobastank"); + testArray.add(1, "Coldplay"); + testArray.add(2, "Green Day"); + testArray.add(3, "Blue Jupiter"); + testArray.add(4, "Red October"); + testArray.remove(0); + testArray.remove(1); + testArray.remove(2); + testArray.remove(3); + testArray.remove(4); + int expected = 2; + int actual = testArray.size(); + Assert.assertEquals(expected, actual); + + + } + + + @Test + public void removeE() { + + //Given + MyArrayList testArray = new MyArrayList<>(0); + + testArray.add("Heather"); + testArray.add("Heather"); + testArray.add("Cheyenne"); + testArray.add("Heath"); + testArray.add("Heather"); + //When int expected = 4; - testArray.remove(6); + testArray.remove("Heather"); //Then int actual = testArray.size(); Assert.assertEquals(expected, actual); + + } + + @Test + public void removeEDouble() { + + //Given + MyArrayList testArray = new MyArrayList<>(0); + + testArray.add("Heather"); + testArray.add("Heather"); + testArray.add("Cheyenne"); + testArray.add("Heath"); + testArray.add("Heather"); + //When + int expected = 3; + testArray.remove("Heather"); + testArray.remove("Heather"); + //Then + int actual = testArray.size(); + Assert.assertEquals(expected, actual); } @Test @@ -158,12 +222,12 @@ public void isEmptyTrue() { testArray.add(1, "Coldplay"); testArray.add(2, "Green Day"); testArray.add(3, "Blue Jupiter"); - testArray.add(4, "Blue Monday"); - testArray.remove(0); - testArray.remove(1); - testArray.remove(2); - testArray.remove(3); + testArray.add(4, "Red October"); testArray.remove(4); + testArray.remove(3); + testArray.remove(2); + testArray.remove(1); + testArray.remove(0); //Then Assert.assertTrue(testArray.isEmpty()); } diff --git a/src/test/java/MySetTest.java b/src/test/java/MySetTest.java new file mode 100644 index 0000000..beb0acd --- /dev/null +++ b/src/test/java/MySetTest.java @@ -0,0 +1,136 @@ +import org.junit.Assert; +import org.junit.Test; + +public class MySetTest { + + + @Test + public void testAdd(){ + // Given + MySet testSet = new MySet<>(); + // When + testSet.add(12); + testSet.add(2); + testSet.add(2); + testSet.add(12); + // Then + Assert.assertTrue(testSet.size() == 2); + } + + @Test + public void testAddAll(){ + // Given + // When + // Then + } + + @Test + public void testClear() { + // Given + MySet testSet = new MySet<>(); + // When + testSet.clear(); + // Then + Assert.assertTrue(testSet.size() == 0); + + } + + @Test + public void testContains() { + // Given + MySet testSet = new MySet<>(); + // When + testSet.add(212); + testSet.add(112); + testSet.add(231); + Integer valueToBeFound = 231; + // Then + Assert.assertTrue(testSet.contains(231)); + } + + @Test + public void testContainsAll() { + // Given + // When + // Then + } + + @Test + public void testEquals() { + // Given + // When + // Then + } + + @Test + public void testHashCode() { + // Given + // When + // Then + } + + @Test + public void testIsEmpty() { + // Given + // When + // Then + } + + @Test + public void testIterator() { + // Given + // When + // Then + } + + @Test + public void testRemove() { + // Given + // When + // Then + } + + @Test + public void testRemoveAll() { + // Given + // When + // Then + } + + @Test + public void testRetainAll() { + // Given + // When + // Then + } + + @Test + public void testSize() { + // Given + MySet testSet = new MySet<>(); + testSet.add(1); + testSet.add(2); + testSet.add(2); + testSet.add(4); + // When + int expected = 3; + int actual = testSet.size(); + // Then + Assert.assertEquals(expected, actual); + } + + @Test + public void testToArray() { + // Given + // When + // Then + } + + @Test + public void testToArrayTwoArgs() { + // Given + // When + // Then + } + +} From 7f20451e65e2e7d1258bfbf70868639479899959 Mon Sep 17 00:00:00 2001 From: Peter McCormick Date: Fri, 9 Mar 2018 17:28:32 -0500 Subject: [PATCH 4/5] Will go back later and use an arraylength incrementer --- .idea/workspace.xml | 109 +++++++++++++++++---------------- src/main/java/MyArrayList.java | 3 +- 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f4c543d..d8497cc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,7 @@ - - - - - + - + @@ -30,12 +26,14 @@ - + - - - + + + + + @@ -54,6 +52,7 @@ isEmpty get addall + add @@ -69,8 +68,8 @@ @@ -401,7 +400,7 @@ @@ -438,7 +437,7 @@ - @@ -446,13 +445,13 @@ - + - + @@ -513,14 +512,6 @@ - - - - - - - - @@ -544,7 +535,7 @@ - + @@ -554,29 +545,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -600,21 +591,31 @@ - + - - + + + + + + + + + + - + - - - + + + + + diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java index fa55d0b..2de369f 100644 --- a/src/main/java/MyArrayList.java +++ b/src/main/java/MyArrayList.java @@ -1,8 +1,10 @@ +import java.util.ArrayList; import java.util.Arrays; public class MyArrayList { + public E[] myArray; public MyArrayList() { @@ -22,7 +24,6 @@ public int size() { } public void add(int index, E e) { - E[] myArrayNew = Arrays.copyOf(this.myArray, index + 1); myArrayNew[index] = e; this.myArray = myArrayNew; From 93b1ba2fbd7165956b52c0acbdd50992f24d9332 Mon Sep 17 00:00:00 2001 From: Peter McCormick Date: Sat, 10 Mar 2018 20:27:06 -0500 Subject: [PATCH 5/5] Turning in --- .idea/workspace.xml | 346 ++++++++++++++++++----------- src/main/java/MyArrayList.java | 11 +- src/main/java/MySet.java | 67 ++---- src/test/java/MyArrayListTest.java | 44 ++-- src/test/java/MySetTest.java | 109 +++++---- 5 files changed, 337 insertions(+), 240 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d8497cc..6717d07 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,11 @@ + + + + - - + + - - + + @@ -26,13 +30,31 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + @@ -53,6 +75,7 @@ get addall add + iterator @@ -66,10 +89,10 @@ @@ -79,11 +102,11 @@ true DEFINITION_ORDER - -