From a498589e2aa3bb48219f0d191c8a4dd32c468ca7 Mon Sep 17 00:00:00 2001
From: Roderick Leito <roderick.leito@gmail.com>
Date: Tue, 5 Aug 2025 16:54:21 +0200
Subject: [PATCH] Finished all exercises

---
 .../java/com/booleanuk/core/Exercise.java     | 59 +++++++++++++++----
 .../com/booleanuk/extension/Extension.java    | 25 +++++++-
 2 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java
index 70ac307..23c2874 100644
--- a/src/main/java/com/booleanuk/core/Exercise.java
+++ b/src/main/java/com/booleanuk/core/Exercise.java
@@ -40,52 +40,64 @@ 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!";
+        }
+        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 == false){
+            return "Correct!";
+        }
+        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!";
+        }
+        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 +105,9 @@ 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 +116,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("milk") && sentence.contains("coffee")){
+            return 9;
+        }
+        if (sentence.contains("milk")){
+            return 3;
+        }
+        if (sentence.contains("coffee")){
+            return 6;
+        }
+        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,18 @@ 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 <= 4){
+            return "Toddler";
+        }
+        if (age <= 12){
+            return "Child";
+        }
+        if (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..34a9e41 100644
--- a/src/main/java/com/booleanuk/extension/Extension.java
+++ b/src/main/java/com/booleanuk/extension/Extension.java
@@ -13,7 +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 minLeft){
+        if (minLeft == 0){
+            return "The cake is ready!";
+        }
+        if (minLeft > 0){
+            return "The cake is still baking!";
+        }
+        return "The timer finished ages ago!";
+    }
 
 
 
@@ -26,6 +34,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[] ingr, int prepTime){
+        if (prepTime == 0){
+            return ingr.length*2;
+        }
+        return ingr.length*prepTime;
+    }
 
 
 
@@ -40,7 +54,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[] ingr, int layers){
+        for (String ingredient : ingr){
+            if (ingredient == "sugar"){
+                return 100*layers;
+            }
+        }
+        return 0;
+    }