commit

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

@@ -18,12 +18,11 @@ public class Bank {
 
          addBankAccount(bankAccount );
 
-       if(containsBankAccount(bankAccount ) )
-
-           list.remove(indexNumber );
+       if(containsBankAccount(bankAccount ) ) {
 
+           list.remove(indexNumber);
+       }
         return (BankAccount) list;
-
     }
 
     public void addBankAccount(BankAccount bankAccount) {
@@ -34,8 +33,6 @@ public class Bank {
     public Boolean containsBankAccount(BankAccount bankAccount) {
     //throw new UnsupportedOperationException("Method not yet implemented");
 
-        Boolean flag;
-
         return list.contains(bankAccount );
     }
 }

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

@@ -3,6 +3,7 @@ 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;
 
@@ -13,6 +14,8 @@ public class Food  implements Spice {
 
     List<Spice>list=new ArrayList<>();
 
+   // Map<SpiceType,Integer >map=new HashMap<Spice,Integer>() >();
+
     public List<Spice> getAllSpices() {
 
         return list;
@@ -20,7 +23,7 @@ public class Food  implements Spice {
 
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
 
-        return null ;
+        return null;
     }
 
     public void applySpice(Spice spice) {

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

@@ -32,7 +32,9 @@ public class Calculator {
     }
 
     public static Double[] squares(Double... values) {
+
         Double[] result = new Double[values .length];
+
         for(int i = 0; i < values .length ; i++ )
             result[i] = values [i]*values [i];
 
@@ -43,7 +45,7 @@ public class Calculator {
         DecimalFormat df = new DecimalFormat("0.00");
         Double result=value1 + value2;
 
-       System.out.println(df.format(result)) ;
+
 
        return result;
     }

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

@@ -1,6 +1,8 @@
 package rocks.zipcode.quiz5.fundamentals;
 
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author leon on 21/12/2018.
@@ -35,24 +37,32 @@ public class StringUtils {
         StringBuilder updateString = new StringBuilder(str);
         int middleIndex = str.length() /2;
         updateString.setCharAt(middleIndex, Character.toLowerCase(str.charAt(middleIndex)));
-        System.out.println(updateString);
+        //System.out.println(updateString);
         return updateString.toString() ;
 
     }
 
     public static Boolean isIsogram(String str) {
 
-        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;
+//        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;
+        String[] res=str.split("");
+        Set<String> set=new HashSet<String>(Arrays.asList(res) );
+        if(str.length()==set.size() ){
+            return true;
         }
-        return true;
+
+        else
+            return false;
     }
 
     public static Boolean hasDuplicateConsecutiveCharacters(String str) {
@@ -91,8 +101,9 @@ public class StringUtils {
 //        result=new String(ch);
 //
 //        return result;
+
         char[] chars = str.toCharArray();
-        int len = 0;      // Length of result (initially empty)
+        int len = 0;
 
         for (int i = 0; i < chars.length; i++) {
             if (len == 0 || chars[i] != chars[len - 1]) {

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

@@ -23,7 +23,6 @@ public class Employee  implements Transactable ,Worker {
         this.expectedBalance=getBalance() ;
         this.expectedBankAccountBalance =getBalance();
 
-
     }
 
     public BankAccount getBankAccount() {
@@ -36,9 +35,22 @@ public class Employee  implements Transactable ,Worker {
 
     }
 
-
+//    public void setExpectedHoursWorked(Double expectedHoursWorked ){
+//        this.expectedHoursWorked =expectedHoursWorked ;
+//    }
+//     public void setExpectedHourlyWage (Double expectedHourlyWage ){
+//        this.expectedHourlyWage =expectedHourlyWage;
+//     }
+//
+//     public void setExpectedBankAccountBalance (Double  expectedBankAccountBalance ){
+//        this.expectedBankAccountBalance=expectedBankAccountBalance ;
+//     }
+//     public void setExpectedBalance (Double expectedBalance ){
+//        this.expectedBalance =expectedBalance ;
+//     }
     @Override
     public void increaseHoursWorked(Double numberOfHours) {
+        expectedHoursWorked +=numberOfHours ;
 
     }
 
@@ -68,6 +80,7 @@ public class Employee  implements Transactable ,Worker {
 
     @Override
     public void withdrawal(Double amountToDecreaseBy) {
+
         expectedBalance-=amountToDecreaseBy;
     }