diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 70ac307..2224dbf 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -1,5 +1,6 @@ package com.booleanuk.core; + public class Exercise { /* One of the core building blocks of programming in any language is conditional statements. @@ -40,60 +41,66 @@ 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 +108,19 @@ 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; + } 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 +136,14 @@ public boolean twelve(int num, int lower, int upper) { 20+ | Adult */ public String thirteen(int age) { - return "Not implemented yet!"; + if (age >= 20) { + return "Adult"; + } else if (age >= 13) { + return "Teenager"; + } else if (age >= 5) { + return "Child"; + } else if (age >= 1) { + return "Toddler"; + } 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..f2e1d73 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -2,6 +2,8 @@ import com.booleanuk.helpers.ExtensionBase; +import java.lang.reflect.Array; + public class Extension extends ExtensionBase { /* 1. We're going to improve our cake baking capabilities! @@ -13,7 +15,11 @@ 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 minutesLeft) { + if (minutesLeft == 0) return "The cake is ready!"; + if (minutesLeft < 0) return "The timer finished ages ago!"; + return "The cake is still baking!"; + } @@ -27,7 +33,13 @@ 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[] ingredients, int minutes){ + int prepTime = minutes; + if (minutes == 0) { + prepTime = 2; } + return prepTime * ingredients.length; + } /* 3. Create a method named calculateGramsOfSugar that accepts two parameters: @@ -40,7 +52,20 @@ 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 numberOfLayers) { + boolean hasSugar = false; + String sugar = "sugar"; + + for (String s : ingredients) { + if (s.equals("sugar")) { + hasSugar = true; + break; + } + } + + if (hasSugar) return 100 * numberOfLayers; + return 0; + }