pre-merge commit

src/main/java/rocks/zipcode/quiz5/arrays/ArrayUtils.java

@@ -5,18 +5,37 @@ package rocks.zipcode.quiz5.arrays;
  */
 public class ArrayUtils {
     public static String getMiddleElement(String[] values) {
-        return null;
+        String a = "";
+        if(values.length>1) {
+            a+=values[values.length/2];
+        }
+        return a;
     }
 
     public static String[] removeMiddleElement(String[] values) {
-        return null;
+//        String[] str = new String[values.length-1];
+//        int j = 0;
+//        for (int i = 0; i < values.length-1; i++) {
+//            str[j] = values[i/2];
+//            j++;
+//        }
+//        return str;
+        values[ values.length/2 ] = values[ values.length - 1 ] ;
+        return values;
     }
 
     public static String getLastElement(String[] values) {
-        return null;
+        String lastOne = values[values.length-1];
+        return lastOne;
     }
 
     public static String[] removeLastElement(String[] values) {
-        return null;
+        String[] str = new String[values.length-1];
+        int j = 0;
+        for (int i = 0; i < values.length-1; i++) {
+            str[j] = values[i];
+            j++;
+        }
+        return str;
     }
 }

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

@@ -2,18 +2,36 @@ package rocks.zipcode.quiz5.collections;
 
 import rocks.zipcode.quiz5.objectorientation.account.BankAccount;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author leon on 27/12/2018.
  */
 public class Bank {
+    List<BankAccount> acct = new ArrayList<>();
+
+    public Bank() {
+    }
+
     public BankAccount removeBankAccountByIndex(Integer indexNumber) {
-        return null;
+        //acct.add(bankAccount);
+        if (acct.contains(indexNumber)) {
+            acct.remove(acct);
+        }
+        //return acct;
+        return (BankAccount) acct;
     }
 
     public void addBankAccount(BankAccount bankAccount) {
+        acct.add(bankAccount);
     }
 
     public Boolean containsBankAccount(BankAccount bankAccount) {
-        throw new UnsupportedOperationException("Method not yet implemented");
+        //throw new UnsupportedOperationException("Method not yet implemented");
+        if (acct.contains(bankAccount)) {
+            return true;
+        }
+        return false;
     }
 }

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

@@ -2,15 +2,20 @@ package rocks.zipcode.quiz5.collections;
 
 import rocks.zipcode.quiz5.objectorientation.Spice;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 /**
  * @author leon on 27/12/2018.
  */
