From 7b1bc96e8741d13b64572a9b18eba5d317c0d340 Mon Sep 17 00:00:00 2001 From: Giles Bradford Date: Fri, 6 Mar 2020 09:45:44 -0500 Subject: [PATCH 1/5] saving --- .../assessment2/part1/BasicUtilities.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 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..eb66181 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,18 +2,33 @@ 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 (valueToEvaluate >= 5 && valueToEvaluate <= 7) { + return true; + } else + return false; } public Boolean startsWith(String string, Character character) { - return null; + character.toString().toLowerCase(); + char[] newArray = string.toLowerCase().toCharArray(); + if (newArray[0] == character) { + return true; + } else + return false; } } From ff5635e3bd95aba11db20ffdcf95bcb7a91bc6b4 Mon Sep 17 00:00:00 2001 From: Giles Bradford Date: Fri, 6 Mar 2020 09:58:33 -0500 Subject: [PATCH 2/5] saving my work --- .../part1/IntegerArrayUtilities.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index a360000..a5bc036 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -2,18 +2,27 @@ public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - return null; + if (array.length % 2 == 0) { + return true; + } + return false; } public Integer[] range(int start, int stop) { - return null; + Integer[] arrayToReturn = new Integer[stop - start + 1]; + int index = 0; + for (int i = start; i <= stop; i++) { + arrayToReturn[index] = i; + index++; + } + return arrayToReturn; } 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]; } } From f1a89aa4ecfa15e14f025467a768a3c6b1e41293 Mon Sep 17 00:00:00 2001 From: Giles Bradford Date: Fri, 6 Mar 2020 11:01:20 -0500 Subject: [PATCH 3/5] saving progress --- .../assessment2/part1/BasicUtilities.java | 3 +-- .../assessment2/part1/WuTangConcatenator.java | 10 +++++--- .../assessment2/part2/ArrayUtility.java | 25 ++++++++++++++++++- .../assessment2/part2/ListUtility.java | 25 ++++++++++++++++--- .../assessment2/part3/Bird.java | 4 +-- .../assessment2/part3/BlueJay.java | 11 +++++++- .../assessment2/part3/Horse.java | 16 +++++++++++- .../assessment2/part3/RedRobin.java | 24 +++++++++++++++++- 8 files changed, 104 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index eb66181..a838687 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -24,9 +24,8 @@ public Boolean isBetween5And7(Integer valueToEvaluate) { } public Boolean startsWith(String string, Character character) { - character.toString().toLowerCase(); char[] newArray = string.toLowerCase().toCharArray(); - if (newArray[0] == character) { + if (newArray[0] == Character.toLowerCase(character)) { return true; } else return false; diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 63f210e..ea53dc0 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,22 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + + Integer a = 0; + public WuTangConcatenator(Integer input) { + this.a = input; } public Boolean isWu() { - return null; + return a % 3 == 0; } public Boolean isTang() { - return null; + return a % 5 == 0; } public Boolean isWuTang() { - return null; + return a % 3 == 0 && a % 5 == 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..6041e12 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -2,10 +2,33 @@ public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer[] toReturn = new Integer[array1.length + array2.length]; + int index = 0; + for (Integer integer : array1) { + toReturn[index] = integer; + index++; + } + + for (Integer integer : array2) { + toReturn[index] = integer; + index++; + } + return toReturn; } public Integer[] rotate(Integer[] array, Integer index) { + /*Integer[] toReturn = new Integer[array.length]; + Integer[] temp = new Integer[index]; + int dex = 0; + for (int i = 0; i < temp.length; i++) { + temp[i] = array[i]; + } + + for (int i = 0; i < ; i++) { + + } + + return merge(temp, array);*/ return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..5792bc4 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,17 +1,33 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.ArrayList; import java.util.List; public class ListUtility { + + List list = new ArrayList<>(); + public Boolean add(int i) { - return null; + list.add(i); + if (list.contains(i)) { + return true; + } else + return false; } public Integer size() { - return null; + return list.size(); } public List getUnique() { +/* List toReturn = new ArrayList<>(); + Integer lastSeen = 0; + for (Integer element : list) { + lastSeen = element; + for (Integer index : list) { + if () + } + }*/ return null; } @@ -24,6 +40,9 @@ public Integer mostCommon() { } public Boolean contains(Integer valueToAdd) { - return null; + if (list.contains(valueToAdd)) { + return true; + } else + return false; } } 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..eb183a4 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{ + @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..2ad3b0a 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java @@ -1,4 +1,26 @@ package com.zipcodewilmington.assessment2.part3; -public class RedRobin { +public class RedRobin extends Bird{ + + String migrationMonth; + + @Override + public String getMigrationMonth() { + return migrationMonth; + } + + @Override + public void setMigrationMonth(String migrationMonth) { + this.migrationMonth = migrationMonth; + } + + @Override + public int getSpeed() { + return 10; + } + + @Override + public String color() { + return "red"; + } } From 095d2abf4a302ba8996b346dee8a500d9f206465 Mon Sep 17 00:00:00 2001 From: Giles Bradford Date: Fri, 6 Mar 2020 11:06:38 -0500 Subject: [PATCH 4/5] saving progress... --- .../assessment2/part3/SpeedComparator.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java index 532e766..2647786 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java @@ -1,4 +1,16 @@ package com.zipcodewilmington.assessment2.part3; -public class SpeedComparator { +import java.util.Comparator; + +public class SpeedComparator implements Comparator { + @Override + 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 a02f3b6314188073e1b6bace978dd92bfa9c464e Mon Sep 17 00:00:00 2001 From: Giles Bradford Date: Fri, 6 Mar 2020 11:29:35 -0500 Subject: [PATCH 5/5] saving progress --- .../assessment2/part2/ListUtility.java | 7 +++++- .../assessment2/part2/Router.java | 22 +++++++++++++++++-- 2 files changed, 26 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 5792bc4..8d21a9a 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -32,7 +32,12 @@ public List getUnique() { } public String join() { - return null; + String toReturn = ""; +/* for (int i = 0; i < list.size(); i++) { + toReturn += list.get(i); + if + }*/ + return toReturn; } public Integer mostCommon() { diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java index 2267425..c3b3f5b 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -1,20 +1,38 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.LinkedHashMap; +import java.util.Map; + public class Router { + + LinkedHashMap routerPaths = new LinkedHashMap<>(); + public void add(String path, String controller) { + routerPaths.put(path, controller); } public Integer size() { - return null; + return routerPaths.size(); } public String getController(String path) { - return null; + return routerPaths.get(path); } public void update(String path, String studentController) { + routerPaths.put(path, studentController); } public void remove(String path) { + routerPaths.remove(path); + } + + @Override + public String toString() { + String stringToReturn = ""; + for (Map.Entry element : routerPaths.entrySet()) { + stringToReturn += (element.getKey() + " -> " + element.getValue()); + } + return stringToReturn; } }