From 597e57761202a7dc7f3ac219bda536b8ec41d512 Mon Sep 17 00:00:00 2001 From: chipfody <60615532+chipfody@users.noreply.github.com> Date: Fri, 6 Mar 2020 10:03:34 -0500 Subject: [PATCH 1/6] Quiz21 --- .../assessment2/part1/BasicUtilities.java | 7 ++++--- .../assessment2/part1/IntegerArrayUtilities.java | 13 ++++++++++--- 2 files changed, 14 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 1402353..dd0965d 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,15 +2,16 @@ 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 isGreaterThan5(valueToEvaluate) && isLessThan7(valueToEvaluate); } public Boolean startsWith(String string, Character character) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index a360000..3b6311e 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -2,15 +2,22 @@ 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[] testArray = new Integer[stop - start + 1]; + for (int i = 0; i < testArray.length; i++) { + testArray[i] = start; + start++; + } + return testArray; } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + + return array[0] + array[1]; } public Integer getProductOfFirstTwo(Integer[] array) { From 988a4094145fe5c234b0eb34f735498be5bf90e6 Mon Sep 17 00:00:00 2001 From: chipfody <60615532+chipfody@users.noreply.github.com> Date: Fri, 6 Mar 2020 10:06:47 -0500 Subject: [PATCH 2/6] Quiz22 --- .../assessment2/part1/IntegerArrayUtilities.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index 3b6311e..73b0cf9 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -21,6 +21,7 @@ public Integer getSumOfFirstTwo(Integer[] array) { } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + + return array[array.length -1] * array[array.length - 2]; } } From 17f9302fde7f2a973f33e18a70860ba7baf65cf1 Mon Sep 17 00:00:00 2001 From: chipfody <60615532+chipfody@users.noreply.github.com> Date: Fri, 6 Mar 2020 10:47:40 -0500 Subject: [PATCH 3/6] Quiz23 --- .../assessment2/part1/WuTangConcatenator.java | 1 + .../assessment2/part2/ArrayUtility.java | 41 +++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 63f210e..265824d 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -5,6 +5,7 @@ public WuTangConcatenator(Integer input) { } public Boolean isWu() { + return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index de2f799..8184451 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -1,19 +1,54 @@ package com.zipcodewilmington.assessment2.part2; +import com.j256.ormlite.stmt.query.In; + +import java.util.Arrays; + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer[] result = new Integer[array1.length + array2.length]; + System.arraycopy(array1, 0, result, 0, array1.length); + System.arraycopy(array2, 0, result, array1.length, array2.length); + return result; } public Integer[] rotate(Integer[] array, Integer index) { +// Integer[] result = new Integer[]; +// for (int i = ) return null; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - return null; + int intCount = 0; + Integer[] result = new Integer[array1.length + array2.length]; + result = merge(array1, array2); + for (int i = 0; i < result.length; i++) { + if (result[i].equals(valueToEvaluate)) { + intCount++; + } + } + return intCount; } public Integer mostCommon(Integer[] array) { - return null; + Integer count = 1; + Object mostPop = array[0]; + Integer tempCount; + Object temp = 0; + + for (int i = 0; i < array.length; i++) { + temp = array[i]; + tempCount = 0; + for (int j = 0; j < array.length; j++) { + if (temp == array[j]) { + tempCount++; + } + if ((tempCount > count)){ + mostPop = temp; + count = tempCount; + } + } + } + return (Integer) mostPop; } } From 4c72b30a386d40ba03b49bd1269dee6777d775f7 Mon Sep 17 00:00:00 2001 From: chipfody <60615532+chipfody@users.noreply.github.com> Date: Fri, 6 Mar 2020 11:11:52 -0500 Subject: [PATCH 4/6] Quiz24 --- .../assessment2/part2/ListUtility.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..1366664 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,13 +1,19 @@ package com.zipcodewilmington.assessment2.part2; +import com.j256.ormlite.stmt.query.In; + +import java.util.ArrayList; import java.util.List; public class ListUtility { public Boolean add(int i) { - return null; + ArrayList test = new ArrayList(); + return test.add(i); } public Integer size() { + // ArrayList test = new ArrayList<>(); + return null; } @@ -16,6 +22,8 @@ public List getUnique() { } public String join() { + ArrayList test = new ArrayList<>(); + return null; } From 046eb636b6ddf5a1cd884789dbdc86c9de9aa81e Mon Sep 17 00:00:00 2001 From: chipfody <60615532+chipfody@users.noreply.github.com> Date: Sat, 7 Mar 2020 14:26:20 -0500 Subject: [PATCH 5/6] Quiz2Update --- .../assessment2/part1/BasicUtilities.java | 4 +- .../assessment2/part1/WuTangConcatenator.java | 11 ++-- .../assessment2/part2/ArrayUtility.java | 18 +++++-- .../assessment2/part2/ListUtility.java | 50 ++++++++++++++----- .../assessment2/part2/Router.java | 28 ++++++++++- .../assessment2/part3/Bird.java | 13 ++++- .../assessment2/part3/BlueJay.java | 16 +++++- .../assessment2/part3/Horse.java | 16 +++++- .../assessment2/part3/RedRobin.java | 21 +++++++- .../assessment2/part3/SpeedComparator.java | 16 +++++- 10 files changed, 167 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index dd0965d..71dd459 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.assessment2.part1; +import java.io.CharConversionException; + public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { @@ -15,6 +17,6 @@ public Boolean isBetween5And7(Integer valueToEvaluate) { } public Boolean startsWith(String string, Character character) { - return null; + return Character.toLowerCase(string.charAt(0)) == character || Character.toUpperCase(string.charAt(0)) == character; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 265824d..7cfae4c 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,19 +1,24 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + private Integer input; + public WuTangConcatenator(Integer input) { + this.input = input; } public Boolean isWu() { - return null; + return input % 3 == 0; // either with this. or without works } public Boolean isTang() { - return null; + + return this.input % 5 == 0; } public Boolean isWuTang() { - return null; + + return this.input % 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 8184451..de0ffd2 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -2,7 +2,9 @@ import com.j256.ormlite.stmt.query.In; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { @@ -13,9 +15,19 @@ public Integer[] merge(Integer[] array1, Integer[] array2) { } public Integer[] rotate(Integer[] array, Integer index) { -// Integer[] result = new Integer[]; -// for (int i = ) - return null; + for (int i = 0; i < index; i++) { + int temp = array[0]; + for (int j = 0; j < array.length; j++) { + array[j] = array[j + 1]; + array[j] = temp; + } +// ArrayList testArray = new ArrayList() +// for (Integer t : array) { +// testArray.add(t); +// Collections.rotate(testArray, index); +// Integer[] rotatedArray = new Integer[testArray.size()]; +// rotatedArray = testArray.toArray(rotatedArray); + }return array; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index 1366664..2788303 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -2,36 +2,62 @@ import com.j256.ormlite.stmt.query.In; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.logging.Level; + public class ListUtility { + ArrayList testList = new ArrayList<>(); + public Boolean add(int i) { - ArrayList test = new ArrayList(); - return test.add(i); + testList.add(i); + + return testList.contains(i); } public Integer size() { - // ArrayList test = new ArrayList<>(); - return null; + return testList.size(); } public List getUnique() { - return null; + Set uniqueSet; + uniqueSet = new HashSet(testList); + return new ArrayList(uniqueSet); } public String join() { - ArrayList test = new ArrayList<>(); - - return null; + StringBuilder arrayString = new StringBuilder(""); + for (int i = 0; i < testList.size() - 1; i++) { + arrayString.append(testList.get(i)).append(", "); + } + arrayString.append(testList.get(testList.size() - 1)); + return arrayString.toString(); } public Integer mostCommon() { +// Map mostElement = new HashMap(); +// for (int i : testList) { +// if (mostElement.containsKey(i)) { +// mostElement.put(i, mostElement.get(i) + 1); +// } else { +// mostElement.put(i, 1); +// } +// } +// Integer frequency = 0; +// Integer mostCom = 0; +// Set >mostOften = mostElement.entrySet(); +// for (Map.Entry ent : mostOften) { +// if (ent.getValue() > frequency) { +// mostCom = ent.getValue(); +// } +// } return null; - } + } + public Boolean contains(Integer valueToAdd) { - return null; + System.out.println(testList); + return testList.contains(valueToAdd); } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java index 2267425..51352f4 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -1,20 +1,44 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + public class Router { + + Map testMap = new HashMap<>(); + public void add(String path, String controller) { + + testMap.put(path, controller); } public Integer size() { - return null; + + return testMap.size(); } public String getController(String path) { - return null; + + return testMap.get(path); } public void update(String path, String studentController) { + testMap.put(path, studentController); } public void remove(String path) { + testMap.remove(path); + } + + public String toString(String path, String Controller) { +// StringBuilder keyValues = new StringBuilder(""); +// Iterator keyValueSet = testMap.keySet().iterator(); +// while (keyValueSet.hasNext()) { +// keyValues.append("\n").append(keyValueSet.next()).append(" -> ").append(testMap.get(keyValueSet.next())); +// +// } + + return ""; //keyValues.toString(); } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java index ee230c5..c63670d 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java @@ -1,7 +1,18 @@ package com.zipcodewilmington.assessment2.part3; -public class Bird { +public class Bird implements Animal{ public String move() { + + return "fly"; + } + + @Override + public int getSpeed() { + return 0; + } + + @Override + public String color() { return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java b/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java index f18d13a..4f3ad40 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java @@ -1,4 +1,18 @@ package com.zipcodewilmington.assessment2.part3; -public class BlueJay { +public class BlueJay extends Bird { + @Override + public String move() { + return "fly"; + } + + @Override + public int getSpeed() { + return 13; + } + + @Override + public String color() { + return "blue"; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java index e78cf2b..e033c1c 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..e7d329b 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java @@ -1,4 +1,23 @@ package com.zipcodewilmington.assessment2.part3; -public class RedRobin { +public class RedRobin extends Bird { + + + String migrationMonth; + + @Override + public String getMigrationMonth() { + return "August"; + } + + @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..dcab6c1 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java @@ -1,4 +1,18 @@ package com.zipcodewilmington.assessment2.part3; -public class SpeedComparator { +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public class SpeedComparator implements Comparator { + + List SpeedCompare = new ArrayList(); + public int compare(Animal animal1, Animal animal2) { + if (animal1.getSpeed() == animal2.getSpeed()) + return 0; + else if (animal1.getSpeed() > animal2.getSpeed()) + return 1; + else return -1; + } } From 6ca5e158e68c87c3aa51ac01c5e2f2365e04be7a Mon Sep 17 00:00:00 2001 From: chipfody <60615532+chipfody@users.noreply.github.com> Date: Thu, 30 Jul 2020 17:34:28 -0400 Subject: [PATCH 6/6] improved some questions --- .../assessment2/part1/WuTangConcatenator.java | 3 - .../assessment2/part2/ArrayUtility.java | 31 +++++----- .../assessment2/part2/ListUtility.java | 56 ++++++++++++++----- 3 files changed, 57 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 7cfae4c..620a18e 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -8,17 +8,14 @@ public WuTangConcatenator(Integer input) { } public Boolean isWu() { - return input % 3 == 0; // either with this. or without works } public Boolean isTang() { - return this.input % 5 == 0; } public Boolean isWuTang() { - return this.input % 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 de0ffd2..6287724 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -15,25 +15,21 @@ public Integer[] merge(Integer[] array1, Integer[] array2) { } public Integer[] rotate(Integer[] array, Integer index) { - for (int i = 0; i < index; i++) { - int temp = array[0]; - for (int j = 0; j < array.length; j++) { - array[j] = array[j + 1]; - array[j] = temp; - } -// ArrayList testArray = new ArrayList() -// for (Integer t : array) { -// testArray.add(t); -// Collections.rotate(testArray, index); -// Integer[] rotatedArray = new Integer[testArray.size()]; -// rotatedArray = testArray.toArray(rotatedArray); - }return array; + Integer[] rotatedArray = new Integer[array.length]; + int newIndex = 0; + + for (int i = 0; i < array.length; i++) { + newIndex = i >= index ? i - index : array.length - (index - i); + + rotatedArray[newIndex] = array[i]; + } + return rotatedArray; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - int intCount = 0; - Integer[] result = new Integer[array1.length + array2.length]; - result = merge(array1, array2); + int intCount = 0; + Integer[] result = new Integer[array1.length + array2.length]; + result = merge(array1, array2); for (int i = 0; i < result.length; i++) { if (result[i].equals(valueToEvaluate)) { intCount++; @@ -55,7 +51,7 @@ public Integer mostCommon(Integer[] array) { if (temp == array[j]) { tempCount++; } - if ((tempCount > count)){ + if ((tempCount > count)) { mostPop = temp; count = tempCount; } @@ -64,3 +60,4 @@ public Integer mostCommon(Integer[] array) { return (Integer) mostPop; } } + diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index 2788303..fdeea08 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -4,6 +4,7 @@ import java.util.*; import java.util.logging.Level; +import java.util.stream.Collectors; public class ListUtility { @@ -11,7 +12,7 @@ public class ListUtility { public Boolean add(int i) { testList.add(i); - + //System.out.println(testList.contains(i)); return testList.contains(i); } @@ -31,33 +32,62 @@ public String join() { for (int i = 0; i < testList.size() - 1; i++) { arrayString.append(testList.get(i)).append(", "); } - arrayString.append(testList.get(testList.size() - 1)); + arrayString.append(testList.get(testList.size() - 1)); return arrayString.toString(); } public Integer mostCommon() { -// Map mostElement = new HashMap(); + + HashMap elementCountMap = new HashMap(); + for (int i : testList) + if (elementCountMap.containsKey(i)) { + elementCountMap.put(i, elementCountMap.get(i) + 1); + } else { + elementCountMap.put(i, 1); + } + System.out.println(elementCountMap.keySet()); + System.out.println(elementCountMap.values()); + + Integer element = 0; + Integer frequency = 1; + +// +// for (Map.Entry entry : elementCountMap.entrySet()) { +// if (entry.getValue() > frequency) { +// element = entry.getKey(); +// +// frequency = entry.getValue(); +// } +// } +//// Map element = new HashMap<>(); // for (int i : testList) { -// if (mostElement.containsKey(i)) { -// mostElement.put(i, mostElement.get(i) + 1); +// if (element.containsKey(i)) { +// element.put(i, element.get(i) + 1); // } else { -// mostElement.put(i, 1); +// element.put(i, 1); // } // } // Integer frequency = 0; +// if(!element.isEmpty()) { +// Iterator it = element.entrySet().iterator(); +// while(it.hasNext()) { +// if (element) +// } +// +// // Integer mostCom = 0; -// Set >mostOften = mostElement.entrySet(); +// Set >mostOften = element.entrySet(); // for (Map.Entry ent : mostOften) { // if (ent.getValue() > frequency) { -// mostCom = ent.getValue(); +// mostCom = ent.getKey(); // } // } return null; - } + } - public Boolean contains(Integer valueToAdd) { - System.out.println(testList); - return testList.contains(valueToAdd); + public Boolean contains (Integer valueToAdd){ + System.out.println(testList); + return testList.contains(valueToAdd); + } } -}