diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7ac3cfb..6ddcf16 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.Arrays; +import java.util.Locale; + 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 + " :)"; } /* @@ -64,9 +67,16 @@ public String happilyGreet() { 10, 13 | [10,11,12,13] -1, 1 | [-1,0,1] */ - - - + public int[] constructNumberArray(int lower, int upper) { + int difference = upper - lower + 1; + int[] result = new int[difference]; + + for (int i = 0; i < difference; i++) { + result[i] = lower; + lower++; + } + return result; + } /* 4. Shout at a dev @@ -80,7 +90,14 @@ The method must return the same string in upper case with exclamation marks (!) disaster, 5 | DISASTER!!!!! error, 10 | ERROR!!!!!!!!!! */ + public String shout(String word, int number) { + word = word.toUpperCase(); + String symbol = ""; + for (int i = 0; i < number; i++) + symbol += "!"; + return word + symbol; + } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index f9de7dd..1759449 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 timeInOven) { + return bakingTime() - timeInOven; + } + @@ -30,7 +36,9 @@ public class Extension extends ExtensionBase { It must return how many minutes it will take to prepare the cake based on each layer taking 3 minutes to prepare */ - + public int calculatePrepTime(int layers) { + return layers * 3; + } @@ -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 minutes) { + return minutes + calculatePrepTime(layers); + }