diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7987028..9f4b719 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -51,20 +51,28 @@ 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 numOne, int numTwo) { + return numOne + numTwo; + } /* 3. Create another method named add that accepts two Strings. The method should return the strings concatenated together with a space in between. */ - + public String add (String stringOne, String stringTwo) { + return stringOne + " " + stringTwo; + } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 62b878f..7bd29aa 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: @@ -25,6 +27,58 @@ public class Extension extends ExtensionBase { E.g. multiply(["2", "7", "3"], 3) -> [6, 21, 9] */ + public float add(float floatOne, float floatTwo) { + return floatOne + floatTwo; + } + + public double add(double doubleOne, double doubleTwo) { + return doubleOne + doubleTwo; + } + + public float subtract(float floatOne, float floatTwo) { + return floatOne - floatTwo; + } + + public String subtract(String string, char character) { + String newString = ""; + for (char c : string.toCharArray()) + if (c != character) { + newString += c; + } + + return newString; + } + + public int multiply(int intOne, int intTwo) { + return intOne * intTwo; + } + + // 6. multiply, which accepts a string and an int, and returns a string containing the provided string + // as many times as the provided int separated by a comma. E.g. + // multiply("Hello", 3) -> "Hello,Hello,Hello" + + public String multiply (String string, int number) { + String newString = ""; + + for (int i = 0; i < number; i++) { + newString += (string + ","); + } + + return newString.substring(0,newString.length()-1); + + } + //denna + public int[] multiply(String[] stringArray, int number) { + + int[] intArray = new int[stringArray.length]; + + for (int i = 0; i < stringArray.length; i++) { + int parsedNumber = Integer.parseInt(stringArray[i]); + parsedNumber *= number; + intArray[i] = parsedNumber; + } + return intArray; + } }