diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7987028..f9cc48c 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 num1, int num2){ + return num1 + num2; + } /* 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 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..532a78e 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -26,5 +26,47 @@ public class Extension extends ExtensionBase { multiply(["2", "7", "3"], 3) -> [6, 21, 9] */ + public float add(float num1, float num2){ + return num1 + num2; + } + + public double add(double num1, double num2){ + return num1 + num2; + } + + public float subtract(float num1, float num2){ + return num1 - num2; + } + + public String subtract(String aString, char aChar){ + String alteredString = aString.replace(String.valueOf(aChar), ""); + return alteredString; + } + + public int multiply(int num1, int num2){ + return num1*num2; + } + + public String multiply(String string, int num){ + String alteredString = ""; + for (int i = 0; i < num; i++){ + if(num == i+1){ + alteredString += string; + } + else{ + alteredString += string + ","; + } + } + return alteredString; + } + + public int[] multiply(String[] stringArray, int num){ + int[] intArray = new int[stringArray.length]; + for(int i = 0; i < stringArray.length; i++){ + int convertedString = Integer.parseInt(stringArray[i]); + intArray[i] = convertedString*num; + } + return intArray; + } }