André Velkov Janusev

src/main/java/com/booleanuk/core/Exercise.java

@@ -2,6 +2,8 @@
 
 import com.booleanuk.helpers.ExerciseBase;
 
+import java.util.ArrayList;
+
 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 +37,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 +50,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 +66,20 @@ public String happilyGreet() {
         10, 13 | [10,11,12,13]
         -1, 1  | [-1,0,1]
      */
-
+    public int[] constructNumberArray(int lower, int upper) {
+        int length = (upper - lower) + 1;
+        int[] test = new int[length];
+
+        for (int i = 0; i < length; i++) {
+            if (i == 0) {
+                test[i] = lower;
+            } else {
+                test[i] = test[i-1] + 1;
+            }
+        }
+
+        return test;
+    }
 
 
 
@@ -81,7 +96,12 @@ The method must return the same string in upper case with exclamation marks (!)
         error, 10   | ERROR!!!!!!!!!!
      */
 
+    public String shout(String string, int num) {
+        String upper = string.toUpperCase();
+        String compl = upper.concat("!".repeat(num));
 
+        return compl;
+    }
 
 
 }

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;
+    }
 
 
 
@@ -20,17 +22,20 @@ public class Extension extends ExtensionBase {
         and the result of calling the bakingTime method
      */
 
-
-
-
+    @Override
+    public int remainingBakeTime(int minutes) {
+        return bakingTime() - minutes;
+    }
     /*
         7. Create a method named calculatePrepTime that accepts one input:
         - the number of layers the cake has
 
         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 +48,14 @@ 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) {
+        int time = remainingBakeTime(minutes);
+        int prep = calculatePrepTime(layers);
+
+        int tot = bakingTime() - time + prep;
 
+        return tot;
+    }