From c256e5fa584ae1b0e29b451948da65a68881a101 Mon Sep 17 00:00:00 2001 From: Robin Kaga Date: Wed, 8 Jan 2025 13:12:37 +0100 Subject: [PATCH] Robin Kaga --- .../java/com/booleanuk/core/Exercise.java | 20 +++++++++++++++---- .../com/booleanuk/extension/Extension.java | 10 ++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7ac3cfb..2a374b1 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 + " :)"; } /* @@ -64,7 +64,13 @@ public String happilyGreet() { 10, 13 | [10,11,12,13] -1, 1 | [-1,0,1] */ - + public int[] constructNumberArray(int lower, int upper){ + int[] arr = new int[upper - lower + 1]; + for (int i = 0; i < arr.length; i++){ + arr[i] = lower + i; + } + return arr; + } @@ -80,6 +86,12 @@ The method must return the same string in upper case with exclamation marks (!) disaster, 5 | DISASTER!!!!! error, 10 | ERROR!!!!!!!!!! */ + public String shout(String string, int num){ + String upper = string.toUpperCase(); + String exclams = "!".repeat(num); + + return upper + exclams; + } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index f9de7dd..11e5dbd 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -8,6 +8,7 @@ public class Extension extends ExtensionBase { /* 5. Create a method named bakingTime that returns the number 50 */ + public int bakingTime(){return 50;} @@ -19,6 +20,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 timePassed){ + return bakingTime() - timePassed; + } @@ -30,6 +34,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 3 * layers; + } @@ -43,6 +50,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 timeBaked){ + return calculatePrepTime(layers) + timeBaked; + }