-public class Food {
+public class Food implements Spice{
+    List<Spice> spice = new ArrayList<>();
     public List<Spice> getAllSpices() {
-        return null;
+        for (int i = 0; i < spice.size(); i++) {
+            System.out.println(spice.get(i));
+        }
+        return spice;
     }
 
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {

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

@@ -1,12 +1,26 @@
 package rocks.zipcode.quiz5.collections;
 
+import java.util.HashMap;
 import java.util.Map;
 
 public class WordCounter {
+    Map<String,Integer> map = new HashMap<>();
+    private String[] strings;
+
     public WordCounter(String... strings) {
     }
 
     public Map<String, Integer> getWordCountMap() {
-        return null;
+        for (String s: strings) {
+
+            if (!map.containsKey(s)) {  // first time we've seen this string
+                map.put(s, 1);
+            }
+            else {
+                int count = map.get(s);
+                map.put(s, count + 1);
+            }
+        }
+        return map;
     }
 }

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

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

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

@@ -1,34 +1,79 @@
 package rocks.zipcode.quiz5.fundamentals;
 
+import java.util.Arrays;
+
 /**
  * @author leon on 21/12/2018.
  */
 public class StringUtils {
     public static Character getMiddleCharacter(String string) {
-        return null;
+        int stringLength = string.length() ;
+        int middle = stringLength/2 ;
+        char c = string.charAt(middle);
+        return c;
     }
 
     public static String capitalizeMiddleCharacter(String str) {
-        return null;
+//        String cap = str.toUpperCase();
+//        System.out.println(cap);
+//        int stringLength = str.length();
+//        int middle = stringLength/2 ;
+//        char c = cap.charAt(middle);
+//        return String.valueOf(c);
+        return Character.toUpperCase(str.charAt(0)) + str.substring(1);
     }
 
     public static String lowerCaseMiddleCharacter(String str) {
-        return null;
+//        String cap = str.toLowerCase();
+//        System.out.println(cap);
+//        int stringLength = str.length();
+//        int middle = stringLength/2 ;
+//        char c = cap.charAt(middle);
+//        return String.valueOf(c);
+
+        String test = str;
+        test = test.substring(0,2) + test.substring(2,3).toLowerCase()+ test.substring(3);
+        return test;
     }
 
     public static Boolean isIsogram(String str) {
-        return null;
-    }
+        str = str.toLowerCase();
+        int len = str.length();
+
+        char arr[] = str.toCharArray();
+
+        Arrays.sort(arr);
+        for (int i = 0; i < len - 1; i++) {
+            if (arr[i] == arr[i + 1])
+                return false;
+        }
+        return true;
+}
 
     public static Boolean hasDuplicateConsecutiveCharacters(String str) {
-        return null;
+        return (str.matches("(.)\\1"));
+        //return (str.matches(".*(.)\\1.*"));
     }
 
     public static String removeConsecutiveDuplicateCharacters(String str) {
-        return null;
+        return str.replaceAll("(.)\\1+", "$1");
+
     }
 
     public static String invertCasing(String str) {
-        return null;
+        char[] chars = str.toCharArray();
+        for (int i = 0; i < chars.length; i++)
+        {
+            char c = chars[i];
+            if (Character.isUpperCase(c))
+            {
+                chars[i] = Character.toLowerCase(c);
+            }
+            else if (Character.isLowerCase(c))
+            {
+                chars[i] = Character.toUpperCase(c);
+            }
+        }
+        return new String(chars);
     }
 }

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{
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Account.java

@@ -3,11 +3,32 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Account extends BankAccount {
+public class Account extends BankAccount implements Transactable{
+    private Long Id;
+
+    public Account() {
+    }
+
     public Long getId() {
-        return null;
+        return Id;
     }
 
     public void setId(Long id) {
+        this.Id = id;
+    }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+
+    }
+
+    @Override
+    public Double getBalance() {
+        return null;
     }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/BankAccount.java

@@ -3,7 +3,34 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 27/12/2018.
  */
-public class BankAccount {
+
+public class BankAccount implements Transactable {
+    private  int initialBalance;
+    private  int depositeBalance;
+
+    public BankAccount() {
+    }
+
+    public BankAccount(int initialBalance, int depositeBalance) {
+        this.initialBalance = initialBalance;
+        this.depositeBalance = depositeBalance;
+    }
+
     public void setBalance(Double val) {
     }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+        depositeBalance += amountToIncreaseBy;
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+
+    }
+
+    @Override
+    public Double getBalance() {
+        return null;
+    }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Employee.java

@@ -3,7 +3,11 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Employee {
+public class Employee extends Account implements Worker,Transactable {
+    private BankAccount bankAccount;
+    private double numberOfHoursWorkedSoFar;
+    private Double hourlyWage;
+
     public Employee() {
     }
 
@@ -11,10 +15,50 @@ public class Employee {
     }
 
     public BankAccount getBankAccount() {
-        return null;
+        return bankAccount;
     }
 
     public void setBankAccount(BankAccount bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    @Override
+    public void increaseHoursWorked(Double numberOfHours) {
+        numberOfHoursWorkedSoFar = numberOfHours;
+    }
 
+    @Override
+    public Double getHoursWorked() {
+        return this.numberOfHoursWorkedSoFar;
+    }
+
+    @Override
+    public Double getHourlyWage() {
+        return this.hourlyWage;
+    }
+
+    public void setHourlyWage(Double hourlyWage) {
+        this.hourlyWage = hourlyWage;
+    }
+
+    @Override
+    public Double getMoneyEarned() {
+        Double earned = hourlyWage * numberOfHoursWorkedSoFar;
+        return earned;
+    }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+        getMoneyEarned();
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+
+    }
+
+    @Override
+    public Double getBalance() {
+        return null;
     }
 }