From e5497d9b1081c7f4376f92a390858cda7d75f828 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 6 Mar 2020 09:42:48 -0500 Subject: [PATCH 1/6] basic utils done --- .../assessment2/part1/BasicUtilities.java | 19 +++++++++++++++---- 1 file changed, 15 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..366fc79 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,18 +2,29 @@ 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; + if(isGreaterThan5(valueToEvaluate)&&isLessThan7(valueToEvaluate)){ + return true; + } + return false; } public Boolean startsWith(String string, Character character) { - return null; + String lower = string.toLowerCase(); + String upper = string.toUpperCase(); + + if(lower.charAt(0)==character||upper.charAt(0)==character){ + return true; + } + return false; } } From c8b718c8f7e783bdce159b88b8e7ab1f260dd473 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 6 Mar 2020 09:52:04 -0500 Subject: [PATCH 2/6] int arr utils done --- .../part1/IntegerArrayUtilities.java | 20 +++++++++++++++---- 1 file changed, 16 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..ab95a38 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -1,19 +1,31 @@ package com.zipcodewilmington.assessment2.part1; +import java.util.ArrayList; +import java.util.List; + public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - return null; + + return array.length%2==0; } public Integer[] range(int start, int stop) { - return null; + List list= new ArrayList<>(); + for (int i = start; i < stop+1; i++) { + list.add(i); + } + Integer[] result = new Integer[list.size()]; + result = list.toArray(result); + return result; } 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 e1dae1c74eced23246eef1b0fe90184f0b6c26ba Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 6 Mar 2020 09:57:19 -0500 Subject: [PATCH 3/6] wutang concat ain't nothin to mess with --- .../assessment2/part1/WuTangConcatenator.java | 11 ++++++++--- 1 file changed, 8 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..d38046a 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,23 @@ package com.zipcodewilmington.assessment2.part1; public class WuTangConcatenator { + public Integer input; public WuTangConcatenator(Integer input) { + this.input = input; } public Boolean isWu() { - return null; + + return input%3==0; } public Boolean isTang() { - return null; + + return input%5==0; } public Boolean isWuTang() { - return null; + + return isWu()&&isTang(); } } From b47da4ba83ca2f3a448ae15841cbc40efef097ce Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 6 Mar 2020 10:32:30 -0500 Subject: [PATCH 4/6] arr util done --- .../assessment2/part2/ArrayUtility.java | 56 +++++++++++++++++-- 1 file changed, 52 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..0f7d17b 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -1,19 +1,67 @@ package com.zipcodewilmington.assessment2.part2; +import com.j256.ormlite.stmt.query.In; + +import java.util.*; + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + List arr1 = new ArrayList(Arrays.asList(array1)); + arr1.addAll(Arrays.asList(array2)); + Integer[] result = new Integer[arr1.size()]; + result = (Integer[]) arr1.toArray(result); + return result; } public Integer[] rotate(Integer[] array, Integer index) { - return null; + + for (int i = 0; i < index; i++) { + int j; + int first= array[0]; + for( j = 0; j < array.length-1;j++){ + array[j] = array[j+1]; + } + array[j] = first; + } + return array; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - return null; + ArrayUtility au = new ArrayUtility(); + int count = 0; + List list = Arrays.asList(au.merge(array1, array2)); + for(Integer i : list){ + if(i==valueToEvaluate){ + count++; + } + } + return count; } public Integer mostCommon(Integer[] array) { - return null; + + Map map = new HashMap<>(); + Integer highestValue = Integer.MIN_VALUE; + Integer highestKey = 0; + for(Integer i : array){ + if(array.length == 1){ + return array[0]; + } + Integer v = map.get(i); + if(!map.containsKey(i)){ + map.put(i,1); + } + else{ + map.replace(i,v+1); + if(v>highestValue){ + highestValue = v; + highestKey = i; + } + } + + + } + + return highestKey; } } From 2631b3593db801f1dc703ca8d6d76e516ab60649 Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 6 Mar 2020 11:27:53 -0500 Subject: [PATCH 5/6] time up --- .../assessment2/part2/ListUtility.java | 55 ++++++++++++++++--- .../assessment2/part2/Router.java | 26 ++++++++- .../assessment2/part3/Horse.java | 16 +++++- 3 files changed, 87 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index e978685..936d2fe 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -1,29 +1,70 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.ArrayList; import java.util.List; -public class ListUtility { +public class ListUtility { + + public List list; + + public ListUtility(){ + list = new ArrayList<>(); + } + public Boolean add(int i) { - return null; + list.add(i); + return list.contains(i); } public Integer size() { - return null; + + return list.size(); } public List getUnique() { - return null; + List result = new ArrayList<>(); + for(Integer i : list){ + if(!result.contains(i)){ + result.add(i); + } + } + return result; } public String join() { - return null; + String s = ""; + + for(Integer i : list){ + if(list.size()==1){ + return i.toString(); + } + else{ + + s+=i+", "; + } + + } + s=s.substring(0,s.length()-2); + return s; } public Integer mostCommon() { - return null; + ArrayUtility au = new ArrayUtility(); + Integer[] result = new Integer[list.size()]; + result = list.toArray(result); + Integer mc = au.mostCommon(result); + if(mc==null){ + throw new NullPointerException("is null"); + } + return mc; + } 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..3f05d52 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/Router.java @@ -1,20 +1,42 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.HashMap; +import java.util.Map; + public class Router { + public Map map; + + public Router(){ + 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.replace(path, studentController); } public void remove(String path) { + map.remove(path); + } + + @Override + public String toString() { + StringBuilder mapString = new StringBuilder(); + for (String key: map.keySet()){ + mapString.append(key + " -> "+ map.get(key) +"\n"); + } + return mapString.toString(); } } 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"; + } } From fa23f264e707ebe0cf79d0a2004ed5d252176abc Mon Sep 17 00:00:00 2001 From: Emma Beech Date: Fri, 6 Mar 2020 14:25:26 -0500 Subject: [PATCH 6/6] as done as its gonna get --- .../assessment2/part2/ArrayUtility.java | 7 ++++-- .../assessment2/part2/ListUtility.java | 6 ++--- .../assessment2/part3/Bird.java | 4 ++-- .../assessment2/part3/BlueJay.java | 11 ++++++++- .../assessment2/part3/RedRobin.java | 23 ++++++++++++++++++- .../assessment2/part3/SpeedComparator.java | 16 ++++++++++++- 6 files changed, 56 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index 0f7d17b..33eae0e 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -48,11 +48,14 @@ public Integer mostCommon(Integer[] array) { return array[0]; } Integer v = map.get(i); - if(!map.containsKey(i)){ + if(!map.containsKey(i) && i!=null){ map.put(i,1); } else{ - map.replace(i,v+1); + if(i!=null){ + map.replace(i,v+1); + } + if(v>highestValue){ highestValue = v; highestKey = i; diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java index 936d2fe..24000d2 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ListUtility.java @@ -11,7 +11,7 @@ public ListUtility(){ list = new ArrayList<>(); } - public Boolean add(int i) { + public Boolean add(Integer i) { list.add(i); return list.contains(i); } @@ -53,9 +53,7 @@ public Integer mostCommon() { Integer[] result = new Integer[list.size()]; result = list.toArray(result); Integer mc = au.mostCommon(result); - if(mc==null){ - throw new NullPointerException("is null"); - } + return mc; } 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..9f3e7d8 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/RedRobin.java b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java index c1e85f2..f171a9d 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part3/RedRobin.java @@ -1,4 +1,25 @@ package com.zipcodewilmington.assessment2.part3; -public class RedRobin { +public class RedRobin extends Bird { + private String migrationMonth; + + + + public void setMigrationMonth(String month){ + this.migrationMonth = month; + } + + public String getMigrationMonth(){ + return migrationMonth; + } + + @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..8a1ee98 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.Comparator; + +public class SpeedComparator implements Comparator { + @Override + public int compare(Animal o1, Animal o2) { + if(o1.getSpeed()==o2.getSpeed()){ + return 0; + } + else if(o1.getSpeed() > o2.getSpeed()){ + return -1; + } + else{ + return 1; + } + } }