diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7987028..c419841 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -51,20 +51,24 @@ 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..9e08313 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -1,5 +1,6 @@ package com.booleanuk.extension; +import com.booleanuk.core.Exercise; import com.booleanuk.helpers.ExtensionBase; public class Extension extends ExtensionBase { @@ -25,6 +26,42 @@ 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 stringOne, char charOne) { + return stringOne.replace(String.valueOf(charOne), ""); + } + + public int multiply(int numOne, int numTwo) { + return numOne * numTwo; + } + + public String multiply(String stringOne, int times) { + String out = stringOne; + for (int i = 0; i < times - 1; i++) { + out += "," + stringOne; + } + return out; + } + + public int[] multiply(String[] list, int num) { + int[] numList = new int[list.length]; + int calculatedNum = 0; + for (int i = 0; i < list.length; i++) { + calculatedNum = Integer.parseInt(list[i]) * num; + numList[i] = calculatedNum; + } + return numList; + } }