diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7ac3cfb..e2c4041 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -2,6 +2,9 @@ import com.booleanuk.helpers.ExerciseBase; +import java.util.ArrayList; +import java.util.Arrays; + public class Exercise extends ExerciseBase { /* A method is a function, a single piece of logic that can run. In Java, a class is a convenient @@ -35,7 +38,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 +51,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 +68,16 @@ public String happilyGreet() { -1, 1 | [-1,0,1] */ + public int[] constructNumberArray(int lower, int upper){ + int[] numbers = new int[upper-lower + 1]; + int j = lower; + for (int i = 0; i <= upper-lower; i++) { + numbers[i] = j; + j++; + } + return numbers; + } /* @@ -81,7 +93,9 @@ The method must return the same string in upper case with exclamation marks (!) error, 10 | ERROR!!!!!!!!!! */ - + public String shout(String msg, int nExl) { + return msg.toUpperCase() + "!".repeat(Math.max(0, nExl)); + } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index f9de7dd..1be534c 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -9,7 +9,7 @@ public class Extension extends ExtensionBase { 5. Create a method named bakingTime that returns the number 50 */ - + public int bakingTime() { return 50; } /* @@ -20,7 +20,7 @@ public class Extension extends ExtensionBase { and the result of calling the bakingTime method */ - + public int remainingBakeTime(int minInOven) { return bakingTime() - minInOven; } /* @@ -31,7 +31,7 @@ public class Extension extends ExtensionBase { each layer taking 3 minutes to prepare */ - + public int calculatePrepTime(int layers) { return layers * 3; } /* @@ -44,7 +44,9 @@ public class Extension extends ExtensionBase { in the oven. Use your calculatePrepTime method in the calculation */ - + public int totalTimeSpent(int layers, int minInOven) { + return calculatePrepTime(layers) + minInOven; + } }