diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index 1402353..7d0eb06 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,18 +2,28 @@ 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; + if (string.substring(1).toLowerCase().equals(character.toString().toLowerCase())){ + 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..d51ac30 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) { - return null; + Integer[] newArr = new Integer[stop - start + 1]; + for (int i = 0; i < newArr.length ; i++) { + newArr[i] = start; + start++; + } + return newArr; } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + Integer sum = array[0] + array[1]; + return sum; } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + Integer sum = array[array.length - 1] * array[array.length-2]; + return sum; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java index 63f210e..e873b08 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,28 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + private Integer input; 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 % 15 == 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..a7dedef 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -1,19 +1,61 @@ package com.zipcodewilmington.assessment2.part2; + + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer[] newArr = new Integer[array1.length + array2.length]; + for (int i = 0; i < array1.length ; i++) { + newArr[i] = array1[i]; + } + for (int i = 0; i < array2.length ; i++) { + newArr[i + array1.length] = array2[i]; + } + return newArr; } public Integer[] rotate(Integer[] array, Integer index) { - return null; + Integer[] newArr = new Integer[array.length]; + for (int i = 0; i < newArr.length ; i++) { + newArr[i] = array[index]; + index++; + if(index == array.length){ + index = 0; + } + } + return newArr; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - return null; + Integer count = 0; + + for (int i = 0; i < array1.length ; i++) { + if (array1[i] == valueToEvaluate){ + count++;} + } + for (int i = 0; i < array2.length ; i++) { + if (array2[i] == valueToEvaluate){ + count++; + } + } + return count; } public Integer mostCommon(Integer[] array) { - return null; + Integer mostOcc = 0; + Integer currCount = 0; + Integer occMost =0; + for (int i = 0; i mostOcc){ + mostOcc = currCount; + occMost = array[i];} + currCount = 0; + + } + return occMost; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..fc3e582 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,29 +1,67 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.ArrayList; import java.util.List; public class ListUtility { + private List list = new ArrayList(); + public Boolean add(int i) { - return null; + Integer z =i; + if (z != null){ + this.list.add(z); + return true; + } + else return false; } public Integer size() { - return null; + return list.size(); } public List getUnique() { - return null; + List uniques = new ArrayList<>(); + for (int i = 0; i < list.size() ; i++) { + for (int j = i+1; j < list.size() ; j++) { + if(list.get(i) != list.get(j)){ + uniques.set(i, list.get(i)); + } + } + } + return uniques; } public String join() { - return null; + String string = ""; + string += list.toString(); + string.replace("[","" ); + string.replace("]", ""); + return string; } public Integer mostCommon() { - return null; + Integer mostOcc = 0; + Integer currCount = 0; + Integer occMost =0; + for (int i = 0; i mostOcc){ + mostOcc = currCount; + occMost = list.get(i);} + currCount = 0; + + } + return occMost; } public Boolean contains(Integer valueToAdd) { - return null; + if(valueToAdd != null){ + return list.contains(valueToAdd); + } + + else return null; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java index 2267425..8fe5511 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -1,20 +1,29 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.HashMap; +import java.util.Map; + public class Router { + Map 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) { - return null; + + return map.get(path); } public void update(String path, String studentController) { + map.remove(path); + map.put(path, studentController); } public void remove(String path) { + map.remove(path); } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java index ee230c5..b2f9720 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..095fe7f 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java @@ -1,4 +1,24 @@ package com.zipcodewilmington.assessment2.part3; -public class RedRobin { +public class RedRobin extends Bird { + private String migrationMonth; + @Override + public int getSpeed() { + return 10; + } + + @Override + public String color() { + return "red"; + } + + @Override + public String getMigrationMonth() { + return migrationMonth; + } + + @Override + public void setMigrationMonth(String migrationMonth) { + this.migrationMonth = migrationMonth; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java index 532e766..94e28c9 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/SpeedComparator.java @@ -1,4 +1,15 @@ package com.zipcodewilmington.assessment2.part3; -public class SpeedComparator { +import java.util.Comparator; + +public class SpeedComparator implements Comparator { + @Override + public int compare(Animal o1, Animal o2) { + if (o1.getSpeed() == o2.getSpeed()){ + return 0;} + if (o1.getSpeed()> o2.getSpeed()){ + return -1; + } + else return +1; + } }