From 49ceed2e961c8075c5b232c9bb75ec1338202b38 Mon Sep 17 00:00:00 2001 From: Ujjwal Shrestha Date: Fri, 6 Mar 2020 10:18:31 -0500 Subject: [PATCH 1/4] part 1 completed --- .../assessment2/part1/BasicUtilities.java | 22 +++++++++++--- .../part1/IntegerArrayUtilities.java | 30 +++++++++++++++---- .../assessment2/part1/WuTangConcatenator.java | 16 ++++------ 3 files changed, 49 insertions(+), 19 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..eef9e43 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; + } + return false; } public Boolean isLessThan7(Integer value) { - return null; + if (value <= 7) { + return true; + } + return false; } public Boolean isBetween5And7(Integer valueToEvaluate) { - return null; + if ((valueToEvaluate >= 5) && (valueToEvaluate <=7)){ + return true; + } + return false; } public Boolean startsWith(String string, Character character) { - return null; + char[] ch = string.toCharArray(); + if (ch[0] == character || ch[0] == character.toUpperCase(character)) { + return true; + } + 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..a82e23b 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -1,19 +1,39 @@ package com.zipcodewilmington.assessment2.part1; +import java.util.ArrayList; +import java.util.List; + 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; + + List result = new ArrayList<>(); + for (int i = start; i <= stop; i++) + { + result.add(i); + } + + Integer[] finalResult = new Integer[result.size()]; + for (int i =0; i < result.size(); i++) { + finalResult[i] = result.get(i); + } + return finalResult; + } 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..00d42d0 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,14 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + private Integer input; public WuTangConcatenator(Integer input) { + this.input = input; } + public Boolean isWu () { return input % 3 == 0;} - public Boolean isWu() { - return null; - } - - public Boolean isTang() { - return null; - } + public Boolean isTang () { return input % 5 == 0;} - public Boolean isWuTang() { - return null; - } + public Boolean isWuTang () { return input % 15 ==0;} } + From cf1ba04daf71c88b777ff63c5bb4732fafc61d31 Mon Sep 17 00:00:00 2001 From: Ujjwal Shrestha Date: Fri, 6 Mar 2020 10:44:12 -0500 Subject: [PATCH 2/4] arrayutility done --- .../assessment2/part2/ArrayUtility.java | 52 +++++++++++++++++-- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index de2f799..d34389a 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -2,18 +2,62 @@ public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + + Integer[] result = new Integer[array1.length + array2.length]; + int count =0; + for (int i = 0; i< array1.length; i++){ + result[i] = array1[i]; + count++; + } + for (int j = 0; j < array2.length; j++){ + result[count++] = array2[j]; + } + return result; } public Integer[] rotate(Integer[] array, Integer index) { - return null; + Integer[] result = new Integer[array.length]; + for (int i = 0; i < array.length; i++) { + result[(i + array.length - index) % array.length] = array[i]; + } + return result; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - return null; + + Integer count = 0; + for (int i = 0; i < array1.length; i++) { + if (valueToEvaluate == array1[i]) { + count++; + } + } + for (int i = 0; i < array2.length; i++) { + if (valueToEvaluate == array2[i]) { + count++; + } + } + return count; } public Integer mostCommon(Integer[] array) { - return null; + + Integer count = 1; + Integer mostCommon = array[0]; + + for (int i = 0; i < array.length - 1; i++) { + Integer temp = array[i]; + Integer tempCount = 0; + + for (int j = 1; j < array.length; j++) + if (temp == array[j]) + tempCount++; + + if (tempCount > count) { + mostCommon = temp; + count = tempCount; + } + } + return mostCommon; } } + From e692ffc68bf630f285d5be50913dc067f915811b Mon Sep 17 00:00:00 2001 From: Ujjwal Shrestha Date: Fri, 6 Mar 2020 11:16:14 -0500 Subject: [PATCH 3/4] part 2 partially done. still few test failed --- .../assessment2/part2/ArrayUtility.java | 2 +- .../assessment2/part2/ListUtility.java | 30 ++++++++++++++++--- .../assessment2/part2/Router.java | 27 ++++++++++++----- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index d34389a..59f2cb1 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -39,7 +39,7 @@ public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer value return count; } - public Integer mostCommon(Integer[] array) { + public static Integer mostCommon(Integer[] array) { Integer count = 1; Integer mostCommon = array[0]; diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..b2dfc96 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,14 +1,17 @@ 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; + return list.add(i); } public Integer size() { - return null; + return list.size(); } public List getUnique() { @@ -16,14 +19,33 @@ public List getUnique() { } public String join() { - return null; + String result = ""; + for (int i = 0; i < list.size(); i++) { + + if (i == list.size() - 1) + result += list.get(i).toString(); + else + result += list.get(i).toString() + ", "; + } + return result; } public Integer mostCommon() { + +// Integer result = list.get(0); +// +//// Integer [] common = new Integer[list.size()]; +//// for (int i = 0; i < list.size(); i++) { +//// common[i] = list.get(i); +//// } +//// result = ArrayUtility.mostCommon(common); +// +// return result; + return null; } public Boolean contains(Integer valueToAdd) { - return null; + return list.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..bdd0885 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -1,20 +1,31 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.HashMap; +import java.util.Map; + public class Router { - public void add(String path, String controller) { - } + + public Map mymap = new HashMap<>(); + + public void add(String path, String controller) { this.mymap.put(path,controller); } public Integer size() { - return null; + return this.mymap.size(); } public String getController(String path) { - return null; + return this.mymap.get(path); } - public void update(String path, String studentController) { - } + public void update(String path, String studentController) { this.mymap.put(path,studentController);} - public void remove(String path) { - } + public void remove(String path) { this.mymap.remove(path); } + +// @Override +// public String toString() { +// return "Router{" + +// "mymap=" + mymap + +// '}'; +// } } + From 4dbd354a5a5a36f8efe8511636d441dbd265a8d3 Mon Sep 17 00:00:00 2001 From: Ujjwal Shrestha Date: Fri, 6 Mar 2020 11:30:56 -0500 Subject: [PATCH 4/4] Need to work later --- .../assessment2/part3/Bird.java | 7 +++---- .../assessment2/part3/BlueJay.java | 8 +++++++- .../assessment2/part3/Horse.java | 18 +++++++++++++++++- .../assessment2/part3/RedRobin.java | 18 +++++++++++++++++- .../assessment2/part3/SpeedComparator.java | 7 ++++++- 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java index ee230c5..8dea60b 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/Bird.java @@ -1,9 +1,8 @@ package com.zipcodewilmington.assessment2.part3; -public class Bird { - public String move() { - return null; - } +public abstract class Bird implements Animal { + + public String move() { 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..663d193 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/BlueJay.java @@ -1,4 +1,10 @@ package com.zipcodewilmington.assessment2.part3; -public class BlueJay { +public class BlueJay extends Bird{ + + @Override + public int getSpeed() { return 10; } + + @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..5480709 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/Horse.java @@ -1,4 +1,20 @@ package com.zipcodewilmington.assessment2.part3; -public class Horse{ +public class Horse implements Animal{ + String move; + String color; + + public Horse() { + this.move="gallop"; + this.color="brown"; + } + + @Override + public String move() { return move; } + + @Override + public String color() { return color; } + + @Override + public int getSpeed() { return 20; } } diff --git a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java index c1e85f2..3194438 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java @@ -1,4 +1,20 @@ package com.zipcodewilmington.assessment2.part3; -public class RedRobin { +public class RedRobin extends Bird{ + + String migrationMonth; + + @Override + public int getSpeed() { return 8; } + + @Override + public String color() { return "red"; } + + @Override + public void setMigrationMonth(String migrationMonth) { this.migrationMonth = migrationMonth; } + + @Override + public String getMigrationMonth() { return 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..03b269a 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 { + + @Override + public int compare(Animal o1, Animal o2) { return o2.getSpeed()-o1.getSpeed(); } }