diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7ac3cfb..649d65a 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -35,7 +35,7 @@ public String greet(String name) { Complete this method so that it increases the number given by 1 and returns the result */ public int increment(int number) { - return 0; + return number+1; } /* @@ -48,8 +48,8 @@ public int increment(int number) { Nathan | Hi, Nathan :) Edward | Hi, Edward :) */ - public String happilyGreet() { - return "Not implemented yet"; + public String happilyGreet(String name) { + return "Hi, " + name + " :)"; } /* @@ -65,6 +65,16 @@ public String happilyGreet() { -1, 1 | [-1,0,1] */ + public int[] constructNumberArray(int lower, int upper) { + int[] res = new int[upper-lower+1]; + int j = 0; + for (int i = lower; i <= upper; i++){ + res[j] = i; + j++; + } + return res; + } + @@ -81,7 +91,8 @@ The method must return the same string in upper case with exclamation marks (!) error, 10 | ERROR!!!!!!!!!! */ - - - + public String shout(String word, int num){ + String str = "!".repeat(Math.max(0, num)); + return word.toUpperCase() + str; + } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index f9de7dd..0608670 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -9,8 +9,9 @@ public class Extension extends ExtensionBase { 5. Create a method named bakingTime that returns the number 50 */ - - + public int bakingTime(){ + return 50; + } /* 6. Create a method named remainingBakeTime that accepts one input: @@ -20,7 +21,9 @@ public class Extension extends ExtensionBase { and the result of calling the bakingTime method */ - + public int remainingBakeTime(int mins){ + return bakingTime()-mins; + } /* @@ -31,7 +34,9 @@ public class Extension extends ExtensionBase { each layer taking 3 minutes to prepare */ - + public int calculatePrepTime(int layers){ + return layers*3; + } /* @@ -44,7 +49,8 @@ public class Extension extends ExtensionBase { in the oven. Use your calculatePrepTime method in the calculation */ - - + public int totalTimeSpent(int layers, int mins){ + return calculatePrepTime(layers) + mins; + } }