From f6db5b6b1eee4379fa480021c91661d7ff7d752b Mon Sep 17 00:00:00 2001 From: asconem Date: Fri, 6 Mar 2020 10:52:10 -0500 Subject: [PATCH 1/4] Saving --- .../assessment2/part1/BasicUtilities.java | 22 +++++++++--- .../part1/IntegerArrayUtilities.java | 16 +++++++-- .../assessment2/part1/WuTangConcatenator.java | 17 +++++++-- .../assessment2/part2/ArrayUtility.java | 36 +++++++++++++++++-- .../assessment2/part2/ListUtility.java | 21 ++++++++--- .../assessment2/part2/Router.java | 10 +++++- 6 files changed, 104 insertions(+), 18 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..65b97ba 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,18 +2,32 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - return null; + if (value >= 5) + return true; + else + return false; } public Boolean isLessThan7(Integer value) { - return null; + if (value <= 7) + return true; + else + return false; } public Boolean isBetween5And7(Integer valueToEvaluate) { - return null; + if (isGreaterThan5(valueToEvaluate) && isLessThan7(valueToEvaluate)) { + return true; + } + return false; } public Boolean startsWith(String string, Character character) { - return null; + if (string.toLowerCase().charAt(0) == character) + return true; + else if (string.charAt(0) == character) + return true; + else + 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 a360000..94bfd98 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -2,18 +2,28 @@ public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - return null; + if (array.length % 2 == 0) + return true; + else + return false; } public Integer[] range(int start, int stop) { +// Integer[] result = new Integer[stop-start]; +// for (int i = start; i <= stop; i++) { +// result[] = i; +// } +// return result; return null; } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + Integer sum = array[0] + array[1]; + return sum; } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + Integer product = array[array.length-1] * array[array.length-2]; + return product; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 63f210e..668905e 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,29 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + Integer input = 0; public WuTangConcatenator(Integer input) { + this.input = input; } public Boolean isWu() { - return null; + if (input % 3 == 0) + return true; + else + return false; } public Boolean isTang() { - return null; + if (input % 5 == 0) + return true; + else + return false; } public Boolean isWuTang() { - return null; + if (input % 3 == 0 && input % 5 == 0) + return true; + else + 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..6761050 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -1,8 +1,24 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer[] newArr = new Integer[array1.length + array2.length]; + int count = 0; + + for (int i = 0; i < array1.length; i++) { + newArr[i] = array1[i]; + count++; + } + + for (int j = 0; j < array2.length; j++) { + newArr[count++] = array2[j]; + } + + return newArr; } public Integer[] rotate(Integer[] array, Integer index) { @@ -10,7 +26,23 @@ public Integer[] rotate(Integer[] array, Integer index) { } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - return null; + int count1 = 0; + int count2 = 0; + int total = 0; + + for (int i = 0; i < array1.length; i++) { + if (array1[i] == valueToEvaluate) + count1++; + } + + for (int j = 0; j < array2.length; j++) { + if (array2[j] == valueToEvaluate) + count2++; + } + + total = count1 + count2; + return total; + } public Integer mostCommon(Integer[] array) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..820cc27 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,22 +1,32 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; public class ListUtility { + + List list = new ArrayList<>(); + public Boolean add(int i) { - return null; + return list.add(i); } public Integer size() { - return null; + return list.size(); } public List getUnique() { - return null; + return new ArrayList<>(new LinkedHashSet<>(list)); } public String join() { - return null; + String result = "" + list.get(0); + for (int i = 1; i map = new HashMap<>(); + public void add(String path, String controller) { + map.put(path, controller); } public Integer size() { - return null; + + return map.size(); } public String getController(String path) { @@ -13,8 +19,10 @@ public String getController(String path) { } public void update(String path, String studentController) { + map.replace(path, studentController); } public void remove(String path) { + map.remove(path); } } From 779265d788fa1af27e9ad7e84953d5d75faf8f81 Mon Sep 17 00:00:00 2001 From: asconem Date: Fri, 6 Mar 2020 11:21:12 -0500 Subject: [PATCH 2/4] Updating with more passing tests --- .../part1/IntegerArrayUtilities.java | 15 +++++++----- .../assessment2/part2/ArrayUtility.java | 14 ++++++++++- .../assessment2/part3/Bird.java | 4 ++-- .../assessment2/part3/BlueJay.java | 11 ++++++++- .../assessment2/part3/Horse.java | 16 ++++++++++++- .../assessment2/part3/RedRobin.java | 23 ++++++++++++++++++- .../assessment2/part3/SpeedComparator.java | 7 +++++- 7 files changed, 77 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index 94bfd98..7a26652 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.assessment2.part1; +import java.util.ArrayList; + public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { if (array.length % 2 == 0) @@ -9,12 +11,13 @@ public Boolean hasEvenLength(Integer[] array) { } public Integer[] range(int start, int stop) { -// Integer[] result = new Integer[stop-start]; -// for (int i = start; i <= stop; i++) { -// result[] = i; -// } -// return result; - return null; + ArrayList list = new ArrayList<>(); + for (int i = start; i <= stop; i++) { + list.add(i); + } + + Integer[] newArr = list.toArray(new Integer[0]); + return newArr; } public Integer getSumOfFirstTwo(Integer[] array) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index 6761050..d385278 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -22,7 +22,19 @@ public Integer[] merge(Integer[] array1, Integer[] array2) { } public Integer[] rotate(Integer[] array, Integer index) { - return null; + for (int i = 0; i < index; i++) { + int j; + int first; + first = array[0]; + + for(j = 0; j < array.length -1; j++) { + array[j] = array[j+1]; + } + + array[j] = first; + } + + return array; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java index ee230c5..de8f746 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java @@ -1,8 +1,8 @@ package com.zipcodewilmington.assessment2.part3; -public class Bird { +public abstract class Bird implements Animal{ public String move() { - return null; + return "fly"; } public void setMigrationMonth(String expected) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java b/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java index f18d13a..2d29203 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java @@ -1,4 +1,13 @@ package com.zipcodewilmington.assessment2.part3; -public class BlueJay { +public class BlueJay extends Bird { + + public String color() { + return "blue"; + } + + @Override + public int getSpeed() { + return 13; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java index e78cf2b..2a64df4 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java @@ -1,4 +1,18 @@ package com.zipcodewilmington.assessment2.part3; -public class Horse{ +public class Horse implements Animal { + @Override + public String move() { + return "gallop"; + } + + @Override + public int getSpeed() { + return 40; + } + + @Override + public String color() { + return "brown"; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java index c1e85f2..a86c5a2 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java @@ -1,4 +1,25 @@ package com.zipcodewilmington.assessment2.part3; -public class RedRobin { +public class RedRobin extends Bird { + @Override + public String getMigrationMonth() { + return migrationMonth; + } + + @Override + public void setMigrationMonth(String migrationMonth) { + this.migrationMonth = migrationMonth; + } + + private String migrationMonth; + + @Override + public int getSpeed() { + return 10; + } + + @Override + public String color() { + return "red"; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java index 532e766..dba2124 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java @@ -1,4 +1,9 @@ package com.zipcodewilmington.assessment2.part3; -public class SpeedComparator { +import java.util.Comparator; + +public class SpeedComparator implements Comparator { + public int compare(Animal a, Animal b){ + return b.getSpeed() - a.getSpeed(); + } } From b0849b5acacd830ad1b88d22cbb25ab0c21d2c07 Mon Sep 17 00:00:00 2001 From: asconem Date: Fri, 6 Mar 2020 11:24:40 -0500 Subject: [PATCH 3/4] Updating with more passing tests --- .../assessment2/part2/ArrayUtility.java | 21 ++++++++++++++++++- 1 file changed, 20 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 d385278..ce33921 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -58,6 +58,25 @@ public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer value } public Integer mostCommon(Integer[] array) { - return null; + int count = 1; + int tempCount; + int popular = array[0]; + int temp = 0; + for (int i = 0; i < (array.length - 1); i++) + { + temp = array[i]; + tempCount = 0; + for (int j = 1; j < array.length; j++) + { + if (temp == array[j]) + tempCount++; + } + if (tempCount > count) + { + popular = temp; + count = tempCount; + } + } + return popular; } } From 66993827593c2d5468e488b928362de6527924f8 Mon Sep 17 00:00:00 2001 From: asconem Date: Fri, 6 Mar 2020 11:36:25 -0500 Subject: [PATCH 4/4] Making sure everything is submitted. --- .../assessment2/part2/ArrayUtility.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index ce33921..c58e799 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -62,17 +62,14 @@ public Integer mostCommon(Integer[] array) { int tempCount; int popular = array[0]; int temp = 0; - for (int i = 0; i < (array.length - 1); i++) - { + for (int i = 0; i < (array.length - 1); i++) { temp = array[i]; tempCount = 0; - for (int j = 1; j < array.length; j++) - { + for (int j = 1; j < array.length; j++) { if (temp == array[j]) tempCount++; } - if (tempCount > count) - { + if (tempCount > count) { popular = temp; count = tempCount; }