From 0e4b5e03406e0a14559e2a094446e6ae15559ea6 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:26:02 +0000 Subject: [PATCH 01/14] Setting up GitHub Classroom Feedback From 67b5a3746f2e36eddd54af25e705f9c0772e8230 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 09:34:47 -0400 Subject: [PATCH 02/14] finished basic array utils --- .../assessment1/part1/BasicArrayUtils.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicArrayUtils.java index ef714b5..a824f97 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicArrayUtils.java @@ -9,7 +9,8 @@ public class BasicArrayUtils { * @return the first element in the array */ public static String getFirstElement(String[] stringArray) { - return null; + return stringArray[0]; +// return null; } /** @@ -17,7 +18,8 @@ public static String getFirstElement(String[] stringArray) { * @return the second element in the array */ public static String getSecondElement(String[] stringArray) { - return null; + return stringArray[1]; +// return null; } /** @@ -25,7 +27,8 @@ public static String getSecondElement(String[] stringArray) { * @return the last element in the array */ public static String getLastElement(String[] stringArray) { - return null; + return stringArray[stringArray.length -1]; +// return null; } /** @@ -33,6 +36,7 @@ public static String getLastElement(String[] stringArray) { * @return the second to last element in the array */ public static String getSecondToLastElement(String[] stringArray) { - return null; + return stringArray[stringArray.length -2]; +// return null; } } From 2bec8f0cc57e4fde48a64e811ac5bb12bf833aee Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 09:47:52 -0400 Subject: [PATCH 03/14] finishd camel, reverse, reversecamel --- .../assessment1/part1/BasicStringUtils.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java index ca13f2d..0783309 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java @@ -9,7 +9,9 @@ public class BasicStringUtils { * @return string with identical content, and the first character capitalized */ public static String camelCase(String str) { - return null; + String result = str.substring(0, 1).toUpperCase() + str.substring(1); + return result; +// return null; } /** @@ -17,7 +19,9 @@ public static String camelCase(String str) { * @return string with identical contents, in the reverse order */ public static String reverse(String str) { - return null; + String result = new StringBuilder(str).reverse().toString(); + return result; +// return null; } /** @@ -25,7 +29,10 @@ public static String reverse(String str) { * @return string with identical contents, in reverse order, with first character capitalized */ public static String reverseThenCamelCase(String str) { - return null; + String reverse = new StringBuilder(str).reverse().toString(); + String result = reverse.substring(0, 1).toUpperCase() + reverse.substring(1); + return result; +// return null; } From 9b13c90bb45b5ab728c83cb61f8366246f863527 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 10:02:55 -0400 Subject: [PATCH 04/14] finished remove first and last letters --- .../assessment1/part1/BasicStringUtils.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java index 0783309..6328761 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.assessment1.part1; +import com.zipcodewilmington.assessment1.part2.StringUtils; + /** * Created by leon on 2/16/18. */ @@ -41,7 +43,9 @@ public static String reverseThenCamelCase(String str) { * @return string with identical contents excluding first and last character */ public static String removeFirstAndLastCharacter(String str) { - return null; + String answer = str.substring(1, str.length()-1); + return answer; +// return null; } /** @@ -49,6 +53,14 @@ public static String removeFirstAndLastCharacter(String str) { * @return string with identical characters, each with opposite casing */ public static String invertCasing(String str) { +// int length = str.length(); +// +// for (int i = 0; i < length; i++){ +// Character c = str.charAt(i); +// if (Character.isLowerCase(c)) +// str.replace(i, i + 1, Character.toUpperCase(c) + ""); +// else +// } return null; } } From c535ff2339cb37ad1d09965e2273e507bc77d371 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 10:21:42 -0400 Subject: [PATCH 05/14] finished int array utils --- .../assessment1/part1/IntegerArrayUtils.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java index 68d82ec..ae93140 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java @@ -1,5 +1,8 @@ package com.zipcodewilmington.assessment1.part1; +import java.util.Arrays; +import java.util.stream.IntStream; + /** * Created by leon on 2/16/18. */ @@ -9,7 +12,11 @@ public class IntegerArrayUtils { * @return the sum of `intArray` */ public static Integer getSum(Integer[] intArray) { - return null; + int sum = 0; + for (int i = 0; i < intArray.length; i++) + sum = sum + intArray[i]; + return sum; +// return null; } /** @@ -17,7 +24,11 @@ public static Integer getSum(Integer[] intArray) { * @return the product of `intArray` */ public static Integer getProduct(Integer[] intArray) { - return null; + int product = 1; + for (int i : intArray) + product *= i; + return product; +// return null; } /** @@ -25,6 +36,11 @@ public static Integer getProduct(Integer[] intArray) { * @return the sum of `intArray` divided by number of elements in `intArray` */ public static Double getAverage(Integer[] intArray) { - return null; + int sum = 0; + for (int num : intArray){ + sum += num; + } + return (double) sum/intArray.length; +// return null; } } From 4a6c2df5ac2951212a19800658b8edbb492536b3 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 10:38:31 -0400 Subject: [PATCH 06/14] finished Integer utils --- .../assessment1/part1/IntegerUtils.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java index eccbb6c..025a12d 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java @@ -11,7 +11,9 @@ public class IntegerUtils { * @return the sum of all integers between 0 and not including `n` */ public static Integer getSumOfN(Integer n) { - return null; + int sum = n * (n + 1)/2; + return sum; +// return null; } /** @@ -19,7 +21,11 @@ public static Integer getSumOfN(Integer n) { * @return the product of all integers between 0 and not including `n` */ public static Integer getProductOfN(Integer n) { - return null; + int result = 1; + for (int i = 2; i <= n; i++) + result = result * i; + return result; +// return null; } /** @@ -27,6 +33,8 @@ public static Integer getProductOfN(Integer n) { * @return integer with identical digits in the reverse order */ public static Integer reverseDigits(Integer val) { - return null; + String reverse = new StringBuilder(String.valueOf(val)).reverse().toString(); + return Integer.parseInt(reverse); +// return null; } } From b55e85bdf21fe2e69c4165b28b9317033ac1c565 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 11:52:33 -0400 Subject: [PATCH 07/14] finished three array utils pt 2 --- .../assessment1/part2/ArrayUtils.java | 47 +++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index bb9995a..9b07881 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.assessment1.part2; +import java.util.Arrays; + /** * Created by leon on 2/16/18. */ @@ -11,7 +13,14 @@ public class ArrayUtils { * Given an array of objects, named `objectArray`, and an object `objectToCount`, return the number of times the `objectToCount` appears in the `objectArray` */ public static Integer getNumberOfOccurrences(Object[] objectArray, Object objectToCount) { - return null; + int numOfOcc = 0; + for (int i = 0; i < objectArray.length; i++){ + if (objectToCount == objectArray[i]){ + numOfOcc++; + } + } + return numOfOcc; +// return null; } /** @@ -21,7 +30,12 @@ public static Integer getNumberOfOccurrences(Object[] objectArray, Object object * Given an array of objects, name `objectArray`, and an object `objectToRemove`, return an array of objects with identical contents excluding `objectToRemove` */ public static Object[] removeValue(Object[] objectArray, Object objectToRemove) { - return null; + int i, j; + for (i = j = 0; j < objectArray.length; j++) + if (!objectToRemove.equals(objectArray[j])) objectArray[i++] = objectArray[j]; + objectArray = Arrays.copyOf(objectArray, i); + return objectArray; +// return null; } /** @@ -30,7 +44,23 @@ public static Object[] removeValue(Object[] objectArray, Object objectToRemove) * given an array of objects, named `objectArray` return the most frequently occuring object in the array */ public static Object getMostCommon(Object[] objectArray) { - return null; + int a = 1, tempCount; + Object common = objectArray[0]; + int b = 0; + for (int i = 0; i < objectArray.length; i++) { + b = (int) objectArray[i]; + tempCount = 0; + for (int j = 1; j < objectArray.length; j++) { + if (b == (int) objectArray[j]) + tempCount++; + } + if (tempCount > a) { + common = b; + a = tempCount; + } + } + return common; +// return null; } @@ -40,6 +70,7 @@ public static Object getMostCommon(Object[] objectArray) { * given an array of objects, named `objectArray` return the least frequently occuring object in the array */ public static Object getLeastCommon(Object[] objectArray) { + return null; } @@ -50,6 +81,16 @@ public static Object getLeastCommon(Object[] objectArray) { * given two arrays `objectArray` and `objectArrayToAdd`, return an array containing all elements in `objectArray` and `objectArrayToAdd` */ public static Object[] mergeArrays(Object[] objectArray, Object[] objectArrayToAdd) { + +// Object[] thirdArray = new Object[objectArray.length + objectArrayToAdd.length]; +// int index = objectArray.length; +// +// for (int i = 0; i < objectArray.length; i++){ +// thirdArray[i] = objectArray[i]; +// } +// for (int i = 0; i < objectArrayToAdd.length; i++){ +// thirdArray[i + index] = objectArrayToAdd[i]; +// } return null; } } From d266c7a00ac6b669f6ec4edc13b5dec5db084d66 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 12:16:23 -0400 Subject: [PATCH 08/14] finished string part 2 --- .../assessment1/part2/StringUtils.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java index fc403e5..929d8d8 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java @@ -11,7 +11,8 @@ public class StringUtils { * given a string containing words delimited by spaces, representative of a sentence, return an array of strings, each element representative of a respective word in the sentence */ public static String[] getWords(String sentence) { - return null; + String[] words = sentence.split("\\W+"); + return words; } @@ -21,7 +22,9 @@ public static String[] getWords(String sentence) { * given a string containing words delimited by spaces, representative of a sentence, return the first word of the sentence */ public static String getFirstWord(String sentence) { - return null; + String[] words = sentence.split("\\W+"); + return words[0]; +// return null; } /** @@ -30,7 +33,11 @@ public static String getFirstWord(String sentence) { * given a string containing words delimited by spaces, representative of a sentence, return the first word with identical contents in reverse order */ public static String reverseFirstWord(String sentence) { - return null; + String[] words = sentence.split("\\W+"); + String first = words[0]; + String result = new StringBuilder(first).reverse().toString(); + return result; +// return null; } /** @@ -39,7 +46,12 @@ public static String reverseFirstWord(String sentence) { * given a string containing words delimited by spaces, representative of a sentence, return the first word with identical contents in reverse order with the first character capitalized */ public static String reverseFirstWordThenCamelCase(String sentence) { - return null; + String[] words = sentence.split("\\W+"); + String first = words[0]; + String result = new StringBuilder(first).reverse().toString(); + String answer = result.substring(0, 1).toUpperCase() + result.substring(1); + return answer; +// return null; } @@ -50,7 +62,11 @@ public static String reverseFirstWordThenCamelCase(String sentence) { * given a string and index, return an identical string excluding the character at the specified index */ public static String removeCharacterAtIndex(String str, int index) { - return null; + String result = str.substring(0, index) + str.substring(index + 1); +// String replace = String.valueOf(index); +// String result = str.replace(replace, ""); + return result; +// return null; } } From 38b7b9031b797dff2e9dcdf53c94eb853b0a0d7f Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 13:35:02 -0400 Subject: [PATCH 09/14] jumper passes 3 --- .../part1/RockPaperSissorsEvaluator.java | 1 + .../assessment1/part2/MultiplesDeleter.java | 15 +++++++++++++++ .../zipcodewilmington/assessment1/part3/Cat.java | 5 +++-- .../zipcodewilmington/assessment1/part3/Pet.java | 1 + .../assessment1/part4/Jumper.java | 12 +++++++++++- 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java b/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java index 9495445..c076196 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java @@ -13,6 +13,7 @@ public class RockPaperSissorsEvaluator { * @return the respective winning move */ public String getWinningMove(String handSign) { + return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java b/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java index a348b0d..6b80353 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java @@ -10,6 +10,21 @@ public class MultiplesDeleter { * given an array of integers, named `ints` return an identical array with evens removed */ public Integer[] deleteEvens(Integer[] ints) { +// int a = 0; +// for(int i = 0; i < ints.length; i++){ +// if (ints[i] % 2 != 0){ +// a++; +// } +// } +// int[] result = new int[a]; +// int count = 0; +// for (int i = 0; i < ints.length; i++){ +// if (ints[i] % 2 != 0){ +// result[count] = ints[i]; +// count++; +// } +// } +// return result; return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java index e731b77..17dcdd3 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java @@ -9,7 +9,7 @@ public class Cat extends Pet { * @param age age of this Cat */ public Cat(String name, Integer age) { - + Cat cat = new Cat("", 5); } /** @@ -38,6 +38,7 @@ public Cat() { * @return meow as a string */ public String speak() { - return null; + + return "Meow"; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java index 3c925da..ea40242 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java @@ -15,6 +15,7 @@ public Pet() { * @param name name of this pet */ public Pet(String name) { + } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java b/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java index f881e9c..05ddb3a 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java @@ -6,6 +6,16 @@ public class Jumper { * Complete the function below. */ public int jumps(int k, int j) { - return -1; + +// int jumps= k / j; +// int jums =+ k % j; +// return jumps; + + int numOfJumps = k / j; + int heightRemaining = k % j; + + if (heightRemaining > 0){ + return numOfJumps +1; + }else return numOfJumps; } } From 2f7f5be012ee4188746db4a5a4ac338832f3d29c Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 13:43:53 -0400 Subject: [PATCH 10/14] two tests rps --- .../part1/RockPaperSissorsEvaluator.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java b/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java index c076196..2a2bbd7 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java @@ -13,17 +13,27 @@ public class RockPaperSissorsEvaluator { * @return the respective winning move */ public String getWinningMove(String handSign) { + if (handSign == ROCK){ + return PAPER; + }else if (handSign == PAPER){ + return SCISSOR; + }else return ROCK; + } - return null; - } /** * @param handSign a string representative of a hand sign * @return the respective losing move */ public String getLosingMove(String handSign) { - return null; + if (handSign == ROCK){ + return SCISSOR; + }else if (handSign == PAPER){ + return ROCK; + }else return PAPER; } +// return null; + /** * @param handSignOfPlayer1 a string representative of a hand sign of a player @@ -31,6 +41,7 @@ public String getLosingMove(String handSign) { * @return a string representative of the winning hand sign between the two players */ public String getWinner(String handSignOfPlayer1, String handSignOfPlayer2) { + return null; } } From db9e086802b8590df5b257e16a3129ebe9ecafe9 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 15:06:36 -0400 Subject: [PATCH 11/14] woking on animals --- .../assessment1/part1/BasicStringUtils.java | 13 ++++++++- .../assessment1/part2/ArrayUtils.java | 9 ++++-- .../assessment1/part3/Animal.java | 3 ++ .../assessment1/part3/Cat.java | 21 ++++++++++++-- .../assessment1/part3/Dog.java | 21 +++++++++++++- .../assessment1/part3/Pet.java | 6 ++-- .../assessment1/part5/Palindrome.java | 29 +++++++++++++++++-- 7 files changed, 92 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java index 6328761..c6c3d08 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java @@ -53,6 +53,17 @@ public static String removeFirstAndLastCharacter(String str) { * @return string with identical characters, each with opposite casing */ public static String invertCasing(String str) { + char[] chars = str.toCharArray(); + for (int i = 0; i < chars.length; i++){ + char c = chars[i]; + if (Character.isUpperCase(c)){ + chars[i] = Character.toLowerCase(c); + }else if (Character.isLowerCase(c)){ + chars[i] = Character.toUpperCase(c); + } + } + return new String(chars); + // int length = str.length(); // // for (int i = 0; i < length; i++){ @@ -61,6 +72,6 @@ public static String invertCasing(String str) { // str.replace(i, i + 1, Character.toUpperCase(c) + ""); // else // } - return null; +// return null; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index 9b07881..7de7fe8 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -1,6 +1,8 @@ package com.zipcodewilmington.assessment1.part2; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; /** * Created by leon on 2/16/18. @@ -81,7 +83,10 @@ public static Object getLeastCommon(Object[] objectArray) { * given two arrays `objectArray` and `objectArrayToAdd`, return an array containing all elements in `objectArray` and `objectArrayToAdd` */ public static Object[] mergeArrays(Object[] objectArray, Object[] objectArrayToAdd) { - + List list = new ArrayList<>(Arrays.asList(objectArray)); + list.addAll(Arrays.asList(objectArrayToAdd)); + Object[] c = list.toArray(); + return c; // Object[] thirdArray = new Object[objectArray.length + objectArrayToAdd.length]; // int index = objectArray.length; // @@ -91,6 +96,6 @@ public static Object[] mergeArrays(Object[] objectArray, Object[] objectArrayToA // for (int i = 0; i < objectArrayToAdd.length; i++){ // thirdArray[i + index] = objectArrayToAdd[i]; // } - return null; +// return null; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java index 658bb25..7514597 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java @@ -5,4 +5,7 @@ */ public interface Animal { String speak(); + Integer age(); + String name(); + String owner(); } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java index 17dcdd3..e28ba26 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java @@ -9,13 +9,15 @@ public class Cat extends Pet { * @param age age of this Cat */ public Cat(String name, Integer age) { - Cat cat = new Cat("", 5); + super(); } /** * @param age age of this Cat */ public Cat(Integer age) { + int a ; + } /** @@ -23,6 +25,7 @@ public Cat(Integer age) { */ public Cat(String name) { + } /** @@ -38,7 +41,21 @@ public Cat() { * @return meow as a string */ public String speak() { - return "Meow"; } + + @Override + public Integer age() { + return age(); + } + + @Override + public String name() { + return name(); + } + + @Override + public String owner() { + return owner(); + } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java index 0c775fd..3adf6a6 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java @@ -9,6 +9,7 @@ public class Dog extends Pet { * @param age age of this dog */ public Dog(String name, Integer age) { + super(); } @@ -16,12 +17,14 @@ public Dog(String name, Integer age) { * @param age age of this dog */ public Dog(Integer age) { + age = age; } /** * @param name name of this dog */ public Dog(String name) { + name = name; } @@ -38,6 +41,22 @@ public Dog() { * @return bark as a string */ public String speak() { - return null; + + return "Bark"; + } + + @Override + public Integer age() { + return age(); + } + + @Override + public String name() { + return name(); + } + + @Override + public String owner() { + return owner(); } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java index ea40242..3a44bb2 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java @@ -9,6 +9,7 @@ public abstract class Pet implements Animal { * by default, pet has age of 0; name of ""; */ public Pet() { + } /** @@ -23,6 +24,7 @@ public Pet(String name) { * @param age age of this pet */ public Pet(int age) { + age = age; } /** @@ -36,14 +38,14 @@ public Pet(String name, int age) { * @return name of this pet */ public String getName() { - return null; + return name(); } /** * @return age of this pet */ public Integer getAge() { - return null; + return age(); } /** diff --git a/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java b/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java index 89e2016..6c1ff87 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java @@ -2,7 +2,32 @@ public class Palindrome { - public Integer countPalindromes(String input){ - return null; + public Integer countPalindromes(String input) { + int n = input.length(); + boolean[][] dp = new boolean[n][n]; + int count = 0; + + for (int i = 0; i < n; i++) { + dp[i][i] = true; + count++; + } + for (int i = 0; i < n - 1; i++) { + if (input.charAt(i) == input.charAt(i + 1)) { + dp[i][i + 1] = true; + count++; + } + } + for (int len = 3; len <= n; len++) { + for (int i = 0; i <= n - len; i++) { + int j = i + len - 1; + if (input.charAt(i) == input.charAt(j) && dp[i + 1][j - 1]) { + dp[i][j] = true; + count++; + } + } + } + return count; } } +// return null; + From 27cc8e6ffda4e21f36cca937d3607f235e2c443b Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 16:25:57 -0400 Subject: [PATCH 12/14] later adds --- .../assessment1/part2/MultiplesDeleter.java | 19 +++++++++++++ .../assessment1/part3/Animal.java | 2 +- .../assessment1/part3/Cat.java | 16 ++++++----- .../assessment1/part3/Dog.java | 17 ++++++------ .../assessment1/part3/Pet.java | 27 ++++++++++++++----- .../assessment1/part3/PetOwner.java | 1 + 6 files changed, 59 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java b/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java index 6b80353..c41ab32 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java @@ -1,5 +1,7 @@ package com.zipcodewilmington.assessment1.part2; +import java.util.Arrays; + /** * Created by leon on 2/16/18. */ @@ -34,7 +36,24 @@ public Integer[] deleteEvens(Integer[] ints) { * given an array of integers, named `ints` return an identical array with odds removed */ public Integer[] deleteOdds(Integer[] ints) { + int countEven = 0; + int even[]= null; + + for (int i : ints){ + if (i % 2 == 0); + ++countEven; + } + + even = new int[countEven]; + + int i = 0; + for(int num : ints){ + if (num % 2 == 0){ + even[i++] = num; + } + } return null; +// return null; } /** diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java index 7514597..eeb20a8 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Animal.java @@ -5,7 +5,7 @@ */ public interface Animal { String speak(); - Integer age(); + int age(); String name(); String owner(); } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java index e28ba26..b5a3b17 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java @@ -8,22 +8,23 @@ public class Cat extends Pet { * @param name name of this Cat * @param age age of this Cat */ - public Cat(String name, Integer age) { - super(); + public Cat(String name, int age) { + super(name, age); + } /** * @param age age of this Cat */ public Cat(Integer age) { - int a ; - + super(null, age); } /** * @param name name of this Cat */ public Cat(String name) { + super(name, 0); } @@ -35,6 +36,7 @@ public Cat(String name) { * age is 0 */ public Cat() { + Cat cat = new Cat("Jim", 7); } /** @@ -45,13 +47,13 @@ public String speak() { } @Override - public Integer age() { - return age(); + public int age() { + return this.getAge(); } @Override public String name() { - return name(); + return this.getName(); } @Override diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java index 3adf6a6..dce3ed5 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java @@ -9,23 +9,21 @@ public class Dog extends Pet { * @param age age of this dog */ public Dog(String name, Integer age) { - super(); - + super(name, age); } /** * @param age age of this dog */ public Dog(Integer age) { - age = age; + super("Dog Name", age); } /** * @param name name of this dog */ public Dog(String name) { - name = name; - + super(name, 0); } /** @@ -35,6 +33,7 @@ public Dog(String name) { * age is 0 */ public Dog() { + super("Dog Name", 0); } /** @@ -46,17 +45,17 @@ public String speak() { } @Override - public Integer age() { - return age(); + public int age() { + return this.getAge(); } @Override public String name() { - return name(); + return this.getName(); } @Override public String owner() { - return owner(); + return null; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java index 3a44bb2..b849734 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java @@ -4,18 +4,27 @@ * Created by leon on 2/16/18. */ public abstract class Pet implements Animal { + private String name; + private Integer age; + private String owner; /** * nullary constructor * by default, pet has age of 0; name of ""; */ - public Pet() { + public Pet(String name, int age, String owner) { + this.name = name; + this.age = age; + this.owner = owner(); } /** * @param name name of this pet */ - public Pet(String name) { + public Pet() { + this.name = ""; + this.age = age; + this.owner = null; } @@ -24,7 +33,9 @@ public Pet(String name) { * @param age age of this pet */ public Pet(int age) { - age = age; + this.name = ""; + this.age = 0; + this.owner = ""; } /** @@ -32,20 +43,23 @@ public Pet(int age) { * @param age age of this pet */ public Pet(String name, int age) { + this.name = name; + this.age = age; + this.owner = ""; } /** * @return name of this pet */ public String getName() { - return name(); + return this.getName(); } /** * @return age of this pet */ public Integer getAge() { - return age(); + return this.getAge(); } /** @@ -53,12 +67,13 @@ public Integer getAge() { * ensure this instance of `Pet` is added to the owner's composite `pets` list */ public void setOwner(PetOwner newPetOwner) { + PetOwner owner = new PetOwner(""); } /** * @return PetOwner object whose composite `pets` collection contains this Pet instance */ public PetOwner getOwner() { - return null; + return this.getOwner(); } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index 7bbf2ab..0deb53a 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -15,6 +15,7 @@ public PetOwner(String name, Pet... pets) { * @param pet pet to be added to the composite collection of Pets */ public void addPet(Pet pet) { + } /** From 1487d0782c27061d58b871bb2d9b97c2a99b13ef Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 16:29:26 -0400 Subject: [PATCH 13/14] a few more animal --- .../java/com/zipcodewilmington/assessment1/part3/Pet.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java index b849734..43bc24c 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java @@ -34,8 +34,8 @@ public Pet() { */ public Pet(int age) { this.name = ""; - this.age = 0; - this.owner = ""; + this.age = age; + this.owner = null; } /** @@ -52,14 +52,14 @@ public Pet(String name, int age) { * @return name of this pet */ public String getName() { - return this.getName(); + return this.name; } /** * @return age of this pet */ public Integer getAge() { - return this.getAge(); + return this.age; } /** From e9125620c4671208452d3deaf64362e456370735 Mon Sep 17 00:00:00 2001 From: Tim L Date: Mon, 8 Jul 2024 16:56:11 -0400 Subject: [PATCH 14/14] final --- .../assessment1/part2/ArrayUtils.java | 30 +++++++++---------- .../assessment1/part2/MultiplesDeleter.java | 16 +--------- .../assessment1/part3/PetOwner.java | 3 ++ 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index 7de7fe8..486b484 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -16,8 +16,8 @@ public class ArrayUtils { */ public static Integer getNumberOfOccurrences(Object[] objectArray, Object objectToCount) { int numOfOcc = 0; - for (int i = 0; i < objectArray.length; i++){ - if (objectToCount == objectArray[i]){ + for (int i = 0; i < objectArray.length; i++) { + if (objectToCount == objectArray[i]) { numOfOcc++; } } @@ -83,19 +83,17 @@ public static Object getLeastCommon(Object[] objectArray) { * given two arrays `objectArray` and `objectArrayToAdd`, return an array containing all elements in `objectArray` and `objectArrayToAdd` */ public static Object[] mergeArrays(Object[] objectArray, Object[] objectArrayToAdd) { - List list = new ArrayList<>(Arrays.asList(objectArray)); - list.addAll(Arrays.asList(objectArrayToAdd)); - Object[] c = list.toArray(); - return c; -// Object[] thirdArray = new Object[objectArray.length + objectArrayToAdd.length]; -// int index = objectArray.length; -// -// for (int i = 0; i < objectArray.length; i++){ -// thirdArray[i] = objectArray[i]; -// } -// for (int i = 0; i < objectArrayToAdd.length; i++){ -// thirdArray[i + index] = objectArrayToAdd[i]; -// } -// return null; + Object[] newArray = new Object[objectArray.length + objectArrayToAdd.length]; + int i = 0; + + for (Object each : objectArray) { + newArray[i++] = each; + } + for (Object each : objectArrayToAdd) { + newArray[i++] = each; + } + + return null; } } + diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java b/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java index c41ab32..160de88 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java @@ -12,21 +12,7 @@ public class MultiplesDeleter { * given an array of integers, named `ints` return an identical array with evens removed */ public Integer[] deleteEvens(Integer[] ints) { -// int a = 0; -// for(int i = 0; i < ints.length; i++){ -// if (ints[i] % 2 != 0){ -// a++; -// } -// } -// int[] result = new int[a]; -// int count = 0; -// for (int i = 0; i < ints.length; i++){ -// if (ints[i] % 2 != 0){ -// result[count] = ints[i]; -// count++; -// } -// } -// return result; + return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index 0deb53a..70b2a77 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -15,6 +15,8 @@ public PetOwner(String name, Pet... pets) { * @param pet pet to be added to the composite collection of Pets */ public void addPet(Pet pet) { + Cat cat = new Cat("Jim", 2); + Dog dog = new Dog("George", 1); } @@ -69,6 +71,7 @@ public Integer getNumberOfPets() { * @return the name property of the Pet */ public String getName() { + return null; }