diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7ac3cfb..6459391 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,7 +65,14 @@ public String happilyGreet() { -1, 1 | [-1,0,1] */ - + public int[] constructNumberArray(int lower, int upper){ + int count = upper-lower+1; + int[] retArray = new int[count]; + for (int i = 0; i < count; i++){ + retArray[i] = lower+i; + } + return retArray; + } /* @@ -80,7 +87,14 @@ The method must return the same string in upper case with exclamation marks (!) disaster, 5 | DISASTER!!!!! error, 10 | ERROR!!!!!!!!!! */ - + public String shout(String str, int num){ + StringBuilder sb = new StringBuilder(); + sb.append(str.toUpperCase()); + for(int i = 0; i < num; i++){ + sb.append("!"); + } + return sb.toString(); + } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index f9de7dd..9b41e7e 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -9,7 +9,9 @@ public class Extension extends ExtensionBase { 5. Create a method named bakingTime that returns the number 50 */ - + public int bakingTime(){ + return 50; + } /* @@ -20,6 +22,10 @@ public class Extension extends ExtensionBase { and the result of calling the bakingTime method */ + public int remainingBakeTime(int remTime){ + return bakingTime()-remTime; + } + @@ -31,7 +37,9 @@ public class Extension extends ExtensionBase { each layer taking 3 minutes to prepare */ - + public int calculatePrepTime(int layers){ + return 3*layers; + } /* @@ -43,7 +51,9 @@ public class Extension extends ExtensionBase { which is the sum of the preparation time and the number of minutes it's been in the oven. Use your calculatePrepTime method in the calculation */ - + public int totalTimeSpent(int layers, int timeSpent){ + return calculatePrepTime(layers)+timeSpent; + }