diff --git a/bin/main/com/booleanuk/core/Exercise.class b/bin/main/com/booleanuk/core/Exercise.class new file mode 100644 index 0000000..d3136b4 Binary files /dev/null and b/bin/main/com/booleanuk/core/Exercise.class differ diff --git a/bin/main/com/booleanuk/extension/Extension.class b/bin/main/com/booleanuk/extension/Extension.class new file mode 100644 index 0000000..6eafd4c Binary files /dev/null and b/bin/main/com/booleanuk/extension/Extension.class differ diff --git a/bin/main/com/booleanuk/helpers/ExtensionBase.class b/bin/main/com/booleanuk/helpers/ExtensionBase.class new file mode 100644 index 0000000..8f385a9 Binary files /dev/null and b/bin/main/com/booleanuk/helpers/ExtensionBase.class differ diff --git a/bin/test/com/booleanuk/core/ExerciseTest.class b/bin/test/com/booleanuk/core/ExerciseTest.class new file mode 100644 index 0000000..86720a0 Binary files /dev/null and b/bin/test/com/booleanuk/core/ExerciseTest.class differ diff --git a/bin/test/com/booleanuk/extension/ExtensionTest.class b/bin/test/com/booleanuk/extension/ExtensionTest.class new file mode 100644 index 0000000..05cd474 Binary files /dev/null and b/bin/test/com/booleanuk/extension/ExtensionTest.class differ diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 70ac307..01d4184 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -40,52 +40,67 @@ public String sayGoodMorning(boolean isMorning) { // 1. What will the returned value be if I run sayGoodMorning(false)? // Change the returned value in the method below to your answer. It is case-sensitive. public String one() { - return ""; + return "Good day!"; } // 2. What will the output be if I run sayGoodMorning(true)? // Change the returned value in the method below to your answer. It is case-sensitive. public String two() { - return ""; + return "Good morning!"; } // 3. What will the output be if I run sayGoodMorning("Hello".equals("Hello"))? // Change the returned value in the method below to your answer. It is case-sensitive. public String three() { - return ""; + return "Good morning!"; } // 4. What will the output be if I run sayGoodMorning(!"A word".equals("Another word")) public String four() { - return ""; + return "Good morning!"; } // 5. What will the output be if I run sayGoodMorning(25 != 25) public String five() { - return ""; + return "Good day!"; } // 6. Use a conditional statement to return "Correct!" if the input is more than 7 // or "Wrong!" if not public String six(int num) { - return "Not implemented yet!"; + if (num > 7) { + return "Correct!"; + } else { + return "Wrong!"; + } } // 7. Use a conditional statement to return "Correct!" if the input is false // or "Wrong!" if not public String seven(boolean bool) { - return "Not implemented yet!"; + if (bool) { + return "Wrong!"; + } else { + return "Correct!"; + } } // 8. Use a conditional statement to return "Correct!" if numOne is more than or equal to numTwo // or "Wrong!" if not public String eight(int numOne, int numTwo) { - return "Not implemented yet!"; + if (numOne >= numTwo) { + return "Correct!"; + } else { + return "Wrong!"; + } } // 9. Use a conditional statement to return true if the array provided is not empty // or false if it is empty public boolean nine(int[] nums) { + if (nums.length > 0) { + return true; + } return false; } @@ -93,6 +108,8 @@ public boolean nine(int[] nums) { // "milk", or false if not // https://www.w3schools.com/java/java_ref_string.asp public boolean ten(String sentence) { + if (sentence.contains("milk")) + return true; return false; } @@ -101,12 +118,22 @@ public boolean ten(String sentence) { // Return the number 9 if the string contains both coffee and milk. // Otherwise, return the number 0. public int eleven(String sentence) { - return -1; + if (sentence.contains("milk") && sentence.contains("coffee")) { + return 9; + } else if (sentence.contains("coffee")) { + return 6; + } else if (sentence.contains("milk")) { + return 3; + } + return 0; } // 12. Use conditional statements to return true if num is more than or equal to lower and is // less than or equal to upper, otherwise return false. public boolean twelve(int num, int lower, int upper) { + if (num >= lower && num <= upper) + return true; + return false; } @@ -123,6 +150,16 @@ public boolean twelve(int num, int lower, int upper) { 20+ | Adult */ public String thirteen(int age) { - return "Not implemented yet!"; + if (age <= 0) { + return "Baby"; + } else if (age >= 1 && age <= 4) { + return "Toddler"; + } else if (age >= 5 && age <= 12) { + return "Child"; + } else if (age >= 13 && age <= 19) { + return "Teenager"; + } else { + return "Adult"; + } } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 44e540f..d5a4a3c 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -13,6 +13,15 @@ public class Extension extends ExtensionBase { "The cake is still baking!" if there are any remaining minutes left, and "The timer finished ages ago!" if the remaining minutes is a negative number */ + public String timerStatus(int timeLeft) { + if (timeLeft == 0) { + return "The cake is ready!"; + } else if (timeLeft < 0) { + return "The timer finished ages ago!"; + } else { + return "The cake is still baking!"; + } + } @@ -26,6 +35,13 @@ public class Extension extends ExtensionBase { provided and the prep time per ingredient. If a prep time of 0 is provided, the method should assume each ingredient takes 2 minutes to prepare. */ + public int estimatePrepTime(String[] ingredients, int prepTime) { + if (prepTime == 0) { + prepTime = 2; + } + + return ingredients.length * prepTime; + } @@ -40,6 +56,14 @@ public class Extension extends ExtensionBase { You may need to use programming techniques we have yet to cover in the course to solve this task. */ + public int calculateGramsOfSugar(String[] ingredients, int layers) { + for (String s : ingredients) { + if (s == "sugar") { + return 100 * layers; + } + } + return 0; + }