From e1785ae94f18496a49c0db76301fbf87b3131f75 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 6 Aug 2025 17:59:12 +0200 Subject: [PATCH] exercise finished changed to ssh --- .../java/com/booleanuk/core/Exercise.java | 61 +++++++++++++++---- .../com/booleanuk/extension/Extension.java | 23 ++++++- 2 files changed, 68 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 70ac307..25e0da6 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -40,60 +40,76 @@ 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 "Correct!"; + } + else { + return "Wrong!"; + } } // 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) { - return false; + return nums.length > 0; } // 10. Use a conditional statement to return true if the provided string contains the word // "milk", or false if not // https://www.w3schools.com/java/java_ref_string.asp public boolean ten(String sentence) { - return false; + return sentence.contains("milk"); } // 11. Use conditional statements to return the number 3 if the provided string contains @@ -101,13 +117,27 @@ 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; + boolean hasMilk = sentence.contains("milk"); + boolean hasCoffee = sentence.contains("coffee"); + + if (hasMilk && hasCoffee) { + return 9; + } + else if (hasMilk) { + return 3; + } + else if (hasCoffee) { + return 6; + } + else { + 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) { - return false; + return num >= lower && num <= upper; } /* @@ -123,6 +153,11 @@ 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"); + if (age >=1 && age <=4) return ("Toddler"); + if (age >=5 && age <=12) return ("Child"); + if (age >=13 && age <=19) return ("Teenager"); + + return ("Adult"); } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 44e540f..0395481 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -14,9 +14,13 @@ public class Extension extends ExtensionBase { and "The timer finished ages ago!" if the remaining minutes is a negative number */ + @Override + public String timerStatus(int minLeft) { + if (minLeft == 0) return "The cake is ready!"; + if (minLeft > 0) return "The cake is still baking!"; - - + return "The timer finished ages ago!"; + } /* 2. Create a method named estimatePrepTime that accepts two parameters: - an array of ingredients, e.g. ["sugar", "milk", "flour", "eggs"] @@ -26,7 +30,12 @@ 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 prepTimePerIngredient) { + if (prepTimePerIngredient == 0) { + prepTimePerIngredient = 2; + } + return ingredients.length * prepTimePerIngredient; + } /* 3. @@ -40,6 +49,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 ingredient : ingredients) { + if (ingredient.equalsIgnoreCase("sugar")) { + return layers * 100; + } + } + return 0; + }