From bbd35ecf42c580411cceaa80b85ebdeef6de2efc Mon Sep 17 00:00:00 2001 From: Mo Russ Date: Fri, 6 Mar 2020 09:51:46 -0500 Subject: [PATCH 1/7] WuTangConcatenator class done --- .../assessment2/part1/BasicUtilities.java | 3 ++- .../assessment2/part1/WuTangConcatenator.java | 20 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index 1402353..d93e62f 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,7 +2,8 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - return null; + + return value % 5 ==0; } public Boolean isLessThan7(Integer value) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 63f210e..d59709a 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,30 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + public Integer Wu; + public Integer Tang; + public Integer WuTang; + public Integer value = 0; public WuTangConcatenator(Integer input) { } public Boolean isWu() { - return null; + if (value % 3 == 0) { + return true; + } + return false; } public Boolean isTang() { - return null; + if (value % 5 == 0) { + return true; + } + return false; } - public Boolean isWuTang() { - return null; + if (value % 3 == 0 && value % 5 ==0) { + return true; + } + return false; } } From 629f14669259fbfa5b61942079eec759c8a1c7c9 Mon Sep 17 00:00:00 2001 From: Mo Russ Date: Fri, 6 Mar 2020 10:18:30 -0500 Subject: [PATCH 2/7] changes in WuTangConcatenator --- .../assessment2/part1/BasicUtilities.java | 16 +++++++++++----- .../assessment2/part1/IntegerArrayUtilities.java | 14 ++++++++++++-- .../assessment2/part1/WuTangConcatenator.java | 8 ++++---- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index d93e62f..055952d 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,19 +2,25 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - - return value % 5 ==0; + if(value > 5) { + return true; + } return false; } public Boolean isLessThan7(Integer value) { - return null; + if(value < 7) { + return true; + } return false; } public Boolean isBetween5And7(Integer valueToEvaluate) { - return null; + if(valueToEvaluate > 5 && valueToEvaluate < 7) { + return true; + } return false; } public Boolean startsWith(String string, Character character) { - return null; + + return true; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index a360000..557c5f0 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -1,12 +1,22 @@ package com.zipcodewilmington.assessment2.part1; +import java.util.Arrays; + public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - return null; + for (int i = 0; i < array.length; i++) { + if (array[i] % 2 != 0) { + return false; + } + } + return true; } public Integer[] range(int start, int stop) { - return null; + Integer[] array = new Integer[]{}; + Integer[] copy2 = new Integer[]{}; + + return copy2 = Arrays.copyOfRange(array, start, stop); } public Integer getSumOfFirstTwo(Integer[] array) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index d59709a..87ac74d 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -4,25 +4,25 @@ public class WuTangConcatenator { public Integer Wu; public Integer Tang; public Integer WuTang; - public Integer value = 0; + public WuTangConcatenator(Integer input) { } public Boolean isWu() { - if (value % 3 == 0) { + if (Wu % 3 == 0) { return true; } return false; } public Boolean isTang() { - if (value % 5 == 0) { + if (Tang % 5 == 0) { return true; } return false; } public Boolean isWuTang() { - if (value % 3 == 0 && value % 5 ==0) { + if (WuTang % 3 == 0 && WuTang % 5 ==0) { return true; } return false; From 3e1ac8cea6b6571c582d451c06acf1e51f0fcffd Mon Sep 17 00:00:00 2001 From: Mo Russ Date: Fri, 6 Mar 2020 10:22:01 -0500 Subject: [PATCH 3/7] BasicUtilities done --- .../zipcodewilmington/assessment2/part1/BasicUtilities.java | 6 ++++-- .../assessment2/part1/WuTangConcatenator.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index 055952d..4075757 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -20,7 +20,9 @@ public Boolean isBetween5And7(Integer valueToEvaluate) { } public Boolean startsWith(String string, Character character) { + if(string.startsWith(String.valueOf(character))) { + return true; + }return false; + } - return true; - } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 87ac74d..142c1d7 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -4,7 +4,7 @@ public class WuTangConcatenator { public Integer Wu; public Integer Tang; public Integer WuTang; - + public WuTangConcatenator(Integer input) { } From 5b524185f83a5fff57ad7b80d36050111606be91 Mon Sep 17 00:00:00 2001 From: Mo Russ Date: Fri, 6 Mar 2020 11:14:13 -0500 Subject: [PATCH 4/7] merge tests passed --- .../assessment2/part1/BasicUtilities.java | 2 +- .../part1/IntegerArrayUtilities.java | 15 ++++++++++-- .../assessment2/part1/WuTangConcatenator.java | 8 +++++-- .../assessment2/part2/ArrayUtility.java | 24 ++++++++++++++++++- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index 4075757..8204801 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -23,6 +23,6 @@ public Boolean startsWith(String string, Character character) { if(string.startsWith(String.valueOf(character))) { return true; }return false; - } + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index 557c5f0..5ba9e81 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -20,10 +20,21 @@ public Integer[] range(int start, int stop) { } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + Integer[] slice = Arrays.copyOfRange(array, array[0], array[1]); + int sumOfFirstTwo = 0; + for(int i = 0; i < slice.length; i++ ){ + sumOfFirstTwo+= i; + } + + return sumOfFirstTwo; } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + Integer[] slice = Arrays.copyOfRange(array, array[0], array[1]); + int prodOfFirstTwo = 0; + for(int i = 0; i < slice.length; i++){ + prodOfFirstTwo *= i; + } + return prodOfFirstTwo; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 142c1d7..5bf2583 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -4,25 +4,29 @@ public class WuTangConcatenator { public Integer Wu; public Integer Tang; public Integer WuTang; + public Integer value; public WuTangConcatenator(Integer input) { } public Boolean isWu() { - if (Wu % 3 == 0) { + if (value % 3 == 0) { + value = Wu; return true; } return false; } public Boolean isTang() { - if (Tang % 5 == 0) { + if (value % 5 == 0) { + value = Tang; return true; } return false; } public Boolean isWuTang() { if (WuTang % 3 == 0 && WuTang % 5 ==0) { + value = WuTang; return true; } return false; diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index de2f799..acee3a4 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -1,8 +1,30 @@ package com.zipcodewilmington.assessment2.part2; +import com.sun.tools.javac.util.ArrayUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + List merged = new ArrayList<>(); + + for (int i=0; i Date: Fri, 6 Mar 2020 11:18:12 -0500 Subject: [PATCH 5/7] passed two tests for countOccurrence --- .../zipcodewilmington/assessment2/part2/ArrayUtility.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index acee3a4..4fdfb16 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -32,7 +32,13 @@ public Integer[] rotate(Integer[] array, Integer index) { } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - return null; + int n = 0; + for(Object to : array1){ + if(to.equals(valueToEvaluate)) + n += 1; + } + + return n; } public Integer mostCommon(Integer[] array) { From 6e6301fcb2361580992c0622dcf0dd5037ca36aa Mon Sep 17 00:00:00 2001 From: Mo Russ Date: Fri, 6 Mar 2020 11:21:57 -0500 Subject: [PATCH 6/7] most common tests done --- .../assessment2/part2/ArrayUtility.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index 4fdfb16..ad8748a 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -42,6 +42,33 @@ public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer value } public Integer mostCommon(Integer[] array) { - return null; + + Arrays.sort(array); + int max_count = 1, res = array[0]; + int curr_count = 1; + + for (int i = 1; i < array.length; i++) + { + if (array[i] == array[i - 1]) + curr_count++; + else + { + if (curr_count > max_count) + { + max_count = curr_count; + res = array[i - 1]; + } + curr_count = 1; + } + } + + + if (curr_count > max_count) + { + max_count = curr_count; + res = array[array.length - 1]; + } + + return res; } } From fd77afc7fcfba6d71971cfc50c68e158226f0e38 Mon Sep 17 00:00:00 2001 From: Mo Russ Date: Fri, 6 Mar 2020 14:01:50 -0500 Subject: [PATCH 7/7] testLecture passed --- .../assessment2/part2/ArrayUtility.java | 2 +- .../assessment2/part2/ListUtility.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index ad8748a..8fe9fbe 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -62,7 +62,7 @@ public Integer mostCommon(Integer[] array) { } } - + if (curr_count > max_count) { max_count = curr_count; diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..77838d4 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -3,12 +3,16 @@ import java.util.List; public class ListUtility { + ListUtility utility; public Boolean add(int i) { - return null; + utility.add(i); + utility.contains(i); + return true; } public Integer size() { - return null; + Integer result = utility.size(); + return result; } public List getUnique() { @@ -24,6 +28,8 @@ public Integer mostCommon() { } public Boolean contains(Integer valueToAdd) { - return null; + utility.add(valueToAdd); + utility.contains(valueToAdd); + return true; } }