From eb6440505288db0376671e239bf0d7efa8931d0b Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Fri, 6 Mar 2020 11:12:30 -0500 Subject: [PATCH 1/3] passed part1 and some of part2 --- .../assessment2/part1/BasicUtilities.java | 8 +-- .../part1/IntegerArrayUtilities.java | 18 ++++-- .../assessment2/part1/WuTangConcatenator.java | 8 ++- .../assessment2/part2/ArrayUtility.java | 58 +++++++++++++++++-- .../assessment2/part2/ListUtility.java | 47 +++++++++++++-- 5 files changed, 118 insertions(+), 21 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..a834883 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,18 +2,18 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - return null; + return value >= 5; } public Boolean isLessThan7(Integer value) { - return null; + return value <= 7; } public Boolean isBetween5And7(Integer valueToEvaluate) { - return null; + return valueToEvaluate >= 5 && valueToEvaluate <=7; } public Boolean startsWith(String string, Character character) { - return null; + return string.toLowerCase().toCharArray()[0]==character.toString().toLowerCase().toCharArray()[0]; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index a360000..e8ba9fa 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -1,19 +1,29 @@ package com.zipcodewilmington.assessment2.part1; +import java.util.Arrays; + public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - return null; + return array.length%2==0; } public Integer[] range(int start, int stop) { - return null; + Integer[] rangeArray = new Integer[stop - start + 1]; + int counter = 0; + for (int i = start; i<=stop; i++){ + rangeArray[counter] = i; + counter++; + } + + + return rangeArray; } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + return array[0] + array[1]; } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + return array[array.length-1] * array[array.length-2]; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 63f210e..de90486 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,20 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + Integer dividend; public WuTangConcatenator(Integer input) { + this.dividend = input; } public Boolean isWu() { - return null; + return dividend %3 == 0; } public Boolean isTang() { - return null; + return dividend % 5 ==0; } public Boolean isWuTang() { - return null; + return dividend % 15 == 0; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index de2f799..f499706 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -2,18 +2,68 @@ public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer[] merged = new Integer[array1.length + array2.length]; + int counter = 0; + for (int j = 0;j prevCounter){ + result = num; + } + } + } + return result; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..ff159e8 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,29 +1,64 @@ package com.zipcodewilmington.assessment2.part2; +import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.List; public class ListUtility { + ArrayList theList = new ArrayList(); + public Boolean add(int i) { - return null; + theList.add(i); + return theList.contains(i); } public Integer size() { - return null; + return this.size(); } public List getUnique() { - return null; + ArrayList resultList = new ArrayList<>(); + for(Integer num : this.theList){ + if (!resultList.contains(num)) + {resultList.add(num);} + } + return resultList; } public String join() { - return null; + String result = ""; + result += theList.get(0); + for (int i = 1; i < theList.size();i++){ + result += ", " + theList.get(i); + } + return result; } public Integer mostCommon() { - return null; + Integer result=0; + int counter = 0; + int prevCounter = 0; + for(Integer num : theList){ + prevCounter = counter; + counter = 0; + for (Integer currentNum :theList){ + if (currentNum == num){ + counter++; + } + if (counter > prevCounter){ + result = num; + } + } + } + return result; } public Boolean contains(Integer valueToAdd) { - return null; + for (int i = 0;i Date: Fri, 6 Mar 2020 11:27:26 -0500 Subject: [PATCH 2/3] partway through router --- .../assessment2/part2/ListUtility.java | 10 +++++++++- .../zipcodewilmington/assessment2/part2/Router.java | 12 ++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index ff159e8..729db83 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -7,8 +7,16 @@ public class ListUtility { ArrayList theList = new ArrayList(); + public ListUtility(){ + this.theList = new ArrayList(); + } public Boolean add(int i) { - theList.add(i); + this.theList.ensureCapacity(theList.size()+1); + if (theList.size()>0) { + theList.add(theList.size() - 1, i); + } else { + theList.add(0,i); + } return theList.contains(i); } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java index 2267425..70efa42 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -1,15 +1,23 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.HashMap; + public class Router { + HashMap theMap; + + public Router(){ + this.theMap = new HashMap(); + } public void add(String path, String controller) { + this.theMap.put(path,controller); } public Integer size() { - return null; + return theMap.size(); } public String getController(String path) { - return null; + return theMap.get(path); } public void update(String path, String studentController) { From f0f79244f6efdcf5fea022f778a1ce29e2fd5cca Mon Sep 17 00:00:00 2001 From: DavidKellyonGitHub Date: Fri, 6 Mar 2020 11:29:07 -0500 Subject: [PATCH 3/3] commit --- .../java/com/zipcodewilmington/assessment2/part2/Router.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java index 70efa42..25fbc32 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -21,8 +21,10 @@ public String getController(String path) { } public void update(String path, String studentController) { + theMap.put(path,studentController); } public void remove(String path) { + theMap.remove(path); } }