working on calc

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

@@ -2,25 +2,21 @@ package rocks.zipcode.quiz5.collections;
 
 import rocks.zipcode.quiz5.objectorientation.Spice;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author leon on 27/12/2018.
  */
 public class Food {
 
-    private Map<Class<? extends Spice>, Integer> spices;
+    private Map<Spice, Integer> spices;
 
     public Food() {
-        this.spices = new HashMap<>();
+        this.spices = new TreeMap<>();
     }
 
     public List<Spice> getAllSpices() {
-        return null;
-       // return new ArrayList<>(spices.keySet());
+       return new ArrayList<>(spices.keySet());
     }
 
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
@@ -28,5 +24,11 @@ public class Food {
     }
 
     public void applySpice(Spice spice) {
+        if (!spices.containsKey(spice)) {
+            spices.put(spice, 1);
+        } else {
+            spices.put(spice, spices.get(spice) + 1);
+        }
     }
+
 }

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

@@ -5,31 +5,38 @@ package rocks.zipcode.quiz5.fundamentals;
  */
 public class Calculator {
     public static Double squareRoot(Double value) {
-        return null;
+        return Math.sqrt(value);
     }
 
     public static Double square(Double value) {
-        return null;
+        return value * value;
     }
 
     public static Double[] squareRoots(Double... value) {
-        return null;
+        for (int i = 0; i < value.length; i++) {
+            value[i] = squareRoot(value[i]);
+        }
+        return value;
     }
 
     public static Double[] squares(Double... values) {
-        return null;
+        for (int i = 0; i < values.length; i++) {
+            values[i] = square(values[i]);
+        }
+        return values;
     }
 
     public static Double add(Double value1, Double value2) {
-        return null;
+        return value1 + value2;
+        // return (Math.floor(value1 + value2) * 100) / 100;
     }
 
     public static Double subtract(Double value1, Double value2) {
-        return null;
+        return value1 - value2;
     }
 
 
     public static Double divide(Double divisor, Double dividend) {
-        return null;
+        return (divisor / dividend);
     }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/Curry.java

@@ -1,4 +1,4 @@
 package rocks.zipcode.quiz5.objectorientation;
 
-public class Curry {
+public class Curry implements Spice {
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/Ginger.java

@@ -3,5 +3,5 @@ package rocks.zipcode.quiz5.objectorientation;
 /**
  * @author leon on 27/12/2018.
  */
-public class Ginger {
+public class Ginger implements Spice {
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/Pepper.java

@@ -3,5 +3,5 @@ package rocks.zipcode.quiz5.objectorientation;
 /**
  * @author leon on 27/12/2018.
  */
-public class Pepper {
+public class Pepper implements Spice {
 }