From 926fef9db761fac4d925e952fecd7b2f8ae56ad7 Mon Sep 17 00:00:00 2001 From: jess10tindo Date: Thu, 24 Sep 2020 18:25:27 -0400 Subject: [PATCH 1/2] Jess Code --- .../com/dtcc/exams/part1/BasicUtilities.java | 26 ++++++- .../dtcc/exams/part1/DelTechConcatenator.java | 22 +++++- .../exams/part1/IntegerArrayUtilities.java | 23 +++++- .../com/dtcc/exams/part2/ArrayUtility.java | 56 +++++++++++++- .../com/dtcc/exams/part2/ListUtility.java | 74 +++++++++++++++++-- .../java/com/dtcc/exams/part2/Router.java | 1 + src/main/java/com/dtcc/exams/part3/Bird.java | 4 +- src/main/java/com/dtcc/exams/part3/Horse.java | 16 +++- .../com/dtcc/exams/part3/PeregrineFalcon.java | 10 ++- .../java/com/dtcc/exams/part3/RedRobin.java | 10 ++- .../com/dtcc/exams/part3/SpeedComparator.java | 8 +- 11 files changed, 222 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/dtcc/exams/part1/BasicUtilities.java b/src/main/java/com/dtcc/exams/part1/BasicUtilities.java index 640df37..30fc88a 100644 --- a/src/main/java/com/dtcc/exams/part1/BasicUtilities.java +++ b/src/main/java/com/dtcc/exams/part1/BasicUtilities.java @@ -3,19 +3,37 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - return null; + boolean isGreaterThan5 = false; + if( value > 5 ){ + isGreaterThan5 = true; + } + return isGreaterThan5; } public Boolean isLessThan7(Integer value) { - return null; + boolean isLessThan7 = false; + if( value < 7 ){ + isLessThan7 = true; + } + return isLessThan7; } public Boolean isBetween5And7(Integer valueToEvaluate) { - return null; + boolean isBetween5And7 = false; + if( valueToEvaluate >= 5 && valueToEvaluate <= 7){ + isBetween5And7 = true; + } + return isBetween5And7; } public Boolean startsWith(String string, Character character) { - return null; + boolean startsWith = false; + String firstLetter = string.charAt(0) + ""; + String strCharacter = character + ""; + if(firstLetter.equalsIgnoreCase(strCharacter)){ + startsWith = true; + } + return startsWith; } } \ No newline at end of file diff --git a/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java b/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java index 61abcdd..e80e418 100644 --- a/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java +++ b/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java @@ -2,19 +2,35 @@ public class DelTechConcatenator { + private int input; + public DelTechConcatenator(Integer input) { + this.input = input; } public Boolean isDel() { - return null; + boolean isDel = false; + if(this.input % 3 == 0){ + isDel = true; + } + return isDel; } public Boolean isTech() { - return null; + boolean isTech = false; + if(this.input % 5 == 0){ + isTech = true; + } + return isTech; } public Boolean isDelTech() { - return null; + boolean isDelTech = false; + if(this.input % 3 == 0 && input % 5 == 0){ + isDelTech = true; + } + + return isDelTech; } } diff --git a/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java b/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java index a7e9aaa..6b1c631 100644 --- a/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java @@ -3,19 +3,34 @@ public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - return null; + boolean hasEvenLength = false; + if(array.length % 2 == 0){ + hasEvenLength = true; + } + return hasEvenLength; } public Integer[] range(int start, int stop) { - return null; + Integer[] range = new Integer[(stop - (start-1))]; + int j = 0; + for(int i = start; i <= stop; i++){ + range[j] = i; + j++; + } + return range; } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + Integer sum; + sum = array[0] + array[1]; + return sum; } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + Integer product; + + product = array[array.length-2] * array[array.length-1]; + return product; } } diff --git a/src/main/java/com/dtcc/exams/part2/ArrayUtility.java b/src/main/java/com/dtcc/exams/part2/ArrayUtility.java index 41885cb..1086838 100644 --- a/src/main/java/com/dtcc/exams/part2/ArrayUtility.java +++ b/src/main/java/com/dtcc/exams/part2/ArrayUtility.java @@ -1,21 +1,69 @@ package com.dtcc.exams.part2; +import java.util.Arrays; + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer[] mergedArray = new Integer[array1.length + array2.length]; + int c = 0; + for(int i = 0; i < array1.length; i++){ + mergedArray[i] = array1[i]; + } + for(int j = array1.length; j < mergedArray.length; j++){ + mergedArray[j] = array2[c]; + c++; + } + return mergedArray; } public Integer[] rotate(Integer[] array, Integer index) { - return null; + Integer[] rotatedArray = new Integer[array.length]; + int e = 0; + for(int i = 0; i < array.length - index; i++){ + rotatedArray[i] = array[i+index]; + } + for(int j = array.length-(index); j < rotatedArray.length; j++){ + rotatedArray[j] = array[e]; + e++; + } + return rotatedArray; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - return null; + Integer counter = 0; + for(int i = 0; i < array1.length; i++) { + if (array1[i] == valueToEvaluate) { + counter++; + } + } + for(int i = 0; i < array2.length; i++) { + if(array2[i] == valueToEvaluate){ + counter++; + } + } + return counter; } public Integer mostCommon(Integer[] array) { - return null; + Arrays.sort(array); + System.out.println(); + int currentCount=0; + int maxCount = 0; + int indexOfMostCommon = 0; + int mostCommon; + for( int i = 1; i < array.length; i++){ + if (array[i] == array[i-1]){ + currentCount ++; + } + if (currentCount > maxCount) { + maxCount = currentCount; + currentCount = 0; + indexOfMostCommon = i-1; + } + } + mostCommon = array[indexOfMostCommon]; + return mostCommon; } } diff --git a/src/main/java/com/dtcc/exams/part2/ListUtility.java b/src/main/java/com/dtcc/exams/part2/ListUtility.java index 4c4e910..143f881 100644 --- a/src/main/java/com/dtcc/exams/part2/ListUtility.java +++ b/src/main/java/com/dtcc/exams/part2/ListUtility.java @@ -1,31 +1,91 @@ package com.dtcc.exams.part2; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; public class ListUtility { + ArrayList myList = new ArrayList<>(); - public Boolean add(int i) { - return null; + + public Boolean add(Integer i) { + + boolean wasAdded = false; + myList.add(i); + if(contains(i)){ + wasAdded = true; + } + if( i == null ){ + wasAdded = false; + } + return wasAdded; } public Integer size() { - return null; + int size = myList.size(); + return size; } public List getUnique() { - return null; + Collections.sort(myList); + ArrayList uniqueList = new ArrayList<>(); + uniqueList.add(myList.get(0)); + for(int i = 1; i < myList.size(); i++){ + if (myList.get(i) == myList.get(i-1)){ + + } + else{ + uniqueList.add(myList.get(i)); + } + + } + return uniqueList; } public String join() { - return null; + String strMyList = myList.get(0) + ""; + for(int i = 1; i < myList.size(); i++){ + strMyList += ", " + myList.get(i); + } + return strMyList; } public Integer mostCommon() { - return null; + for (int i = 0; i< myList.size(); i++){ + System.out.print(myList.get(i) + " "); + } + System.out.println(); + Collections.sort(myList); + for (int i = 0; i< myList.size(); i++){ + System.out.print(myList.get(i) + " "); + } + System.out.println(); + int currentCount = 1; + int maxCount = 0; + int indexOfMostCommon = 0; + Integer mostCommon; + for( int i = 1; i < myList.size(); i++){ + if (myList.get(i) == myList.get(i-1)){ + currentCount ++; + } + if (currentCount > maxCount) { + maxCount = currentCount; + currentCount = 1; + indexOfMostCommon = i-1; + } + } + + mostCommon = myList.get(indexOfMostCommon); + return mostCommon; } public Boolean contains(Integer valueToAdd) { - return null; + boolean contains = false; + if (myList.contains(valueToAdd)){ + contains = true; + } + return contains; } } diff --git a/src/main/java/com/dtcc/exams/part2/Router.java b/src/main/java/com/dtcc/exams/part2/Router.java index 3c699b6..246de87 100644 --- a/src/main/java/com/dtcc/exams/part2/Router.java +++ b/src/main/java/com/dtcc/exams/part2/Router.java @@ -3,6 +3,7 @@ public class Router { public void add(String path, String controller) { + } public Integer size() { diff --git a/src/main/java/com/dtcc/exams/part3/Bird.java b/src/main/java/com/dtcc/exams/part3/Bird.java index a24cbd8..faf05cb 100644 --- a/src/main/java/com/dtcc/exams/part3/Bird.java +++ b/src/main/java/com/dtcc/exams/part3/Bird.java @@ -1,9 +1,9 @@ package com.dtcc.exams.part3; -public class Bird { +public abstract class Bird { public String move() { - return null; + return "fly"; } public void setMigrationMonth(String expected) { diff --git a/src/main/java/com/dtcc/exams/part3/Horse.java b/src/main/java/com/dtcc/exams/part3/Horse.java index c02e088..9a05417 100644 --- a/src/main/java/com/dtcc/exams/part3/Horse.java +++ b/src/main/java/com/dtcc/exams/part3/Horse.java @@ -1,4 +1,18 @@ package com.dtcc.exams.part3; -public class Horse { +public class Horse implements Animal{ + @Override + public String move() { + return "gallop"; + } + + @Override + public String color() { + return "black"; + } + + @Override + public int getSpeed() { + return 40; + } } diff --git a/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java b/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java index b5c53b3..0572c70 100644 --- a/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java +++ b/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java @@ -1,4 +1,12 @@ package com.dtcc.exams.part3; -public class PeregrineFalcon { +public class PeregrineFalcon extends Bird { + + public String color() { + return "brown"; + } + + public int getSpeed() { + return 13; + } } diff --git a/src/main/java/com/dtcc/exams/part3/RedRobin.java b/src/main/java/com/dtcc/exams/part3/RedRobin.java index 49fd626..3e66c16 100644 --- a/src/main/java/com/dtcc/exams/part3/RedRobin.java +++ b/src/main/java/com/dtcc/exams/part3/RedRobin.java @@ -1,4 +1,12 @@ package com.dtcc.exams.part3; -public class RedRobin { +public class RedRobin extends Bird{ + + public String color() { + return "red"; + } + + public int getSpeed() { + return 10; + } } diff --git a/src/main/java/com/dtcc/exams/part3/SpeedComparator.java b/src/main/java/com/dtcc/exams/part3/SpeedComparator.java index 2aa8c7f..57e61e3 100644 --- a/src/main/java/com/dtcc/exams/part3/SpeedComparator.java +++ b/src/main/java/com/dtcc/exams/part3/SpeedComparator.java @@ -1,4 +1,10 @@ package com.dtcc.exams.part3; -public class SpeedComparator { +import java.util.Comparator; + +public class SpeedComparator implements Comparator { + + public int compare(Animal o1, Animal o2) { + return 0; + } } From 8fd57096c1b5408a01d18a48e1c5d96a16e04e78 Mon Sep 17 00:00:00 2001 From: jess10tindo <60118838+jess10tindo@users.noreply.github.com> Date: Thu, 24 Sep 2020 18:35:49 -0400 Subject: [PATCH 2/2] Revert "Jess Code" --- .../com/dtcc/exams/part1/BasicUtilities.java | 26 +------ .../dtcc/exams/part1/DelTechConcatenator.java | 22 +----- .../exams/part1/IntegerArrayUtilities.java | 23 +----- .../com/dtcc/exams/part2/ArrayUtility.java | 56 +------------- .../com/dtcc/exams/part2/ListUtility.java | 74 ++----------------- .../java/com/dtcc/exams/part2/Router.java | 1 - src/main/java/com/dtcc/exams/part3/Bird.java | 4 +- src/main/java/com/dtcc/exams/part3/Horse.java | 16 +--- .../com/dtcc/exams/part3/PeregrineFalcon.java | 10 +-- .../java/com/dtcc/exams/part3/RedRobin.java | 10 +-- .../com/dtcc/exams/part3/SpeedComparator.java | 8 +- 11 files changed, 28 insertions(+), 222 deletions(-) diff --git a/src/main/java/com/dtcc/exams/part1/BasicUtilities.java b/src/main/java/com/dtcc/exams/part1/BasicUtilities.java index 30fc88a..640df37 100644 --- a/src/main/java/com/dtcc/exams/part1/BasicUtilities.java +++ b/src/main/java/com/dtcc/exams/part1/BasicUtilities.java @@ -3,37 +3,19 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - boolean isGreaterThan5 = false; - if( value > 5 ){ - isGreaterThan5 = true; - } - return isGreaterThan5; + return null; } public Boolean isLessThan7(Integer value) { - boolean isLessThan7 = false; - if( value < 7 ){ - isLessThan7 = true; - } - return isLessThan7; + return null; } public Boolean isBetween5And7(Integer valueToEvaluate) { - boolean isBetween5And7 = false; - if( valueToEvaluate >= 5 && valueToEvaluate <= 7){ - isBetween5And7 = true; - } - return isBetween5And7; + return null; } public Boolean startsWith(String string, Character character) { - boolean startsWith = false; - String firstLetter = string.charAt(0) + ""; - String strCharacter = character + ""; - if(firstLetter.equalsIgnoreCase(strCharacter)){ - startsWith = true; - } - return startsWith; + return null; } } \ No newline at end of file diff --git a/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java b/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java index e80e418..61abcdd 100644 --- a/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java +++ b/src/main/java/com/dtcc/exams/part1/DelTechConcatenator.java @@ -2,35 +2,19 @@ public class DelTechConcatenator { - private int input; - public DelTechConcatenator(Integer input) { - this.input = input; } public Boolean isDel() { - boolean isDel = false; - if(this.input % 3 == 0){ - isDel = true; - } - return isDel; + return null; } public Boolean isTech() { - boolean isTech = false; - if(this.input % 5 == 0){ - isTech = true; - } - return isTech; + return null; } public Boolean isDelTech() { - boolean isDelTech = false; - if(this.input % 3 == 0 && input % 5 == 0){ - isDelTech = true; - } - - return isDelTech; + return null; } } diff --git a/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java b/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java index 6b1c631..a7e9aaa 100644 --- a/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/dtcc/exams/part1/IntegerArrayUtilities.java @@ -3,34 +3,19 @@ public class IntegerArrayUtilities { public Boolean hasEvenLength(Integer[] array) { - boolean hasEvenLength = false; - if(array.length % 2 == 0){ - hasEvenLength = true; - } - return hasEvenLength; + return null; } public Integer[] range(int start, int stop) { - Integer[] range = new Integer[(stop - (start-1))]; - int j = 0; - for(int i = start; i <= stop; i++){ - range[j] = i; - j++; - } - return range; + return null; } public Integer getSumOfFirstTwo(Integer[] array) { - Integer sum; - sum = array[0] + array[1]; - return sum; + return null; } public Integer getProductOfFirstTwo(Integer[] array) { - Integer product; - - product = array[array.length-2] * array[array.length-1]; - return product; + return null; } } diff --git a/src/main/java/com/dtcc/exams/part2/ArrayUtility.java b/src/main/java/com/dtcc/exams/part2/ArrayUtility.java index 1086838..41885cb 100644 --- a/src/main/java/com/dtcc/exams/part2/ArrayUtility.java +++ b/src/main/java/com/dtcc/exams/part2/ArrayUtility.java @@ -1,69 +1,21 @@ package com.dtcc.exams.part2; -import java.util.Arrays; - public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - Integer[] mergedArray = new Integer[array1.length + array2.length]; - int c = 0; - for(int i = 0; i < array1.length; i++){ - mergedArray[i] = array1[i]; - } - for(int j = array1.length; j < mergedArray.length; j++){ - mergedArray[j] = array2[c]; - c++; - } - return mergedArray; + return null; } public Integer[] rotate(Integer[] array, Integer index) { - Integer[] rotatedArray = new Integer[array.length]; - int e = 0; - for(int i = 0; i < array.length - index; i++){ - rotatedArray[i] = array[i+index]; - } - for(int j = array.length-(index); j < rotatedArray.length; j++){ - rotatedArray[j] = array[e]; - e++; - } - return rotatedArray; + return null; } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { - Integer counter = 0; - for(int i = 0; i < array1.length; i++) { - if (array1[i] == valueToEvaluate) { - counter++; - } - } - for(int i = 0; i < array2.length; i++) { - if(array2[i] == valueToEvaluate){ - counter++; - } - } - return counter; + return null; } public Integer mostCommon(Integer[] array) { - Arrays.sort(array); - System.out.println(); - int currentCount=0; - int maxCount = 0; - int indexOfMostCommon = 0; - int mostCommon; - for( int i = 1; i < array.length; i++){ - if (array[i] == array[i-1]){ - currentCount ++; - } - if (currentCount > maxCount) { - maxCount = currentCount; - currentCount = 0; - indexOfMostCommon = i-1; - } - } - mostCommon = array[indexOfMostCommon]; - return mostCommon; + return null; } } diff --git a/src/main/java/com/dtcc/exams/part2/ListUtility.java b/src/main/java/com/dtcc/exams/part2/ListUtility.java index 143f881..4c4e910 100644 --- a/src/main/java/com/dtcc/exams/part2/ListUtility.java +++ b/src/main/java/com/dtcc/exams/part2/ListUtility.java @@ -1,91 +1,31 @@ package com.dtcc.exams.part2; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; public class ListUtility { - ArrayList myList = new ArrayList<>(); - - public Boolean add(Integer i) { - - boolean wasAdded = false; - myList.add(i); - if(contains(i)){ - wasAdded = true; - } - if( i == null ){ - wasAdded = false; - } - return wasAdded; + public Boolean add(int i) { + return null; } public Integer size() { - int size = myList.size(); - return size; + return null; } public List getUnique() { - Collections.sort(myList); - ArrayList uniqueList = new ArrayList<>(); - uniqueList.add(myList.get(0)); - for(int i = 1; i < myList.size(); i++){ - if (myList.get(i) == myList.get(i-1)){ - - } - else{ - uniqueList.add(myList.get(i)); - } - - } - return uniqueList; + return null; } public String join() { - String strMyList = myList.get(0) + ""; - for(int i = 1; i < myList.size(); i++){ - strMyList += ", " + myList.get(i); - } - return strMyList; + return null; } public Integer mostCommon() { - for (int i = 0; i< myList.size(); i++){ - System.out.print(myList.get(i) + " "); - } - System.out.println(); - Collections.sort(myList); - for (int i = 0; i< myList.size(); i++){ - System.out.print(myList.get(i) + " "); - } - System.out.println(); - int currentCount = 1; - int maxCount = 0; - int indexOfMostCommon = 0; - Integer mostCommon; - for( int i = 1; i < myList.size(); i++){ - if (myList.get(i) == myList.get(i-1)){ - currentCount ++; - } - if (currentCount > maxCount) { - maxCount = currentCount; - currentCount = 1; - indexOfMostCommon = i-1; - } - } - - mostCommon = myList.get(indexOfMostCommon); - return mostCommon; + return null; } public Boolean contains(Integer valueToAdd) { - boolean contains = false; - if (myList.contains(valueToAdd)){ - contains = true; - } - return contains; + return null; } } diff --git a/src/main/java/com/dtcc/exams/part2/Router.java b/src/main/java/com/dtcc/exams/part2/Router.java index 246de87..3c699b6 100644 --- a/src/main/java/com/dtcc/exams/part2/Router.java +++ b/src/main/java/com/dtcc/exams/part2/Router.java @@ -3,7 +3,6 @@ public class Router { public void add(String path, String controller) { - } public Integer size() { diff --git a/src/main/java/com/dtcc/exams/part3/Bird.java b/src/main/java/com/dtcc/exams/part3/Bird.java index faf05cb..a24cbd8 100644 --- a/src/main/java/com/dtcc/exams/part3/Bird.java +++ b/src/main/java/com/dtcc/exams/part3/Bird.java @@ -1,9 +1,9 @@ package com.dtcc.exams.part3; -public abstract class Bird { +public class Bird { public String move() { - return "fly"; + return null; } public void setMigrationMonth(String expected) { diff --git a/src/main/java/com/dtcc/exams/part3/Horse.java b/src/main/java/com/dtcc/exams/part3/Horse.java index 9a05417..c02e088 100644 --- a/src/main/java/com/dtcc/exams/part3/Horse.java +++ b/src/main/java/com/dtcc/exams/part3/Horse.java @@ -1,18 +1,4 @@ package com.dtcc.exams.part3; -public class Horse implements Animal{ - @Override - public String move() { - return "gallop"; - } - - @Override - public String color() { - return "black"; - } - - @Override - public int getSpeed() { - return 40; - } +public class Horse { } diff --git a/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java b/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java index 0572c70..b5c53b3 100644 --- a/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java +++ b/src/main/java/com/dtcc/exams/part3/PeregrineFalcon.java @@ -1,12 +1,4 @@ package com.dtcc.exams.part3; -public class PeregrineFalcon extends Bird { - - public String color() { - return "brown"; - } - - public int getSpeed() { - return 13; - } +public class PeregrineFalcon { } diff --git a/src/main/java/com/dtcc/exams/part3/RedRobin.java b/src/main/java/com/dtcc/exams/part3/RedRobin.java index 3e66c16..49fd626 100644 --- a/src/main/java/com/dtcc/exams/part3/RedRobin.java +++ b/src/main/java/com/dtcc/exams/part3/RedRobin.java @@ -1,12 +1,4 @@ package com.dtcc.exams.part3; -public class RedRobin extends Bird{ - - public String color() { - return "red"; - } - - public int getSpeed() { - return 10; - } +public class RedRobin { } diff --git a/src/main/java/com/dtcc/exams/part3/SpeedComparator.java b/src/main/java/com/dtcc/exams/part3/SpeedComparator.java index 57e61e3..2aa8c7f 100644 --- a/src/main/java/com/dtcc/exams/part3/SpeedComparator.java +++ b/src/main/java/com/dtcc/exams/part3/SpeedComparator.java @@ -1,10 +1,4 @@ package com.dtcc.exams.part3; -import java.util.Comparator; - -public class SpeedComparator implements Comparator { - - public int compare(Animal o1, Animal o2) { - return 0; - } +public class SpeedComparator { }