From d2168f764bddb2b25bdf4488cc2139fb61e0639a Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:35:54 -0500
Subject: [PATCH 01/36] square

---
 .../java/rocks/zipcode/quiz4/fundamentals/Calculator.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
index 02f2618..85807a6 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
@@ -5,11 +5,13 @@
  */
 public class Calculator {
     public static Double squareRoot(Double value) {
-        return null;
+
+        return value * value;
     }
 
     public static Double square(Double value) {
-        return null;
+
+        return value * value;
     }
 
     public static Double[] squareRoots(Double... value) {

From 4cc6f0bd6239c2c66559291c450cd6974de6d70e Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:36:33 -0500
Subject: [PATCH 02/36] square root

---
 src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
index 85807a6..bd34e5b 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
@@ -6,7 +6,7 @@
 public class Calculator {
     public static Double squareRoot(Double value) {
 
-        return value * value;
+        return Math.sqrt(value);
     }
 
     public static Double square(Double value) {

From c22f1ba033b5d993e096c690e9a57d9adc28c29a Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:37:28 -0500
Subject: [PATCH 03/36] add

---
 .../java/rocks/zipcode/quiz4/fundamentals/Calculator.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
index bd34e5b..af80b4e 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
@@ -15,15 +15,18 @@ public static Double square(Double value) {
     }
 
     public static Double[] squareRoots(Double... value) {
+
         return null;
     }
 
     public static Double[] squares(Double... values) {
+
         return null;
     }
 
     public static Double add(Double value1, Double value2) {
-        return null;
+
+        return value1 + value2;
     }
 
     public static Double subtract(Double value1, Double value2) {

From 95db9eae59d7433fe80761094e8bd8dd005c661f Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:38:05 -0500
Subject: [PATCH 04/36] substract

---
 src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
index af80b4e..a72fddf 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
@@ -30,7 +30,8 @@ public static Double add(Double value1, Double value2) {
     }
 
     public static Double subtract(Double value1, Double value2) {
-        return null;
+
+        return value1 - value2;
     }
 
 

From f047efc4e1193f340659f5b5d413dba77413ca81 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:40:22 -0500
Subject: [PATCH 05/36] add divide

---
 .../java/rocks/zipcode/quiz4/fundamentals/Calculator.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
index a72fddf..24e2d2c 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
@@ -36,6 +36,10 @@ public static Double subtract(Double value1, Double value2) {
 
 
     public static Double divide(Double divisor, Double dividend) {
-        return null;
+
+        if (dividend == 0){
+            return 0.0;
+        }
+        return divisor/dividend;
     }
 }

From 0dc88334657be3920e40e11abb4cc95ef7a0c1e1 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:45:31 -0500
Subject: [PATCH 06/36] squares array

---
 .../rocks/zipcode/quiz4/fundamentals/Calculator.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
index 24e2d2c..d1fe493 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
@@ -1,5 +1,8 @@
 package rocks.zipcode.quiz4.fundamentals;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author leon on 21/12/2018.
  */
@@ -20,8 +23,13 @@ public static Double[] squareRoots(Double... value) {
     }
 
     public static Double[] squares(Double... values) {
+        List<Double> array = new ArrayList<>();
+        Double[] result = new Double[0];
 
-        return null;
+        for(Double each : values){
+            array.add(each * each);
+        }
+        return array.toArray(result);
     }
 
     public static Double add(Double value1, Double value2) {

From 0013150d483abeabb6ed70c8d03958567518b731 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:47:32 -0500
Subject: [PATCH 07/36] square roots

---
 .../java/rocks/zipcode/quiz4/fundamentals/Calculator.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
index d1fe493..395274c 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java
@@ -18,8 +18,13 @@ public static Double square(Double value) {
     }
 
     public static Double[] squareRoots(Double... value) {
+        List<Double> array = new ArrayList<>();
+        Double[] result = new Double[0];
 
-        return null;
+        for(Double each : value){
+            array.add(Math.sqrt(each));
+        }
+        return array.toArray(result);
     }
 
     public static Double[] squares(Double... values) {

From 0447ba7e99895e2fe31b7a305d8b5cf35d0c3b07 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:48:58 -0500
Subject: [PATCH 08/36] middle character

---
 .../java/rocks/zipcode/quiz4/fundamentals/StringUtils.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index 5ec61be..ea6a6a8 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -5,7 +5,8 @@
  */
 public class StringUtils {
     public static Character getMiddleCharacter(String string) {
-        return null;
+        int middle = string.length() / 2;
+        return string.charAt(middle);
     }
 
     public static String capitalizeMiddleCharacter(String str) {

From 203093c30ae2c5379fee05787a09df7d30b851af Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:56:22 -0500
Subject: [PATCH 09/36] capitalize middle

---
 .../zipcode/quiz4/fundamentals/StringUtils.java     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index ea6a6a8..47fb9fd 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -4,13 +4,24 @@
  * @author leon on 21/12/2018.
  */
 public class StringUtils {
+
     public static Character getMiddleCharacter(String string) {
         int middle = string.length() / 2;
         return string.charAt(middle);
     }
 
     public static String capitalizeMiddleCharacter(String str) {
-        return null;
+        String result = "";
+
+        for (int i = 0; i < str.length(); i++){
+            if (i == str.length()/2) {
+                result = result.concat(String.valueOf(str.toUpperCase().charAt(i)));
+            } else {
+                result = result.concat(String.valueOf(str.charAt(i)));
+            }
+        }
+
+        return result;
     }
 
     public static String lowerCaseMiddleCharacter(String str) {

From ca96f451d06a829fb0ce2b202016ebdc5d7010b1 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 17:57:32 -0500
Subject: [PATCH 10/36] lowe case middle

---
 .../zipcode/quiz4/fundamentals/StringUtils.java      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index 47fb9fd..c041ee2 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -25,7 +25,17 @@ public static String capitalizeMiddleCharacter(String str) {
     }
 
     public static String lowerCaseMiddleCharacter(String str) {
-        return null;
+        String result = "";
+
+        for (int i = 0; i < str.length(); i++){
+            if (i == str.length()/2) {
+                result = result.concat(String.valueOf(str.toLowerCase().charAt(i)));
+            } else {
+                result = result.concat(String.valueOf(str.charAt(i)));
+            }
+        }
+
+        return result;
     }
 
     public static Boolean isIsogram(String str) {

From ff3ca81b78869388644d73e0b1dc634186b98f80 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:06:29 -0500
Subject: [PATCH 11/36] remove last element

---
 src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
index 6deaf61..268e411 100644
--- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
@@ -5,6 +5,7 @@
  */
 public class ArrayUtils {
     public static String getMiddleElement(String[] values) {
+
         return null;
     }
 
@@ -13,10 +14,16 @@ public static String[] removeMiddleElement(String[] values) {
     }
 
     public static String getLastElement(String[] values) {
+
         return null;
     }
 
     public static String[] removeLastElement(String[] values) {
-        return null;
+        String [] result = new String[values.length-1];
+
+        for (int i = 0; i < result.length; i++){
+            result[i] = values[i];
+        }
+        return result;
     }
 }
\ No newline at end of file

From 6f55f857a03175f527fa581d6f674722e1f9c312 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:10:52 -0500
Subject: [PATCH 12/36] remove middle element

---
 .../java/rocks/zipcode/quiz4/arrays/ArrayUtils.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
index 268e411..51a6a3b 100644
--- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
@@ -1,5 +1,8 @@
 package rocks.zipcode.quiz4.arrays;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author leon on 01/01/2019.
  */
@@ -10,7 +13,14 @@ public static String getMiddleElement(String[] values) {
     }
 
     public static String[] removeMiddleElement(String[] values) {
-        return null;
+
+        List<String> temp = new ArrayList<>();
+        String[] result = new String[0];
+
+        for (int i = 0; i < values.length; i++){
+            if (i != values.length/2) temp.add(values[i]);
+        }
+        return temp.toArray(result);
     }
 
     public static String getLastElement(String[] values) {

From 885fd4531abad8aac0a1496e13ce3633ac468355 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:11:44 -0500
Subject: [PATCH 13/36] get middle element

---
 src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
index 51a6a3b..b9b8fe8 100644
--- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
@@ -9,7 +9,7 @@
 public class ArrayUtils {
     public static String getMiddleElement(String[] values) {
 
-        return null;
+        return values[values.length/2];
     }
 
     public static String[] removeMiddleElement(String[] values) {

From e8dce5aeb17fa24af13d83ae25ee33fc9ac0bfc4 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:12:23 -0500
Subject: [PATCH 14/36] get last element

---
 src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
index b9b8fe8..df402d0 100644
--- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
@@ -25,7 +25,7 @@ public static String[] removeMiddleElement(String[] values) {
 
     public static String getLastElement(String[] values) {
 
-        return null;
+        return values[values.length-1];
     }
 
     public static String[] removeLastElement(String[] values) {

From 452f76f959537c3d99ef22b5cc5afa3fe9ea3a45 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:25:35 -0500
Subject: [PATCH 15/36] spice test

---
 src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java  | 1 -
 .../java/rocks/zipcode/quiz4/collections/WordCounter.java | 8 ++++++++
 .../rocks/zipcode/quiz4/collections/culonary/Curry.java   | 2 +-
 .../rocks/zipcode/quiz4/collections/culonary/Ginger.java  | 2 +-
 .../rocks/zipcode/quiz4/collections/culonary/Pepper.java  | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
index df402d0..d1b995a 100644
--- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java
@@ -8,7 +8,6 @@
  */
 public class ArrayUtils {
     public static String getMiddleElement(String[] values) {
-
         return values[values.length/2];
     }
 
diff --git a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java
index 2bf5ec2..3fa2e61 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java
@@ -1,12 +1,20 @@
 package rocks.zipcode.quiz4.collections;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class WordCounter {
+
+    Map<String,Integer> words = new HashMap<>();
+
     public WordCounter(String... strings) {
+
     }
 
     public Map<String, Integer> getWordCountMap() {
+
         return null;
     }
 }
diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java
index 199cefc..c6b96b4 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java
@@ -1,4 +1,4 @@
 package rocks.zipcode.quiz4.collections.culonary;
 
-public class Curry {
+public class Curry implements Spice {
 }
diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java
index 3c4e177..ef695be 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java
@@ -3,5 +3,5 @@
 /**
  * @author leon on 27/12/2018.
  */
-public class Ginger {
+public class Ginger implements Spice{
 }
diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java
index 4b771a8..248859f 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java
@@ -3,5 +3,5 @@
 /**
  * @author leon on 27/12/2018.
  */
-public class Pepper {
+public class Pepper implements Spice{
 }

From 44574002aa4585f70b20ca68298061d1b04f99b5 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:29:03 -0500
Subject: [PATCH 16/36] get all spices

---
 .../rocks/zipcode/quiz4/collections/culonary/Food.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
index e06abbc..b7e49a2 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
@@ -1,5 +1,6 @@
 package rocks.zipcode.quiz4.collections.culonary;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -7,8 +8,12 @@
  * @author leon on 27/12/2018.
  */
 public class Food {
+
+    List<Spice> allSpices = new ArrayList<>();
+
     public List<Spice> getAllSpices() {
-        return null;
+
+        return allSpices;
     }
 
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
@@ -16,5 +21,6 @@ public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpi
     }
 
     public void applySpice(Spice spice) {
+        allSpices.add(spice);
     }
 }

From abac05af9471262e99f4d9832170977491fe2a02 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:46:58 -0500
Subject: [PATCH 17/36] account polymorphism

---
 .../java/rocks/zipcode/quiz4/collections/culonary/Food.java     | 2 ++
 .../rocks/zipcode/quiz4/objectorientation/account/Account.java  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
index b7e49a2..2e1a8ee 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
@@ -1,6 +1,7 @@
 package rocks.zipcode.quiz4.collections.culonary;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -17,6 +18,7 @@ public List<Spice> getAllSpices() {
     }
 
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
+
         return null;
     }
 
diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java
index 40eb4a8..3054d6d 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java
@@ -3,7 +3,7 @@
 /**
  * @author leon on 30/12/2018.
  */
-public class Account extends BankAccount {
+public class Account {
     public Long getId() {
         return null;
     }

From f32753e88cc7fcff3cad69d6167e8d9148b68184 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:47:55 -0500
Subject: [PATCH 18/36] add account logic

---
 .../zipcode/quiz4/objectorientation/account/Account.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java
index 3054d6d..f2e7b46 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java
@@ -4,10 +4,14 @@
  * @author leon on 30/12/2018.
  */
 public class Account {
+    private Long id;
+
     public Long getId() {
-        return null;
+
+        return this.id;
     }
 
     public void setId(Long id) {
+        this.id = id;
     }
 }

From 5921d6eab810938898c40138d256af1c4f86fed6 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:48:54 -0500
Subject: [PATCH 19/36] add poly to bank account

---
 .../objectorientation/account/BankAccount.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
index 70ccb74..97d60cc 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
@@ -3,7 +3,23 @@
 /**
  * @author leon on 27/12/2018.
  */
-public class BankAccount {
+public class BankAccount extends Account implements Transactable{
+
     public void setBalance(Double val) {
     }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+
+    }
+
+    @Override
+    public Double getBalance() {
+        return null;
+    }
 }

From c42de8b9034c14bcb0c621900eec6807a9da6148 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 18:50:47 -0500
Subject: [PATCH 20/36] withdraw positive

---
 .../quiz4/objectorientation/account/BankAccount.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
index 97d60cc..c008356 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
@@ -5,21 +5,24 @@
  */
 public class BankAccount extends Account implements Transactable{
 
+    Double accountBalance;
+
     public void setBalance(Double val) {
+        this.accountBalance =val;
     }
 
     @Override
     public void deposit(Double amountToIncreaseBy) {
-
+        accountBalance =+ amountToIncreaseBy;
     }
 
     @Override
     public void withdrawal(Double amountToDecreaseBy) {
-
+        accountBalance -= amountToDecreaseBy;
     }
 
     @Override
     public Double getBalance() {
-        return null;
+        return this.accountBalance;
     }
 }

From a779df10b769d4fba8cfa6a45b8a02739e04fe07 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 19:03:04 -0500
Subject: [PATCH 21/36] finished bank account

---
 .../quiz4/objectorientation/account/BankAccount.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
index c008356..1739f09 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
@@ -1,5 +1,7 @@
 package rocks.zipcode.quiz4.objectorientation.account;
 
+import static java.lang.Math.abs;
+
 /**
  * @author leon on 27/12/2018.
  */
@@ -13,11 +15,16 @@ public void setBalance(Double val) {
 
     @Override
     public void deposit(Double amountToIncreaseBy) {
-        accountBalance =+ amountToIncreaseBy;
+        if (amountToIncreaseBy < 0) throw  new IllegalArgumentException();
+
+        accountBalance += amountToIncreaseBy;
     }
 
     @Override
     public void withdrawal(Double amountToDecreaseBy) {
+        if (abs(amountToDecreaseBy) > this.accountBalance || this.accountBalance == 0){
+            throw new IllegalArgumentException();
+        }
         accountBalance -= amountToDecreaseBy;
     }
 

From 64f2987c8e9c20eddfa314906e12f7db33515dd5 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 19:11:44 -0500
Subject: [PATCH 22/36] Add account

---
 .../quiz4/objectorientation/account/Bank.java | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java
index 0dd4183..e50ebb4 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java
@@ -1,17 +1,30 @@
 package rocks.zipcode.quiz4.objectorientation.account;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author leon on 27/12/2018.
  */
 public class Bank {
-    public BankAccount removeBankAccountByIndex(Integer indexNumber) {
-        return null;
+
+    List<BankAccount> bankAccounts = new ArrayList<>();
+
+    public boolean removeBankAccountByIndex(Integer indexNumber) {
+        BankAccount temp = null;
+
+        if (bankAccounts.size() > 0 && indexNumber <= bankAccounts.size()){
+            temp = bankAccounts.get(indexNumber);
+            bankAccounts.remove(indexNumber);
+        }
+        return bankAccounts.contains(temp);
     }
 
     public void addBankAccount(BankAccount bankAccount) {
+        bankAccounts.add(bankAccount);
     }
 
     public Boolean containsBankAccount(BankAccount bankAccount) {
-        throw new UnsupportedOperationException("Method not yet implemented");
+        return bankAccounts.contains(bankAccount);
     }
 }

From 2f0745587942affecade7002453120a79884a297 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 19:18:11 -0500
Subject: [PATCH 23/36] remove bank

---
 .../rocks/zipcode/quiz4/objectorientation/account/Bank.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java
index e50ebb4..7eff5ff 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java
@@ -15,9 +15,9 @@ public boolean removeBankAccountByIndex(Integer indexNumber) {
 
         if (bankAccounts.size() > 0 && indexNumber <= bankAccounts.size()){
             temp = bankAccounts.get(indexNumber);
-            bankAccounts.remove(indexNumber);
+            bankAccounts.remove(temp);
         }
-        return bankAccounts.contains(temp);
+        return containsBankAccount(temp);
     }
 
     public void addBankAccount(BankAccount bankAccount) {

From c5a2b68963af8badf12ebf0d263d07d4a912131f Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 19:20:04 -0500
Subject: [PATCH 24/36] employee poly

---
 .../objectorientation/account/Employee.java   | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
index 8407f1a..096267d 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
@@ -3,7 +3,8 @@
 /**
  * @author leon on 30/12/2018.
  */
-public class Employee {
+public class Employee implements Worker,Transactable {
+
     public Employee() {
     }
 
@@ -17,4 +18,39 @@ public BankAccount getBankAccount() {
     public void setBankAccount(BankAccount bankAccount) {
 
     }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+
+    }
+
+    @Override
+    public Double getBalance() {
+        return null;
+    }
+
+    @Override
+    public void increaseHoursWorked(Double numberOfHours) {
+
+    }
+
+    @Override
+    public Double getHoursWorked() {
+        return null;
+    }
+
+    @Override
+    public Double getHourlyWage() {
+        return null;
+    }
+
+    @Override
+    public Double getMoneyEarned() {
+        return null;
+    }
 }

From 10dea829dea74a511bd0dfd6b5a7c439330b9806 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 19:41:23 -0500
Subject: [PATCH 25/36] employee constructor

---
 .../account/BankAccount.java                  |  4 +++
 .../objectorientation/account/Employee.java   | 30 +++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
index 1739f09..760d602 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java
@@ -9,6 +9,10 @@ public class BankAccount extends Account implements Transactable{
 
     Double accountBalance;
 
+    public BankAccount(){
+        this.accountBalance = 0.0;
+    }
+
     public void setBalance(Double val) {
         this.accountBalance =val;
     }
diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
index 096267d..ab36b7c 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
@@ -5,23 +5,41 @@
  */
 public class Employee implements Worker,Transactable {
 
+    private Double balance;
+    private BankAccount bankAccount;
+    private Double hoursWorked;
+    private Double hourlyWage;
+
     public Employee() {
+        this.hourlyWage = 35.0;
+        this.hoursWorked = 0.0;
+        this.bankAccount = new BankAccount();
+        this.balance = this.bankAccount.getBalance();
     }
 
     public Employee(BankAccount bankAccount) {
+        this.hourlyWage = 35.0;
+        this.hoursWorked = 0.0;
+        this.bankAccount = bankAccount;
+        this.balance = this.bankAccount.getBalance();
     }
 
     public BankAccount getBankAccount() {
-        return null;
+
+        return this.bankAccount;
     }
 
     public void setBankAccount(BankAccount bankAccount) {
-
+        this.bankAccount = bankAccount;
     }
 
     @Override
     public void deposit(Double amountToIncreaseBy) {
 
+        if (amountToIncreaseBy > 0) {
+            this.balance = +amountToIncreaseBy;
+            this.bankAccount.setBalance(this.balance);
+        }
     }
 
     @Override
@@ -31,7 +49,7 @@ public void withdrawal(Double amountToDecreaseBy) {
 
     @Override
     public Double getBalance() {
-        return null;
+        return this.balance;
     }
 
     @Override
@@ -41,16 +59,16 @@ public void increaseHoursWorked(Double numberOfHours) {
 
     @Override
     public Double getHoursWorked() {
-        return null;
+        return this.hoursWorked;
     }
 
     @Override
     public Double getHourlyWage() {
-        return null;
+        return this.hourlyWage;
     }
 
     @Override
     public Double getMoneyEarned() {
-        return null;
+        return this.hourlyWage * this.hoursWorked;
     }
 }

From ec7ed85973ddfd00331d20e7b81a7248e85f58b3 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 19:45:58 -0500
Subject: [PATCH 26/36] employee deposit

---
 .../zipcode/quiz4/objectorientation/account/Employee.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
index ab36b7c..c290053 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
@@ -37,7 +37,7 @@ public void setBankAccount(BankAccount bankAccount) {
     public void deposit(Double amountToIncreaseBy) {
 
         if (amountToIncreaseBy > 0) {
-            this.balance = +amountToIncreaseBy;
+            this.balance = this.balance + amountToIncreaseBy;
             this.bankAccount.setBalance(this.balance);
         }
     }
@@ -54,7 +54,6 @@ public Double getBalance() {
 
     @Override
     public void increaseHoursWorked(Double numberOfHours) {
-
     }
 
     @Override

From 09f7a4aaa3fa909fd534700abecc8c0f15f3bdd8 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 19:47:24 -0500
Subject: [PATCH 27/36] increase hours worked

---
 .../zipcode/quiz4/objectorientation/account/Employee.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
index c290053..e817647 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
@@ -54,6 +54,9 @@ public Double getBalance() {
 
     @Override
     public void increaseHoursWorked(Double numberOfHours) {
+        if (numberOfHours > 0){
+            this.hoursWorked = this.hoursWorked + numberOfHours;
+        }
     }
 
     @Override

From a036325f08a545f3fee054c22504a7e0b1cdf139 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 20:05:15 -0500
Subject: [PATCH 28/36] inverse casing

---
 .../quiz4/fundamentals/StringUtils.java       | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index c041ee2..ba92686 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -13,8 +13,8 @@ public static Character getMiddleCharacter(String string) {
     public static String capitalizeMiddleCharacter(String str) {
         String result = "";
 
-        for (int i = 0; i < str.length(); i++){
-            if (i == str.length()/2) {
+        for (int i = 0; i < str.length(); i++) {
+            if (i == str.length() / 2) {
                 result = result.concat(String.valueOf(str.toUpperCase().charAt(i)));
             } else {
                 result = result.concat(String.valueOf(str.charAt(i)));
@@ -27,8 +27,8 @@ public static String capitalizeMiddleCharacter(String str) {
     public static String lowerCaseMiddleCharacter(String str) {
         String result = "";
 
-        for (int i = 0; i < str.length(); i++){
-            if (i == str.length()/2) {
+        for (int i = 0; i < str.length(); i++) {
+            if (i == str.length() / 2) {
                 result = result.concat(String.valueOf(str.toLowerCase().charAt(i)));
             } else {
                 result = result.concat(String.valueOf(str.charAt(i)));
@@ -51,6 +51,21 @@ public static String removeConsecutiveDuplicateCharacters(String str) {
     }
 
     public static String invertCasing(String str) {
-        return null;
+        String[] temp = str.split("");
+        String result = "";
+
+        for (int i = 0; i < temp.length; i++) {
+            if (temp[i].toUpperCase().equals(temp[i])) {
+                temp[i] = temp[i].toLowerCase();
+                result = result.concat(temp[i]);
+            } else if (temp[i].toLowerCase().equals(temp[i])) {
+                temp[i] = temp[i].toUpperCase();
+                result = result.concat(temp[i]);
+            } else {
+                result = result.concat(temp[i]);
+            }
+        }
+
+        return result;
     }
 }
\ No newline at end of file

From 2128543fb74e61ffa532f1e908e1a216d6c1a3f1 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 22:33:37 -0500
Subject: [PATCH 29/36] Add word counter

---
 .../zipcode/quiz4/collections/WordCounter.java      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java
index 3fa2e61..1bddc0b 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java
@@ -8,13 +8,22 @@
 public class WordCounter {
 
     Map<String,Integer> words = new HashMap<>();
+    Integer counter;
 
     public WordCounter(String... strings) {
 
+        for (String each : strings){
+            counter = words.get(each);
+            if (counter == null){
+                counter = 1;
+            } else counter ++;
+
+            words.put(each,counter);
+        }
+
     }
 
     public Map<String, Integer> getWordCountMap() {
-
-        return null;
+        return words;
     }
 }

From b9b4106f53ac729b25da99ff5ecae91cbf97dda8 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 22:39:32 -0500
Subject: [PATCH 30/36] add isogram

---
 .../zipcode/quiz4/fundamentals/StringUtils.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index ba92686..eb9650c 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -1,5 +1,8 @@
 package rocks.zipcode.quiz4.fundamentals;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * @author leon on 21/12/2018.
  */
@@ -39,7 +42,16 @@ public static String lowerCaseMiddleCharacter(String str) {
     }
 
     public static Boolean isIsogram(String str) {
-        return null;
+
+        Set<Character> unique = new HashSet<>();
+        for (Character c : str.toCharArray()) {
+            unique.add(c);
+        }
+        if (unique.size() == str.length()) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public static Boolean hasDuplicateConsecutiveCharacters(String str) {

From 491e50cae85fab3bb42fbbb36c67281196f6e85d Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 22:45:35 -0500
Subject: [PATCH 31/36] add has duplicates

---
 .../java/rocks/zipcode/quiz4/fundamentals/StringUtils.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index eb9650c..c9e5eb4 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -55,7 +55,12 @@ public static Boolean isIsogram(String str) {
     }
 
     public static Boolean hasDuplicateConsecutiveCharacters(String str) {
-        return null;
+
+        for (int i = 0; i < str.length() - 1; i++) {
+            if (str.charAt(i) == str.charAt(i + 1))
+                return true;
+        }
+        return false;
     }
 
     public static String removeConsecutiveDuplicateCharacters(String str) {

From 70314afa45fe333e6d09f02f594076f62f7b02f6 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 22:52:11 -0500
Subject: [PATCH 32/36] finished employee

---
 .../quiz4/objectorientation/account/Employee.java      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
index e817647..5bae4f7 100644
--- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
+++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java
@@ -5,7 +5,6 @@
  */
 public class Employee implements Worker,Transactable {
 
-    private Double balance;
     private BankAccount bankAccount;
     private Double hoursWorked;
     private Double hourlyWage;
@@ -14,14 +13,12 @@ public Employee() {
         this.hourlyWage = 35.0;
         this.hoursWorked = 0.0;
         this.bankAccount = new BankAccount();
-        this.balance = this.bankAccount.getBalance();
     }
 
     public Employee(BankAccount bankAccount) {
         this.hourlyWage = 35.0;
         this.hoursWorked = 0.0;
         this.bankAccount = bankAccount;
-        this.balance = this.bankAccount.getBalance();
     }
 
     public BankAccount getBankAccount() {
@@ -37,19 +34,18 @@ public void setBankAccount(BankAccount bankAccount) {
     public void deposit(Double amountToIncreaseBy) {
 
         if (amountToIncreaseBy > 0) {
-            this.balance = this.balance + amountToIncreaseBy;
-            this.bankAccount.setBalance(this.balance);
+            this.bankAccount.deposit(amountToIncreaseBy);
         }
     }
 
     @Override
     public void withdrawal(Double amountToDecreaseBy) {
-
+        this.bankAccount.withdrawal(amountToDecreaseBy);
     }
 
     @Override
     public Double getBalance() {
-        return this.balance;
+        return this.bankAccount.getBalance();
     }
 
     @Override

From a5d03dd8754ce330a47fc02c60cc770c6eb97030 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 23:22:47 -0500
Subject: [PATCH 33/36] almost finished

---
 .../quiz4/fundamentals/StringUtils.java       | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index c9e5eb4..10f84d7 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -1,7 +1,6 @@
 package rocks.zipcode.quiz4.fundamentals;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author leon on 21/12/2018.
@@ -64,7 +63,22 @@ public static Boolean hasDuplicateConsecutiveCharacters(String str) {
     }
 
     public static String removeConsecutiveDuplicateCharacters(String str) {
-        return null;
+        String result = str;
+
+        for (int i = 0; i < str.length() - 1; i++){
+            if (str.charAt(i) == str.charAt(i+1)){
+                result = removedChars(str,str.charAt(i));
+            }
+        }
+        return result;
+    }
+
+    private static String removedChars(String str, Character charToRemove){
+        String result = str;
+
+        result = result.replace(charToRemove.toString(), "");
+
+        return result;
     }
 
     public static String invertCasing(String str) {

From 4a3a01930ce40b266ab36916f00c0128bfe546f5 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 23:26:21 -0500
Subject: [PATCH 34/36] finished remove dups

---
 src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
index 10f84d7..6c2a0bb 100644
--- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
+++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java
@@ -67,7 +67,7 @@ public static String removeConsecutiveDuplicateCharacters(String str) {
 
         for (int i = 0; i < str.length() - 1; i++){
             if (str.charAt(i) == str.charAt(i+1)){
-                result = removedChars(str,str.charAt(i));
+                result = removedChars(result,str.charAt(i));
             }
         }
         return result;

From a2979173720c68877d92963bf23cdc34608599ad Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Mon, 9 Dec 2019 23:35:19 -0500
Subject: [PATCH 35/36] finished lab

---
 .../rocks/zipcode/quiz4/collections/culonary/Food.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
index 2e1a8ee..72e94d1 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
@@ -19,7 +19,12 @@ public List<Spice> getAllSpices() {
 
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
 
-        return null;
+        Map<SpiceType, Integer> spiceCountMap = new HashMap<>();
+        SpiceType spice = (SpiceType)this.allSpices.get(0).getClass();
+        Integer spiceCount = this.allSpices.size();
+
+        spiceCountMap.put(spice,spiceCount);
+        return spiceCountMap;
     }
 
     public void applySpice(Spice spice) {

From 534aad55895a1ee870955b24e4635427a1a4d4a4 Mon Sep 17 00:00:00 2001
From: jeanvalentin51 <valentin.j.gheorghe.com>
Date: Tue, 10 Dec 2019 07:55:10 -0500
Subject: [PATCH 36/36] finished

---
 src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
index 72e94d1..09ba6d0 100644
--- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
+++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java
@@ -20,6 +20,7 @@ public List<Spice> getAllSpices() {
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
 
         Map<SpiceType, Integer> spiceCountMap = new HashMap<>();
+
         SpiceType spice = (SpiceType)this.allSpices.get(0).getClass();
         Integer spiceCount = this.allSpices.size();