Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions src/main/java/com/booleanuk/core/Exercise.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand All @@ -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 + " :)";
}

/*
Expand All @@ -65,9 +65,16 @@ public String happilyGreet() {
-1, 1 | [-1,0,1]
*/

@Override
public int[] constructNumberArray(int lower, int upper) {
int arraySize = upper - lower + 1;
int[] resultArray = new int[arraySize];



for (int i = 0; i < arraySize; i++) {
resultArray[i] = lower + i;
}
return resultArray;
}
/*
4. Shout at a dev
Create a method named shout that accepts a string and a whole number.
Expand All @@ -80,7 +87,13 @@ The method must return the same string in upper case with exclamation marks (!)
disaster, 5 | DISASTER!!!!!
error, 10 | ERROR!!!!!!!!!!
*/

public String shout(String w, int num) {
String s = w.toUpperCase() ;
for (int i = 0; i < num; i++) {
s += "!";
}
return s;
}



Expand Down
22 changes: 14 additions & 8 deletions src/main/java/com/booleanuk/extension/Extension.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}



Expand All @@ -19,7 +21,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 minutes) {
return bakingTime() - minutes;
}



Expand All @@ -31,9 +35,10 @@ public class Extension extends ExtensionBase {
each layer taking 3 minutes to prepare
*/




@Override
public int calculatePrepTime(int layers) {
return layers * 3;
}
/*
8. Create a method named totalTimeSpent that accepts two inputs in this order:
- the number of layers the cake has
Expand All @@ -44,7 +49,8 @@ public class Extension extends ExtensionBase {
in the oven. Use your calculatePrepTime method in the calculation
*/




@Override
public int totalTimeSpent(int layers, int done) {
return calculatePrepTime(layers) + done;
}
}