From 5b4f1b331f00456bd9bfef242feff7d33f3de057 Mon Sep 17 00:00:00 2001 From: Zanetta Norris Date: Fri, 6 Mar 2020 09:48:57 -0500 Subject: [PATCH 1/7] added concatenator utilities. --- .../assessment2/part1/WuTangConcatenator.java | 18 +++++++++++++++--- 1 file changed, 15 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..ac8418f 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/WuTangConcatenator.java @@ -1,18 +1,30 @@ 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; } } From a8f5197958042c9c563573732c1fdb3d629cc050 Mon Sep 17 00:00:00 2001 From: Zanetta Norris Date: Fri, 6 Mar 2020 10:05:47 -0500 Subject: [PATCH 2/7] added BasicUtilities code --- .../assessment2/part1/BasicUtilities.java | 17 +++++++++++++---- 1 file changed, 13 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..2d427eb 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,18 +2,27 @@ 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; +//test and readme requirement differ. readme <7 & test <= 7 + 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(0, 1).equalsIgnoreCase(String.valueOf(character))) + return true; + else return false; } } From 853c73a8e22884308d0425d7021371279c6f5b54 Mon Sep 17 00:00:00 2001 From: Zanetta Norris Date: Fri, 6 Mar 2020 10:19:30 -0500 Subject: [PATCH 3/7] added 3 integer array utils. working on range. --- .../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..26f63d7 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -2,18 +2,30 @@ 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; + +// for ( int i = start; i <= stop; i ++) + return null; +// +// { +// +// } } public Integer getSumOfFirstTwo(Integer[] array) { - return null; + Integer sum = array[0] + array [1]; + return sum; } public Integer getProductOfFirstTwo(Integer[] array) { - return null; + Integer product = (array[array.length -2] * array [array.length-1]); + return product; } } From bad327f858721b594ccdbfbedd3a8a87c968bd68 Mon Sep 17 00:00:00 2001 From: Zanetta Norris Date: Fri, 6 Mar 2020 10:44:36 -0500 Subject: [PATCH 4/7] added range function to integer array utils. finally. --- .../assessment2/part1/IntegerArrayUtilities.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java index 26f63d7..bc6db9b 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/IntegerArrayUtilities.java @@ -10,13 +10,13 @@ public Boolean hasEvenLength(Integer[] array) { } public Integer[] range(int start, int stop) { +int size = Math.abs(stop - start)+1; + + Integer[] range = new Integer[size]; + for ( int i = 0; i < range.length; i ++) + range[i] = start+i; + return range; -// for ( int i = start; i <= stop; i ++) - return null; -// -// { -// -// } } public Integer getSumOfFirstTwo(Integer[] array) { From 4aeb8f9ca1e5a6023af845391b0c252fef70aeae Mon Sep 17 00:00:00 2001 From: Zanetta Norris Date: Fri, 6 Mar 2020 11:01:41 -0500 Subject: [PATCH 5/7] added merge utility. --- .../assessment2/part2/ArrayUtility.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index de2f799..9199c68 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -1,8 +1,18 @@ package com.zipcodewilmington.assessment2.part2; +import java.util.Arrays; + public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - return null; + Integer newArraySize = array1.length + array2.length; + Integer[] newArray = new Integer[newArraySize]; + int a = array1.length; + int b = array2.length; + System.arraycopy(array1, 0, newArray, 0, a); + System.arraycopy(array2, 0, newArray, a, b); + + return newArray; + } public Integer[] rotate(Integer[] array, Integer index) { From fec591e7c2a3ef8dde96e0194873f4e39e7b41b0 Mon Sep 17 00:00:00 2001 From: Zanetta Norris Date: Fri, 6 Mar 2020 11:32:05 -0500 Subject: [PATCH 6/7] working on rotate utility, commented out to compile. --- .../assessment2/part2/ArrayUtility.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java index 9199c68..ee0d359 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java @@ -4,20 +4,29 @@ public class ArrayUtility { public Integer[] merge(Integer[] array1, Integer[] array2) { - Integer newArraySize = array1.length + array2.length; - Integer[] newArray = new Integer[newArraySize]; int a = array1.length; int b = array2.length; + Integer[] newArray = new Integer[a + b]; System.arraycopy(array1, 0, newArray, 0, a); System.arraycopy(array2, 0, newArray, a, b); - return newArray; } public Integer[] rotate(Integer[] array, Integer index) { - return null; - } +// int len = array.length; +// int temp; +// Integer[] newArray = new Integer[len]; +//// for( int i = 0; i <= index; i++) +//// newArray[i] = array[i + index]; +//// return newArray; +// +// temp = newArray[0]; +// for (i = 0; i < len - 1; i++) +// newArray[i] = newArray[i + 1]; +// newArray[i] = temp; + return null; + } public Integer countOccurrence(Integer[] array1, Integer[] array2, Integer valueToEvaluate) { return null; From c52ad0f3d93a3e2d74a12e48a2204993cb628e0e Mon Sep 17 00:00:00 2001 From: Zanetta Norris Date: Fri, 6 Mar 2020 11:37:41 -0500 Subject: [PATCH 7/7] oops fixed overunder utility that i left broken. --- .../zipcodewilmington/assessment2/part1/BasicUtilities.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java index 2d427eb..8a77491 100644 --- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java +++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java @@ -2,7 +2,7 @@ public class BasicUtilities { public Boolean isGreaterThan5(Integer value) { - if (value > 5) + if (value >= 5) return true; else return false; } @@ -15,7 +15,7 @@ public Boolean isLessThan7(Integer value) { } public Boolean isBetween5And7(Integer valueToEvaluate) { - if (valueToEvaluate > 5 && valueToEvaluate < 7) + if (valueToEvaluate >= 5 && valueToEvaluate <= 7) return true; else return false; }