diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7ac3cfb..ebeb9de 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,9 +65,16 @@ public String happilyGreet() { -1, 1 | [-1,0,1] */ + @Override + public int[] constructNumberArray(int lower, int upper) { + int arraySize = upper - lower + 1; + int[] resultArray = new int[arraySize]; - - + for (int i = 0; i < arraySize; i++) { + resultArray[i] = lower + i; + } + return resultArray; + } /* 4. Shout at a dev Create a method named shout that accepts a string and a whole number. @@ -80,7 +87,13 @@ The method must return the same string in upper case with exclamation marks (!) disaster, 5 | DISASTER!!!!! error, 10 | ERROR!!!!!!!!!! */ - + public String shout(String w, int num) { + String s = w.toUpperCase() ; + for (int i = 0; i < num; i++) { + s += "!"; + } + return s; + } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index f9de7dd..ad8fa05 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -8,7 +8,9 @@ public class Extension extends ExtensionBase { /* 5. Create a method named bakingTime that returns the number 50 */ - + public int bakingTime() { + return 50; + } @@ -19,7 +21,9 @@ public class Extension extends ExtensionBase { It must return how many minutes are left to bake based on the input and the result of calling the bakingTime method */ - + public int remainingBakeTime(int minutes) { + return bakingTime() - minutes; + } @@ -31,9 +35,10 @@ public class Extension extends ExtensionBase { each layer taking 3 minutes to prepare */ - - - + @Override + public int calculatePrepTime(int layers) { + return layers * 3; + } /* 8. Create a method named totalTimeSpent that accepts two inputs in this order: - the number of layers the cake has @@ -44,7 +49,8 @@ public class Extension extends ExtensionBase { in the oven. Use your calculatePrepTime method in the calculation */ - - - + @Override + public int totalTimeSpent(int layers, int done) { + return calculatePrepTime(layers) + done; + } }