diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7987028..766470d 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -51,13 +51,20 @@ 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 age1, int age2) { + return age1 + age2; + } /* @@ -65,6 +72,10 @@ public Exercise(int age) { together with a space in between. */ + public String add(String name1, String name2) { + return (name1 + " " + name2); + } + } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 62b878f..81316e3 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -2,12 +2,15 @@ import com.booleanuk.helpers.ExtensionBase; +import java.util.Arrays; + public class Extension extends ExtensionBase { /* Implement the following methods: 1. add, which accepts two floats and returns a float (both floats added together) + 2. add, which accepts two doubles and returns a double (both doubles added together) 3. subtract, which accepts two floats and returns a float (first float minus second float) @@ -26,5 +29,39 @@ public class Extension extends ExtensionBase { multiply(["2", "7", "3"], 3) -> [6, 21, 9] */ + public float add(float f1, float f2) { + return f1 + f2; + } + + public double add(double d1, double d2) { + return d1 + d2; + } + + public float subtract(float f1, float f2) { + return f1 - f2; + } + + public String subtract(String d1, char d2) { + return d1.replace(d2 + "", ""); + } + + public int multiply(int f1, int f2) { + return f1 * f2; + } + + public String multiply(String d1, int d2) { + String returnValue = ""; + while (d2 > 1) { + returnValue += d1 + ","; + d2 --; + } + return returnValue + d1; + + } + + public int[] multiply(String[] d1, int d2) { + return Arrays.stream(d1).mapToInt(x -> Integer.parseInt(x) * d2).toArray(); + + } }