pre-merge commit

pom.xml

@@ -26,6 +26,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 

src/main/java/rocks/zipcode/io/quiz4/collections/SimpleStringGroup.java

@@ -1,31 +1,45 @@
 package rocks.zipcode.io.quiz4.collections;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 /**
  * @author leon on 11/12/2018.
  */
-public class SimpleStringGroup {
+public class SimpleStringGroup implements Iterable{
+
+    private ArrayList stringList;
+
     public SimpleStringGroup() {
-        throw new UnsupportedOperationException("Method not yet implemented");
+        stringList = new ArrayList<String>();
     }
 
     public Integer count() {
-        return null;
+        return stringList.size();
     }
 
     public void insert(String string) {
+        stringList.add(string);
     }
 
     public Boolean has(String valueToInsert) {
-        return null;
+        return stringList.contains(valueToInsert);
     }
 
     public String fetch(int indexOfValue) {
-        return null;
+        return (String) stringList.get(indexOfValue);
     }
 
     public void delete(String valueToInsert) {
+        stringList.remove(valueToInsert);
     }
 
     public void clear() {
+        stringList.clear();
+    }
+
+    @Override
+    public Iterator iterator() {
+        return stringList.iterator();
     }
 }

src/main/java/rocks/zipcode/io/quiz4/collections/ZipCodeWilmington.java

@@ -2,20 +2,35 @@ package rocks.zipcode.io.quiz4.collections;
 
 import rocks.zipcode.io.quiz4.objectorientation.Student;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
  * @author leon on 11/12/2018.
  */
 public class ZipCodeWilmington {
+
+    private Map<Student, Double> students;
+    private Student student;
+
+    public ZipCodeWilmington() {
+        students = new HashMap<>();
+    }
+
+    public ZipCodeWilmington(Map<Student, Double> students) {
+        this.students = students;
+    }
+
     public void enroll(Student student) {
+        students.put(student, 0.0);
     }
 
     public Boolean isEnrolled(Student student) {
-        return null;
+        return students.containsKey(student);
     }
 
     public void lecture(double numberOfHours) {
+
     }
 
     public Map<Student, Double> getStudyMap() {

src/main/java/rocks/zipcode/io/quiz4/fundamentals/PalindromeEvaluator.java

@@ -1,5 +1,7 @@
 package rocks.zipcode.io.quiz4.fundamentals;
 
+import java.util.ArrayList;
+
 /**
  * @author leon on 18/12/2018.
  */
@@ -9,7 +11,7 @@ public class PalindromeEvaluator {
     }
 
     public static Boolean isPalindrome(String string) {
-        for (int i = 0; i <string.length()/2; i++)
+        for (int i = 0; i <string.length()-1; i++)
             if(string.charAt(i)== string.charAt(string.length()-i)) {
                 return true;
             }

src/main/java/rocks/zipcode/io/quiz4/generics/GenericUtils.java

@@ -1,6 +1,7 @@
 package rocks.zipcode.io.quiz4.generics;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -8,11 +9,11 @@ import java.util.TreeSet;
  * @author leon on 11/12/2018.
  */
 public class GenericUtils {
-    public static <_ extends Comparable> Iterable<Iterable<_>> powerSet(Set<_> originalSet) {
+    public static <T extends Comparable> Iterable<Iterable<T>> powerSet(Set<T> originalSet) {
         return null;
     }
 
-    public static <_ extends Comparable> Iterable<Iterable<_>> powerSet(_... originalSet) {
+    public static <T extends Comparable> Iterable<Iterable<T>> powerSet(T... originalSet) {
         return powerSet(new TreeSet<>(Arrays.asList(originalSet)));
-    }
+   }
 }

src/main/java/rocks/zipcode/io/quiz4/generics/Group.java

@@ -1,37 +1,49 @@
 package rocks.zipcode.io.quiz4.generics;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 
 /**
  * @author leon on 18/12/2018.
  */
-public class Group<_> {
+public class Group<SomeType> implements GroupInterface<SomeType> {
+
+    private ArrayList groupList;
+
     public Group() {
-        throw new UnsupportedOperationException("Method not yet implemented");
+        groupList = new ArrayList<SomeType>();
     }
 
     public Integer count() {
-        return null;
+        return groupList.size();
     }
 
-    public void insert(_ value) {
+    public void insert(SomeType value) {
+        groupList.add(value);
     }
 
-    public Boolean has(_ value) {
-        return null;
+    public Boolean has(SomeType value) {
+        return groupList.contains(value);
     }
 
-    public _ fetch(int indexOfValue) {
-        return null;
+    public SomeType fetch(int indexOfValue) {
+        return (SomeType) groupList.get(indexOfValue);
     }
 
-    public void delete(_ value) {
+    public void delete(SomeType value) {
+        groupList.remove(value);
     }
 
     public void clear() {
+        groupList.clear();
+    }
+
+    public Iterator<SomeType> iterator() {
+        return groupList.iterator();
     }
 
-    public Iterator<_> iterator() {
-        return null;
+    @Override
+    public String toString() {
+        return ""+groupList;
     }
 }

src/main/java/rocks/zipcode/io/quiz4/generics/GroupInterface.java

@@ -3,11 +3,11 @@ package rocks.zipcode.io.quiz4.generics;
 /**
  * @author leon on 18/12/2018.
  */
-public interface GroupInterface<_> extends Iterable<_> {
+public interface GroupInterface<SomeType> extends Iterable<SomeType> {
     Integer count();
-    Boolean has(_ valueToInsert);
-    _ fetch(int indexOfValue);
-    void insert(_ string);
-    void delete(_ valueToInsert);
+    Boolean has(SomeType valueToInsert);
+    SomeType fetch(int indexOfValue);
+    void insert(SomeType string);
+    void delete(SomeType valueToInsert);
     void clear();
 }

src/main/java/rocks/zipcode/io/quiz4/generics/SortedGroup.java

@@ -3,16 +3,16 @@ package rocks.zipcode.io.quiz4.generics;
 /**
  * @author leon on 18/12/2018.
  */
-public class SortedGroup<_> extends Group<_> {
+public class SortedGroup<Type> extends Group<Type> {
     @Override
-    public void insert(_ value) {
+    public void insert(Type value) {
     }
 
     @Override
-    public void delete(_ value) {
+    public void delete(Type value) {
     }
 
-    public Integer indexOf(_ firstValue) {
+    public Integer indexOf(Type firstValue) {
         return null;
     }
 }