almost done

src/main/java/rocks/zipcode/quiz5/collections/Food.java

@@ -1,5 +1,6 @@
 package rocks.zipcode.quiz5.collections;
 
+import rocks.zipcode.quiz5.objectorientation.Curry;
 import rocks.zipcode.quiz5.objectorientation.Spice;
 import sun.security.provider.ConfigFile;
 
@@ -21,10 +22,14 @@ public class Food {
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
         Map<SpiceType, Integer> map = new HashMap<>();
         for(Spice spice : spices){
-//            if(!map.containsKey(spice))
-//                map.put(spice, 1);
-//            else
-//                map.put(spice, map.get(spice) +1);
+            if(spice instanceof Curry)
+
+            if(!map.containsKey(spice)){
+                map.put(spice, 1);
+            }
+
+            else
+                map.put(spice, map.get(spice) +1);
         }
         return map;
     }

src/main/java/rocks/zipcode/quiz5/fundamentals/Calculator.java

@@ -1,6 +1,9 @@
 package rocks.zipcode.quiz5.fundamentals;
 
 import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Matcher;
 
 /**
@@ -18,10 +21,12 @@ public class Calculator {
     }
 
     public static Double[] squareRoots(Double... value) {
-        Double[] result = new Double[value.length];
+        List<Double> doubles = new ArrayList<>(Arrays.asList(value));
+         Double[] result = new Double[value.length];
         int index = 0;
         for(Double val : value){
             result[index] = Math.sqrt(val);
+            index++;
         }
         return result;
     }
@@ -31,6 +36,7 @@ public class Calculator {
         int index = 0;
         for(Double val : values){
             result[index] = Double.valueOf(df2.format(Math.pow(val, 2)));
+            index++;
         }
         return result;
     }
@@ -42,7 +48,7 @@ public class Calculator {
 
     public static Double subtract(Double value1, Double value2) {
 
-        return Double.valueOf(df2.format(value1 - value2));
+        return value1 - value2;
     }
 
 

src/main/java/rocks/zipcode/quiz5/fundamentals/StringUtils.java

@@ -63,16 +63,20 @@ public class StringUtils {
     }
 
     public static String removeConsecutiveDuplicateCharacters(String str) {
-       char prev = '\0';
-       int k = 0;
-       char[] chars = str.toCharArray();
-       for(int i=0;i<str.length();i++){
-           if(prev != chars[i]){
-               chars[k++] = chars[i];
-               prev = chars[i];
-           }
-       }
-       return new String(chars).substring(0,k);
+//        char prev = '\0';
+//        int k = 0;
+//        char[] chars = str.toCharArray();
+//
+//        for (int i = 0; i < str.length(); i++)
+//        {
+//            if (prev != chars[i]) {
+//                chars[k++] = chars[i];
+//                prev = chars[i];
+//            }
+//        }
+
+  //      return new String(chars).substring(0, k);
+
 
        /* List<Character> list = new ArrayList<>();
         int index =0;
@@ -85,6 +89,17 @@ public class StringUtils {
 
 
         return list.toArray(new Character[0]).toString();*/
+
+       for(int i=0;i<str.length();i++){
+           if(i+1 < str.length() && str.charAt(i) == str.charAt(i+1))
+           {
+
+           }
+       }
+
+
+
+       return null;
     }
 
     public static String invertCasing(String str) {