diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7987028..d3c3ff1 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 x1, int x2){ + return x1+x2; + } /* 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 s1, String s2){ + return s1+" "+s2; + } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 62b878f..ce4a8ce 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -25,6 +25,51 @@ public class Extension extends ExtensionBase { E.g. multiply(["2", "7", "3"], 3) -> [6, 21, 9] */ + public float add(float x1, float x2){ + return x1+x2; + } + public double add(double x1, double x2){ + return x1+x2; + } + public float subtract(float x1, float x2){ + return x1-x2; + } + + public String subtract(String string, char character){ + String retStr = ""; + for(int i = 0; i < string.length(); i++){ + char curr = string.charAt(i); + if(curr != character){ + retStr += curr; + } + } + return retStr; + } + + public int multiply(int x1, int x2){ + return x1*x2; + } + + public String multiply(String str, int num) { + String retStr = ""; + for(int i = 0; i < num; i++) { + retStr += str; + + if(i != num-1){ + retStr += ","; + } + } + return retStr; + } + + public int[] multiply(String[] strs, int mul){ + int strLen = strs.length; + int[] retNums = new int[strLen]; + for(int i = 0; i < strLen; i++){ + retNums[i] = Integer.parseInt(strs[i])*mul; + } + return retNums; + } }