diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7987028..325346f 100644 --- a/src/main/java/com/booleanuk/core/Exercise.java +++ b/src/main/java/com/booleanuk/core/Exercise.java @@ -51,13 +51,19 @@ 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 one, int two){ + return one+two; + } /* @@ -65,6 +71,8 @@ public Exercise(int age) { together with a space in between. */ - + public String add(String one, String two){ + return one + " " + two; + } } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index 62b878f..fc97473 100644 --- a/src/main/java/com/booleanuk/extension/Extension.java +++ b/src/main/java/com/booleanuk/extension/Extension.java @@ -2,7 +2,50 @@ import com.booleanuk.helpers.ExtensionBase; +import java.sql.Array; + public class Extension extends ExtensionBase { + + public float add(float one, float two){ + return one+two; + } + + public double add(double one, double two){ + return one+two; + } + + public float subtract(float one, float two){ + return one-two; + } + + public String subtract(String str, char chr){ + String ans = str.replace(chr, ' '); + return ans.replaceAll("\\s+",""); + + } + + public int multiply(int one, int two){ + return one*two; + } + + public String multiply(String str, int n){ + StringBuilder k = new StringBuilder(); + for (int i = 0; i <= n-1; i++){ + k.append(str); + if (i != n-1){ + k.append(","); + } + } + return k.toString(); + } + + public int[] multiply(String[] str, int n) { + int[] ans = new int[3]; + for (int i = 0; i <= str.length - 1; i++) { + ans[i] = Integer.parseInt(str[i]) * n; + } + return ans; + } /* Implement the following methods: