diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 70ac307..774737b 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -40,60 +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 ""; - } + public String five() {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 == false) {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; + if (nums.length == 0) {return false;} + else {return 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; + if (sentence.contains("milk")) {return true;} + else {return false;} } // 11. Use conditional statements to return the number 3 if the provided string contains @@ -101,13 +105,17 @@ 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("milk")) {return 3;} + else if (sentence.contains("coffee")) {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; + if (num >= lower && num <= upper) {return true;} + else {return false;} } /* @@ -123,6 +131,10 @@ 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..4a8d683 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -14,8 +14,11 @@ public class Extension extends ExtensionBase { and "The timer finished ages ago!" if the remaining minutes is a negative number */ - - + public String timerStatus(int timer) { + if (timer < 0) {return "The timer finished ages ago!";} + else if (timer > 0) {return "The cake is still baking!";} + else {return "The cake is ready!";} + } /* 2. Create a method named estimatePrepTime that accepts two parameters: @@ -27,7 +30,12 @@ public class Extension extends ExtensionBase { If a prep time of 0 is provided, the method should assume each ingredient takes 2 minutes to prepare. */ + public int estimatePrepTime(String[] arr, int time) { + int length = arr.length; + if (time == 0) {return length * 2;} + else {return length * time;} + } /* 3. Create a method named calculateGramsOfSugar that accepts two parameters: @@ -41,7 +49,18 @@ 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[] arr, int layers) { + int gramsOfSugar = 100; + int frequnce = 0; + + for (String ingr : arr) { + if (ingr == "sugar") { + frequnce++; + } + } + return frequnce * gramsOfSugar * layers; + } }