diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7987028..578de0c 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -51,13 +51,19 @@ public Exercise(int age) { Create a constructor that accepts both a String and an int as parameters, in that order, and assign the values provided to the name and age members */ + public Exercise(String name, int age) { + this.name = name; + this.age = age; + } /* 2. Create a method named add that accepts two integers. The method should return the numbers added together. */ - + public int add(int int1, int int2) { + return int1 + int2; + } /* @@ -65,6 +71,8 @@ public Exercise(int age) { together with a space in between. */ - + public String add(String string1, String string2) { + return string1 + " " + string2; + } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 62b878f..06d226f 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -2,6 +2,8 @@ import com.booleanuk.helpers.ExtensionBase; +import java.util.ArrayList; + public class Extension extends ExtensionBase { /* Implement the following methods: @@ -26,5 +28,46 @@ public class Extension extends ExtensionBase { multiply(["2", "7", "3"], 3) -> [6, 21, 9] */ + public float add(float float1, float float2) { + return float1 + float2; + } + + + public double add(double double1, double double2) { + return double1 + double2; + } + + + public float subtract(float float1, float float2) { + return float1 - float2; + } + + + public String subtract(String string, char character) { + return string.replace(String.valueOf(character), ""); + } + + + public int multiply(int int1, int int2) { + return int1 * int2; + } + + + public String multiply(String string, int number) { + String output = string; + while (number - 1 != 0) { + number--; + output += "," + string; + } + return output; + } + + public int[] multiply(String[] strings, int number) { + int[] results = new int[strings.length]; + for (int i = 0; i < strings.length; i++) { + results[i] = Integer.parseInt(strings[i]) * number; + } + return results; + } }