From 84e7fab3c6a6581a904cd0a6bc2879d3e2575cda Mon Sep 17 00:00:00 2001 From: Andre Velkov Janusev Date: Tue, 12 Aug 2025 15:52:59 +0200 Subject: [PATCH 1/2] exercise complete --- .../java/com/booleanuk/core/Exercise.java | 57 ++++++++++++++----- .../com/booleanuk/extension/Extension.java | 24 ++++++-- 2 files changed, 64 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 70ac307..0c55cbe 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -40,60 +40,68 @@ 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!"; + return (numOne >= numTwo) ? "Correct!" : "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 == null || nums.length == 0) ? false : true; } // 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") ? true : false; } // 11. Use conditional statements to return the number 3 if the provided string contains @@ -101,13 +109,24 @@ 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("coffee") && sentence.contains("milk")) { + 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) { - return false; + if (num >= lower && num <= upper) { + return true; + } else { + return false; + } } /* @@ -123,6 +142,18 @@ public boolean twelve(int num, int lower, int upper) { 20+ | Adult */ public String thirteen(int age) { - return "Not implemented yet!"; + + if (age >= 1 && age <= 4) { + return "Toddler"; + } else if (age >= 5 && age <= 12) { + return "Child"; + } else if (age >= 13 && age <= 19) { + return "Teenager"; + } else if (age >= 20) { + return "Adult"; + } else { + return "Baby"; + } + } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 44e540f..642015b 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -14,9 +14,16 @@ public class Extension extends ExtensionBase { and "The timer finished ages ago!" if the remaining minutes is a negative number */ - - - + @Override + public String timerStatus(int remaining) { + if (remaining < 0) { + return "The timer finished ages ago!"; + } else if (remaining > 0) { + return "The cake is still baking!"; + } else { + return "The cake is ready!"; + } + } /* 2. Create a method named estimatePrepTime that accepts two parameters: - an array of ingredients, e.g. ["sugar", "milk", "flour", "eggs"] @@ -26,7 +33,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) { + return (ingredients.length) * 2; + } else { + return (ingredients.length) * prepTime; + } + } /* 3. @@ -40,7 +53,10 @@ 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) { + return 0; + } From 97a61dfda1fcac8fb9bfde29153de24a5a07df5c Mon Sep 17 00:00:00 2001 From: Andre Velkov Janusev Date: Tue, 12 Aug 2025 16:27:50 +0200 Subject: [PATCH 2/2] Extension complete --- src/main/java/com/booleanuk/extension/Extension.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 642015b..12666d5 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -54,6 +54,13 @@ public int estimatePrepTime(String[] ingredients, int prepTime) { 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) { + int grams = 100; + + for (String item : ingredients) { + if (item.equals("sugar")) { + return (grams * layers); + } + } return 0; }