pre-merge commit

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

@@ -11,21 +11,18 @@ public class SimpleStringGroup {
         throw new UnsupportedOperationException("Method not yet implemented");
     }
 
-    Set<String> str = new HashSet<String>();
+    Set<String> set = new HashSet<String>();
 
     public Integer count() {
-        return str.size();
+        return set.size();
     }
 
     public void insert(String string) {
-        str.add(string);
+        set.add(string);
     }
 
     public Boolean has(String valueToInsert) {
-        if (str.contains(valueToInsert)){
-            return true;
-        }
-        return false;
+        return set.contains(valueToInsert);
     }
 
     public String fetch(int indexOfValue) {
@@ -33,10 +30,10 @@ public class SimpleStringGroup {
     }
 
     public void delete(String valueToInsert) {
-        str.remove(valueToInsert);
+        set.remove(valueToInsert);
     }
 
     public void clear() {
-        str.clear();
+        set.clear();
     }
 }

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

@@ -4,21 +4,17 @@ import rocks.zipcode.io.quiz4.objectorientation.Student;
 
 import java.util.HashMap;
 import java.util.Map;
-
 /**
  * @author leon on 11/12/2018.
  */
 public class ZipCodeWilmington {
     Map<Student, Double> stud = new HashMap<>();
     public void enroll(Student student) {
-        stud.size();
+        stud.put(student,1.0);
     }
 
     public Boolean isEnrolled(Student student) {
-        if (student != null) {
-            return true;
-        }
-        return false;
+        return student != null;
     }
 
     public void lecture(double numberOfHours) {

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

@@ -1,6 +1,5 @@
 package rocks.zipcode.io.quiz4.fundamentals;
 
-import java.util.Map;
 import java.util.TreeMap;
 
 /**
@@ -53,12 +52,12 @@ public class PalindromeEvaluator {
         }
         // printing all distinct palindromes from
         // hash map
-        for (Map.Entry<String, Integer> ii : m.entrySet()) {
-            System.out.println(ii.getKey());
-        }
-    return new String[]{m.toString()};
+//        for (Map.Entry<String, Integer> ii : m.entrySet()) {
+//            System.out.println(ii.getKey());
+//        }
+       return new String[]{m.toString()};
 
- }
+    }
 
     public static Boolean isPalindrome(String string) {
         int n = string.length();

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

@@ -1,5 +1,4 @@
 package rocks.zipcode.io.quiz4.fundamentals;
-
 /**
  * @author leon on 11/12/2018.
  */
@@ -11,6 +10,7 @@ public class StringEvaluator {
             output[index] = "" + string ;
         }
         return output;
+
     }
 
     public static String[] getCommonPrefixes(String string1, String string2) {

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

@@ -1,8 +1,6 @@
 package rocks.zipcode.io.quiz4.generics;
 
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 
 /**
  * @author leon on 18/12/2018.
@@ -12,21 +10,24 @@ public class Group<T> {
         throw new UnsupportedOperationException("Method not yet implemented");
     }
 
-    Set<T> set;
+    //Set<T> set;
+    private Group<T> group ;
 
-    public Group(Set<T> set) {
-        this.set = set;
+    public Group(Group<T> group) {
+        this.group = group;
     }
 
     public Integer count() {
-        return null;
+       return group.count();
     }
 
     public void insert(T value) {
+        group.insert(value);
     }
 
     public Boolean has(T value) {
-        return set.contains(value);
+        return group.has(value);
+
     }
 
     public T fetch(int indexOfValue) {
@@ -35,6 +36,8 @@ public class Group<T> {
     }
 
     public void delete(T value) {
+        //set.remove(value);
+
     }
 
     public void clear() {
@@ -43,4 +46,11 @@ public class Group<T> {
     public Iterator<T> iterator() {
         return null;
     }
+
+    @Override
+    public String toString() {
+        return "Group{" +
+                "group=" + group +
+                '}';
+    }
 }

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

@@ -10,11 +10,9 @@ public class MyStack<SomeType> {
         throw new UnsupportedOperationException("Method not yet implemented");
     }
 
-    Stack<SomeType> stack = new Stack<>();
+    private SomeType[] array;
 
-    public MyStack(Stack<SomeType> stack) {
-        this.stack = stack;
-    }
+    Stack stack = new Stack();
 
     public Boolean isEmpty() {
         return stack.isEmpty();
@@ -31,6 +29,7 @@ public class MyStack<SomeType> {
     }
 
     public SomeType pop() {
-        return stack.pop();
+        //return stack.pop();
+        return null;
     }
 }

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<T> extends Group<T> {
     @Override
-    public void insert(_ value) {
+    public void insert(T value) {
     }
 
     @Override
-    public void delete(_ value) {
+    public void delete(T value) {
     }
 
-    public Integer indexOf(_ firstValue) {
+    public Integer indexOf(T firstValue) {
         return null;
     }
 }

src/main/java/rocks/zipcode/io/quiz4/objectorientation/PalindromeObject.java

@@ -4,7 +4,14 @@ package rocks.zipcode.io.quiz4.objectorientation;
  * @author leon on 18/12/2018.
  */
 public class PalindromeObject {
+    private String input;
+
+    public String getInput() {
+        return input;
+    }
+
     public PalindromeObject(String input) {
+        this.input = input;
     }
 
     public String[] getAllPalindromes(){
@@ -12,14 +19,17 @@ public class PalindromeObject {
     }
 
     public Boolean isPalindrome(){
-//        if () {
-//            return true;
-//        }
-        return false;
+        int n = input.length();
+        for (int i = 0; i < (n/2); ++i) {
+            if (input.charAt(i) != input.charAt(n - i - 1)) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     public String reverseString(){
-        String input = " ";
         StringBuilder str = new StringBuilder();
         str.append(input);
         str = str.reverse();