From a6d90a605b5abc38a8d3d4691080c6431901ab75 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:29 +0000 Subject: [PATCH 01/14] Setting up GitHub Classroom Feedback From ac73ae80905ee9b4fc90acb4d8c9630ba87d8a7f Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 10:12:18 -0400 Subject: [PATCH 02/14] working on part2 --- .../assessment1/part1/BasicArrayUtils.java | 15 ++++++++--- .../assessment1/part1/BasicStringUtils.java | 25 +++++++++++++++---- .../assessment1/part1/IntegerArrayUtils.java | 18 ++++++++++--- .../assessment1/part1/IntegerUtils.java | 23 ++++++++++++++--- .../assessment1/part2/ArrayUtils.java | 2 +- 5 files changed, 67 insertions(+), 16 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..48e7873 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,9 @@ public static String getFirstElement(String[] stringArray) { * @return the second element in the array */ public static String getSecondElement(String[] stringArray) { - return null; + int getSecondToLastPosition = stringArray.length - 2; + return stringArray[getSecondToLastPosition]; + //return null; } /** @@ -25,7 +28,9 @@ public static String getSecondElement(String[] stringArray) { * @return the last element in the array */ public static String getLastElement(String[] stringArray) { - return null; + int lastElement = stringArray.length - 1; + return stringArray[lastElement]; + //return null; } /** @@ -33,6 +38,8 @@ public static String getLastElement(String[] stringArray) { * @return the second to last element in the array */ public static String getSecondToLastElement(String[] stringArray) { - return null; + int getSecondToLastPosition = stringArray.length - 2; + return stringArray[getSecondToLastPosition]; + //return null; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java index ca13f2d..87945f3 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java @@ -9,7 +9,8 @@ public class BasicStringUtils { * @return string with identical content, and the first character capitalized */ public static String camelCase(String str) { - return null; + return Character.toUpperCase(str.charAt(0)) + str.substring(1); + //return null; } /** @@ -17,7 +18,8 @@ public static String camelCase(String str) { * @return string with identical contents, in the reverse order */ public static String reverse(String str) { - return null; + return new StringBuilder(str).reverse().toString(); + //return null; } /** @@ -25,7 +27,9 @@ 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 reversed = new StringBuilder(str).reverse().toString(); + return camelCase(reversed); + //return null; } @@ -34,7 +38,8 @@ public static String reverseThenCamelCase(String str) { * @return string with identical contents excluding first and last character */ public static String removeFirstAndLastCharacter(String str) { - return null; + return str.substring(1, str.length() - 1); + //return null; } /** @@ -42,6 +47,16 @@ public static String removeFirstAndLastCharacter(String str) { * @return string with identical characters, each with opposite casing */ public static String invertCasing(String str) { - return null; + 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); + //return null; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java index 68d82ec..0d0df07 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java @@ -9,7 +9,12 @@ public class IntegerArrayUtils { * @return the sum of `intArray` */ public static Integer getSum(Integer[] intArray) { - return null; + int sum = 0; + for (Integer num : intArray) { + sum += num; + } + return sum; + //return null; } /** @@ -17,7 +22,12 @@ public static Integer getSum(Integer[] intArray) { * @return the product of `intArray` */ public static Integer getProduct(Integer[] intArray) { - return null; + int product = 1; + for (Integer num : intArray) { + product *= num; + } + return product; + //return null; } /** @@ -25,6 +35,8 @@ 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 = getSum(intArray); + return (double) sum / intArray.length; + //return null; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java index eccbb6c..23dbaaf 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java @@ -11,7 +11,12 @@ 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 = 0; + for (int i = 0; i <= n; i++) { + sum += i; + } + return sum; + //return null; } /** @@ -19,7 +24,12 @@ 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 product = 1; + for (int i = 1; i <= n; i++) { + product *= i; + } + return product; + //return null; } /** @@ -27,6 +37,13 @@ public static Integer getProductOfN(Integer n) { * @return integer with identical digits in the reverse order */ public static Integer reverseDigits(Integer val) { - return null; + int reversed = 0; + while (val != 0) { + int digit = val % 10; + reversed = reversed * 10 + digit; + val /= 10; + } + return reversed; + //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 bb9995a..ceae55a 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -11,7 +11,7 @@ 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; + return null; } /** From 84bb506fca55e04a3c4f62322053cba4c589bd69 Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 10:47:41 -0400 Subject: [PATCH 03/14] woking on pt.2 --- .../assessment1/part2/ArrayUtils.java | 14 ++++++- .../assessment1/part2/MultiplesDeleter.java | 39 +++++++++++++++++-- .../assessment1/part2/StringUtils.java | 34 +++++++++++++--- 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index ceae55a..0ca405b 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -1,5 +1,9 @@ package com.zipcodewilmington.assessment1.part2; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * Created by leon on 2/16/18. */ @@ -11,7 +15,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 counter = 0; + for(int i = 0; i result = new ArrayList<>(); + for (Integer num : ints) { + if (num % 2 != 0) { + result.add(num); + } + } + return result.toArray(new Integer[0]); + //return null; } /** @@ -19,7 +29,14 @@ public Integer[] deleteEvens(Integer[] ints) { * given an array of integers, named `ints` return an identical array with odds removed */ public Integer[] deleteOdds(Integer[] ints) { - return null; + List result = new ArrayList<>(); + for (Integer num : ints) { + if (num % 2 == 0) { + result.add(num); + } + } + return result.toArray(new Integer[0]); + //return null; } /** @@ -28,7 +45,14 @@ public Integer[] deleteOdds(Integer[] ints) { * given an array of integers, named `ints` return an identical array with numbers indivisible by 3 removed */ public Integer[] deleteMultiplesOf3(Integer[] ints) { - return null; + List result = new ArrayList<>(); + for (Integer num : ints) { + if (num % 3 != 0) { + result.add(num); + } + } + return result.toArray(new Integer[0]); + //return null; } /** @@ -38,6 +62,13 @@ public Integer[] deleteMultiplesOf3(Integer[] ints) { * given an array of integers, named `ints` return an identical array with numbers indivisible by `multiple` removed */ public Integer[] deleteMultiplesOfN(Integer[] ints, int multiple) { - return null; + List result = new ArrayList<>(); + for (Integer num : ints) { + if (num % multiple != 0) { + result.add(num); + } + } + return result.toArray(new Integer[0]); } + //return null; } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java index fc403e5..7e04c37 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; + return sentence.split("\\s+"); + //return null; } @@ -21,7 +22,13 @@ 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("\\s+"); + if (words.length > 0){ + return words[0]; + }else { + return ""; + } + //return null; } /** @@ -30,7 +37,14 @@ 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("\\s+"); + if (words.length > 0) { + String firstWord = words[0]; + return new StringBuilder(firstWord).reverse().toString(); + } else { + return ""; + } + //return null; } /** @@ -39,7 +53,13 @@ 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 reversed = reverseFirstWord(sentence); + if (!reversed.isEmpty()) { + return reversed.substring(0, 1).toUpperCase() + reversed.substring(1); + } else { + return ""; + } + //return null; } @@ -50,7 +70,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; + if (index < 0 || index >= str.length()) { + return str; // if index out of bounds, return original string + } + return str.substring(0, index) + str.substring(index + 1); + //return null; } } From 7665a2b3c82b2c844e42b8fd770111069d33eb51 Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 11:43:18 -0400 Subject: [PATCH 04/14] working on Pet --- .../assessment1/part3/Pet.java | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java index 3c925da..2f01f6b 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java @@ -4,17 +4,23 @@ * Created by leon on 2/16/18. */ public abstract class Pet implements Animal { - /** - * nullary constructor - * by default, pet has age of 0; name of ""; - */ + private String name; + private Integer age; + private PetOwner owner; + public Pet() { + this.name = ""; + this.age = 0; } /** * @param name name of this pet */ public Pet(String name) { + this.name = ""; + this.age = 0; + this.owner = null; + } @@ -22,6 +28,9 @@ public Pet(String name) { * @param age age of this pet */ public Pet(int age) { + this.name = ""; + this.age = 0; + this.owner = null; } /** @@ -29,20 +38,25 @@ public Pet(int age) { * @param age age of this pet */ public Pet(String name, int age) { + this.name = ""; + this.age = 0; + this.owner = null; } + /** * @return name of this pet */ public String getName() { - return null; + return name; } + /** * @return age of this pet */ public Integer getAge() { - return null; + return age; } /** @@ -50,12 +64,16 @@ public Integer getAge() { * ensure this instance of `Pet` is added to the owner's composite `pets` list */ public void setOwner(PetOwner newPetOwner) { + this.owner = newPetOwner; + if(owner != null){ + owner.addPet(this); + } } /** * @return PetOwner object whose composite `pets` collection contains this Pet instance */ public PetOwner getOwner() { - return null; + return owner; } } From 38792d1d00f3aa9011ec7e939b4af62fce90b603 Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 12:41:54 -0400 Subject: [PATCH 05/14] working on animal --- .../assessment1/part3/Dog.java | 7 ++-- .../assessment1/part3/PetOwner.java | 33 +++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java index 0c775fd..9b77e0a 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java @@ -9,19 +9,21 @@ public class Dog extends Pet { * @param age age of this dog */ public Dog(String name, Integer age) { - + super(name, age); } /** * @param age age of this dog */ public Dog(Integer age) { + super("Dog name", age); } /** * @param name name of this dog */ public Dog(String name) { + super(name, 0); } @@ -32,12 +34,13 @@ public Dog(String name) { * age is 0 */ public Dog() { + super("Dog name", 0); } /** * @return bark as a string */ public String speak() { - return null; + return "bark"; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index 7bbf2ab..a05ef6f 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -1,27 +1,47 @@ package com.zipcodewilmington.assessment1.part3; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * Created by leon on 2/16/18. */ public class PetOwner { + private String name; + private List pets; /** * @param name name of the owner of the Pet * @param pets array of Pet object */ public PetOwner(String name, Pet... pets) { + this.name = name; + this.pets = new ArrayList<>(); + if (pets != null) { + for (Pet pet : pets) { + addPet(pet); + } + } } /** * @param pet pet to be added to the composite collection of Pets */ public void addPet(Pet pet) { + if (pet != null && !pets.contains(pet)) { + pets.add(pet); + pet.setOwner(this); + } } /** * @param pet pet to be removed from the composite collection Pets */ public void removePet(Pet pet) { - + if (pet != null && pets.contains(pet)) { + pets.remove(pet); + pet.setOwner(null); + } } /** @@ -29,7 +49,7 @@ public void removePet(Pet pet) { * @return true if I own this pet */ public Boolean isOwnerOf(Pet pet) { - return null; + return pets.contains(pet); } /** @@ -47,6 +67,7 @@ public Integer getYoungetPetAge() { */ public Integer getOldestPetAge() { return null; + } @@ -54,27 +75,27 @@ public Integer getOldestPetAge() { * @return the sum of ages of Pet objects stored in this class divided by the number of Pet object */ public Float getAveragePetAge() { - return null; + return null; } /** * @return the number of Pet objects stored in this class */ public Integer getNumberOfPets() { - return null; + return pets.size(); } /** * @return the name property of the Pet */ public String getName() { - return null; + return name; } /** * @return array representation of animals owned by this PetOwner */ public Pet[] getPets() { - return null; + return pets.toArray(new Pet[0]); } } From 4695fe4ab7b89713bdefedb654111aa82dc97584 Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 15:07:35 -0400 Subject: [PATCH 06/14] pt1+pt2 good --- .../part1/RockPaperSissorsEvaluator.java | 29 +++++++++++++-- .../assessment1/part2/ArrayUtils.java | 32 ++++++++++++++--- .../assessment1/part2/StringUtils.java | 2 +- .../assessment1/part3/Dog.java | 20 ++++++++--- .../assessment1/part4/Jumper.java | 36 +++++++++++++++++-- .../assessment1/part5/Palindrome.java | 22 +++++++++++- 6 files changed, 124 insertions(+), 17 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..23c0f97 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/RockPaperSissorsEvaluator.java @@ -13,7 +13,15 @@ public class RockPaperSissorsEvaluator { * @return the respective winning move */ public String getWinningMove(String handSign) { - return null; + if (handSign.equals(ROCK)) { + return PAPER; + } else if (handSign.equals(PAPER)) { + return SCISSOR; + } else if (handSign.equals(SCISSOR)){ + return ROCK; + }else{ + return null; + } } /** @@ -21,7 +29,15 @@ public String getWinningMove(String handSign) { * @return the respective losing move */ public String getLosingMove(String handSign) { - return null; + if (handSign.equals(ROCK)) { + return SCISSOR; + } else if (handSign.equals(PAPER)) { + return ROCK; + } else if (handSign.equals(SCISSOR)) { + return PAPER; + } else { + return null; + } } /** @@ -30,6 +46,13 @@ 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; + // Determine the winner based on the rules of rock-paper-scissors + if (handSignOfPlayer1.equals(handSignOfPlayer2)) { + return "draw"; + } else if (handSignOfPlayer1.equals(getWinningMove(handSignOfPlayer2))) { + return ROCK; + } else { + return handSignOfPlayer2 + handSignOfPlayer1; + } } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index 0ca405b..f3a86a7 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -32,7 +32,11 @@ 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; + List list = new ArrayList<>(); + for (Object obj : objectArray) { + if (!obj.equals(objectToRemove)) list.add(obj); + } + return list.toArray((Object[]) Arrays.copyOf(objectArray, 0)); } @@ -42,7 +46,16 @@ 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; + Object mostCommon = null; + int maxCount = 0; + for (Object obj : objectArray) { + int count = getNumberOfOccurrences(objectArray, obj); + if (count > maxCount) { + maxCount = count; + mostCommon = obj; + } + } + return mostCommon; } @@ -52,7 +65,16 @@ 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; + Object leastCommon = null; + int minCount = objectArray.length + 1; + for (Object obj : objectArray) { + int count = getNumberOfOccurrences(objectArray, obj); + if (count < minCount) { + minCount = count; + leastCommon = obj; + } + } + return leastCommon; } /** @@ -62,6 +84,8 @@ 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) { - return null; + Object[] result = Arrays.copyOf(objectArray, objectArray.length + objectArrayToAdd.length); + System.arraycopy(objectArrayToAdd, 0, result, objectArray.length, objectArrayToAdd.length); + return result; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java index 7e04c37..9315282 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java @@ -71,7 +71,7 @@ public static String reverseFirstWordThenCamelCase(String sentence) { */ public static String removeCharacterAtIndex(String str, int index) { if (index < 0 || index >= str.length()) { - return str; // if index out of bounds, return original string + return str; } return str.substring(0, index) + str.substring(index + 1); //return null; diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java index 9b77e0a..6829ac7 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java @@ -1,30 +1,40 @@ package com.zipcodewilmington.assessment1.part3; +import java.util.Date; + /** * Created by leon on 2/16/18. */ public class Dog extends Pet { + // private String name; + //private Integer age; + //private PetOwner owner; + public Dog(String name, Integer age, PetOwner owner){ + //super(name, age, owner); + } /** * @param name name of this Dog * @param age age of this dog */ public Dog(String name, Integer age) { - super(name, age); + super("Dog name", age); + } /** * @param age age of this dog */ public Dog(Integer age) { - super("Dog name", age); + super("Dog name", 0); } /** * @param name name of this dog */ public Dog(String name) { - super(name, 0); + super("Dog name", 0); + // this.name = name; } /** @@ -34,13 +44,13 @@ public Dog(String name) { * age is 0 */ public Dog() { - super("Dog name", 0); + super("",0); } /** * @return bark as a string */ public String speak() { - return "bark"; + return "Bark"; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java b/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java index f881e9c..b8cbd48 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part4/Jumper.java @@ -5,7 +5,37 @@ public class Jumper { /* * Complete the function below. */ + +// Tariq, the Kangaroo, is trying to reach a flag that's flagHeight units above the ground. In his attempt to reach the flag, +// Tariq can make any number of jumps up the rock wall where it's mounted; however, he can only move up the wall (meaning he cannot overshoot the flag and move down to reach it). There are 2 types of jumps: +// +// A jump of height 1. +// A jump of height jumpHeight. +// Tariq wants your help determining the minimum number of jumps it will take him to collect the flag. Complete the jumps function in your editor. It has 2 parameters: +// +// An integer, flagHeight, the height of the flag. +// An integer, jumpHeight, the number of units he ascends in a jump of type 2. +// It must return an integer denoting the minimum number of times Tariq must jump to collect the flag. +// +// k = flag height and j = jump height. j = 1 unit so if j = 1 return k +// jumps and a jump counter public int jumps(int k, int j) { - return -1; - } -} + if (j == 1) { + return k; + } + int jumps = 0; + long currentHeight = 0; + + while(currentHeight < k) { + if(currentHeight + j <= k) { + currentHeight += j; + } else { + currentHeight++; + } + jumps++; + } + return jumps; + //return -1; + } + } + diff --git a/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java b/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java index 89e2016..9a3a2cf 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java @@ -3,6 +3,26 @@ public class Palindrome { public Integer countPalindromes(String input){ - return null; + int i = input.length(); + int count = 0; + + for (int center = 0; center < i; center++) { + int left = center; + int right = center; + while (left >= 0 && right < i && input.charAt(left) == input.charAt(right)) { + count++; + left--; + right++; + } + left = center; + right = center + 1; + while (left >= 0 && right < i && input.charAt(left) == input.charAt(right)) { + count++; + left--; + right++; + } + } + return count; + //return null; } } From bb5ab4ecb6afb2fd7927cb070168185574d1276b Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 15:41:32 -0400 Subject: [PATCH 07/14] dogtest --- .../assessment1/part2/ArrayUtils.java | 2 +- .../assessment1/part3/Cat.java | 7 +++++-- .../assessment1/part3/Dog.java | 21 ++++++++----------- .../assessment1/part3/Pet.java | 9 +++++--- .../assessment1/part3/PetOwner.java | 10 ++++----- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index f3a86a7..7b22080 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -36,7 +36,7 @@ public static Object[] removeValue(Object[] objectArray, Object objectToRemove) for (Object obj : objectArray) { if (!obj.equals(objectToRemove)) list.add(obj); } - return list.toArray((Object[]) Arrays.copyOf(objectArray, 0)); + return list.toArray(Arrays.copyOf(objectArray, 0)); } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java index e731b77..1adb1ba 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java @@ -4,6 +4,9 @@ * Created by leon on 2/16/18. */ public class Cat extends Pet { + public Cat(){ + super("Cat name", 0); + } /** * @param name name of this Cat * @param age age of this Cat @@ -31,8 +34,8 @@ public Cat(String name) { * name is CatName * age is 0 */ - public Cat() { - } + //public Cat() { + // } /** * @return meow as a string diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java index 6829ac7..e23cdee 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Dog.java @@ -6,18 +6,15 @@ * Created by leon on 2/16/18. */ public class Dog extends Pet { - // private String name; - //private Integer age; - //private PetOwner owner; - public Dog(String name, Integer age, PetOwner owner){ - //super(name, age, owner); - } + public Dog(){ + super("Dog name", 0); + } /** * @param name name of this Dog * @param age age of this dog */ public Dog(String name, Integer age) { - super("Dog name", age); + super(name,age); } @@ -25,14 +22,14 @@ public Dog(String name, Integer age) { * @param age age of this dog */ public Dog(Integer age) { - super("Dog name", 0); + super("Dog name", age); } /** * @param name name of this dog */ public Dog(String name) { - super("Dog name", 0); + super(name,0); // this.name = name; } @@ -43,9 +40,9 @@ public Dog(String name) { * name is DogName * age is 0 */ - public Dog() { - super("",0); - } + //public Dog() { + // return null; + //} /** * @return bark as a string diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java index 2f01f6b..05e954d 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Pet.java @@ -11,6 +11,7 @@ public abstract class Pet implements Animal { public Pet() { this.name = ""; this.age = 0; + this.owner = null; } /** @@ -29,8 +30,9 @@ public Pet(String name) { */ public Pet(int age) { this.name = ""; - this.age = 0; + this.age = age; this.owner = null; + } /** @@ -38,9 +40,10 @@ public Pet(int age) { * @param age age of this pet */ public Pet(String name, int age) { - this.name = ""; - this.age = 0; + this.name = name; + this.age = age; this.owner = null; + } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index a05ef6f..46d112c 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -38,10 +38,10 @@ public void addPet(Pet pet) { * @param pet pet to be removed from the composite collection Pets */ public void removePet(Pet pet) { - if (pet != null && pets.contains(pet)) { - pets.remove(pet); - pet.setOwner(null); - } + pets.remove(pet); + // if (pet != null){ + // pet.setOwner(null); + // } } /** @@ -75,7 +75,7 @@ public Integer getOldestPetAge() { * @return the sum of ages of Pet objects stored in this class divided by the number of Pet object */ public Float getAveragePetAge() { - return null; + return null; } /** From 9c6abcfe4cf79dd35e7c400d30c2fc0bafc1557d Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 16:34:14 -0400 Subject: [PATCH 08/14] cat test --- .../assessment1/part2/ArrayUtils.java | 22 ++--------------- .../assessment1/part3/Cat.java | 6 +++-- .../assessment1/part3/PetOwner.java | 4 +--- .../assessment1/part5/Palindrome.java | 24 +++++++++---------- 4 files changed, 19 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index 7b22080..21d2e07 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -46,16 +46,7 @@ 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) { - Object mostCommon = null; - int maxCount = 0; - for (Object obj : objectArray) { - int count = getNumberOfOccurrences(objectArray, obj); - if (count > maxCount) { - maxCount = count; - mostCommon = obj; - } - } - return mostCommon; + return null; } @@ -65,16 +56,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) { - Object leastCommon = null; - int minCount = objectArray.length + 1; - for (Object obj : objectArray) { - int count = getNumberOfOccurrences(objectArray, obj); - if (count < minCount) { - minCount = count; - leastCommon = obj; - } - } - return leastCommon; + 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 1adb1ba..59b82cb 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java @@ -12,19 +12,21 @@ public Cat(){ * @param age age of this Cat */ public Cat(String name, Integer age) { - + super(name,age); } /** * @param age age of this Cat */ public Cat(Integer age) { + super("Cat name", age); } /** * @param name name of this Cat */ public Cat(String name) { + super(name,0); } @@ -41,6 +43,6 @@ public Cat(String name) { * @return meow as a string */ public String speak() { - return null; + return "Meow"; } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index 46d112c..73eed7a 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -39,9 +39,7 @@ public void addPet(Pet pet) { */ public void removePet(Pet pet) { pets.remove(pet); - // if (pet != null){ - // pet.setOwner(null); - // } + } /** diff --git a/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java b/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java index 9a3a2cf..963879a 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part5/Palindrome.java @@ -3,26 +3,26 @@ public class Palindrome { public Integer countPalindromes(String input){ - int i = input.length(); int count = 0; + int i = input.length(); - for (int center = 0; center < i; center++) { - int left = center; - int right = center; - while (left >= 0 && right < i && input.charAt(left) == input.charAt(right)) { - count++; - left--; - right++; - } - left = center; - right = center + 1; - while (left >= 0 && right < i && input.charAt(left) == input.charAt(right)) { + for (int center = 0; center < 2 * i - 1; center++) { + int left = center / 2; + int right = left + center % 2; + + while (left >= 0 && right < i && input.charAt(left) == input.charAt(right)) { count++; left--; right++; } } + return count; //return null; } } + + +//https://stackoverflow.com/questions/28001132/checking-if-a-string-is-a-palindrome-in-java +//https://www.geeksforgeeks.org/java-program-to-check-whether-a-string-is-a-palindrome/ + From a09f67b660814f4767802c9f66609e0ab322855a Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 16:42:36 -0400 Subject: [PATCH 09/14] Animal --- .../assessment1/part2/ArrayUtils.java | 22 +++++++++++++++++-- .../assessment1/part3/Cat.java | 1 - .../assessment1/part3/PetOwner.java | 5 +++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index 21d2e07..cd83817 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -46,17 +46,35 @@ 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; + Object mostCommon = 0; + int maxCount = 0; + for (Object obj : objectArray) { + int count = getNumberOfOccurrences(objectArray, obj); + if (count > maxCount) { + maxCount = count; + mostCommon = obj; + } + }return mostCommon; + //return null; } + /** * @param objectArray an array of any type of Object * @return the least frequently occurring object in the array * given an array of objects, named `objectArray` return the least frequently occuring object in the array */ public static Object getLeastCommon(Object[] objectArray) { - return null; + Object leastCommon = 0; + int minCount = objectArray.length + 1; + for (Object obj : objectArray) { + int count = getNumberOfOccurrences(objectArray, obj); + if (count < minCount) { + minCount = count; + leastCommon = obj; + } + }return leastCommon; } /** diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java index 59b82cb..c8dd23d 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/Cat.java @@ -29,7 +29,6 @@ public Cat(String name) { super(name,0); } - /** * nullary constructor * by default, a Cat's diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index 73eed7a..3edcab7 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -38,8 +38,9 @@ public void addPet(Pet pet) { * @param pet pet to be removed from the composite collection Pets */ public void removePet(Pet pet) { - pets.remove(pet); - + return null; + //if(pet = 1 ) + // pets.remove(pet); } /** From 817aba3da7f17cfca425b6ba3d062b76ea77f7ee Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 16:46:53 -0400 Subject: [PATCH 10/14] youngest --- .../com/zipcodewilmington/assessment1/part3/PetOwner.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index 3edcab7..ac95231 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -38,9 +38,9 @@ public void addPet(Pet pet) { * @param pet pet to be removed from the composite collection Pets */ public void removePet(Pet pet) { - return null; + // return null; //if(pet = 1 ) - // pets.remove(pet); + //pets.remove(pet); } /** @@ -55,6 +55,8 @@ public Boolean isOwnerOf(Pet pet) { * @return the age of the Pet object whose age field is the lowest amongst all Pets in this class */ public Integer getYoungetPetAge() { + //int youngest = pets.get(0).getAge(); + //for(int i = 1; i < pets.size();i++) return null; } From 2d4f4ed2cd5c4c3aeb2756a2c26e610c89897a0f Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 16:54:08 -0400 Subject: [PATCH 11/14] commit --- .../assessment1/part2/ArrayUtils.java | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java index cd83817..54d87bc 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -32,11 +32,7 @@ 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) { - List list = new ArrayList<>(); - for (Object obj : objectArray) { - if (!obj.equals(objectToRemove)) list.add(obj); - } - return list.toArray(Arrays.copyOf(objectArray, 0)); + return null; } @@ -46,16 +42,7 @@ 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) { - Object mostCommon = 0; - int maxCount = 0; - for (Object obj : objectArray) { - int count = getNumberOfOccurrences(objectArray, obj); - if (count > maxCount) { - maxCount = count; - mostCommon = obj; - } - }return mostCommon; - //return null; + return null; } @@ -66,15 +53,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) { - Object leastCommon = 0; - int minCount = objectArray.length + 1; - for (Object obj : objectArray) { - int count = getNumberOfOccurrences(objectArray, obj); - if (count < minCount) { - minCount = count; - leastCommon = obj; - } - }return leastCommon; + return null; } /** From 25d665eb7e0cf62e2c9f7372db4b1e5710095e30 Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 16:55:10 -0400 Subject: [PATCH 12/14] save commit --- .../java/com/zipcodewilmington/assessment1/part3/PetOwner.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java index ac95231..a874576 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part3/PetOwner.java @@ -67,6 +67,8 @@ public Integer getYoungetPetAge() { * @return the age of the Pet object whose age field is the highest amongst all Pets in this class */ public Integer getOldestPetAge() { + //int get oldest + return null; } @@ -76,6 +78,7 @@ public Integer getOldestPetAge() { * @return the sum of ages of Pet objects stored in this class divided by the number of Pet object */ public Float getAveragePetAge() { + //need to revist this return null; } From 917ba427edb98bffdd2bdce023faea70ba81771f Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 16:57:26 -0400 Subject: [PATCH 13/14] commits --- .../assessment1/part1/BasicStringUtils.java | 10 +++++----- .../assessment1/part2/ArrayUtils.java | 2 +- .../assessment1/part2/MultiplesDeleter.java | 10 ++++++---- 3 files changed, 12 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 87945f3..14ba500 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java @@ -10,7 +10,7 @@ public class BasicStringUtils { */ public static String camelCase(String str) { return Character.toUpperCase(str.charAt(0)) + str.substring(1); - //return null; + } /** @@ -19,7 +19,7 @@ public static String camelCase(String str) { */ public static String reverse(String str) { return new StringBuilder(str).reverse().toString(); - //return null; + } /** @@ -29,7 +29,7 @@ public static String reverse(String str) { public static String reverseThenCamelCase(String str) { String reversed = new StringBuilder(str).reverse().toString(); return camelCase(reversed); - //return null; + } @@ -39,7 +39,7 @@ public static String reverseThenCamelCase(String str) { */ public static String removeFirstAndLastCharacter(String str) { return str.substring(1, str.length() - 1); - //return null; + } /** @@ -57,6 +57,6 @@ public static String invertCasing(String str) { } } return new String(chars); - //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 54d87bc..03cb019 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/ArrayUtils.java @@ -22,7 +22,7 @@ public static Integer getNumberOfOccurrences(Object[] objectArray, Object object } } return counter; - //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 02d8ce3..13b8c4b 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/MultiplesDeleter.java @@ -12,6 +12,8 @@ public class MultiplesDeleter { * @return all ints which are not divisible by 2 * given an array of integers, named `ints` return an identical array with evens removed */ + + public Integer[] deleteEvens(Integer[] ints) { List result = new ArrayList<>(); for (Integer num : ints) { @@ -20,7 +22,7 @@ public Integer[] deleteEvens(Integer[] ints) { } } return result.toArray(new Integer[0]); - //return null; + } /** @@ -36,7 +38,7 @@ public Integer[] deleteOdds(Integer[] ints) { } } return result.toArray(new Integer[0]); - //return null; + } /** @@ -52,7 +54,7 @@ public Integer[] deleteMultiplesOf3(Integer[] ints) { } } return result.toArray(new Integer[0]); - //return null; + } /** @@ -70,5 +72,5 @@ public Integer[] deleteMultiplesOfN(Integer[] ints, int multiple) { } return result.toArray(new Integer[0]); } - //return null; + } From bee857fb24262a5e6d6b55be44a416a0d776866f Mon Sep 17 00:00:00 2001 From: igordon215 Date: Mon, 8 Jul 2024 16:58:50 -0400 Subject: [PATCH 14/14] final commit --- .../assessment1/part1/BasicStringUtils.java | 2 +- .../assessment1/part1/IntegerArrayUtils.java | 6 +++--- .../assessment1/part1/IntegerUtils.java | 6 +++--- .../assessment1/part2/StringUtils.java | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java index 14ba500..6654952 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/BasicStringUtils.java @@ -10,7 +10,7 @@ public class BasicStringUtils { */ public static String camelCase(String str) { return Character.toUpperCase(str.charAt(0)) + str.substring(1); - + } /** diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java index 0d0df07..31693d4 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerArrayUtils.java @@ -14,7 +14,7 @@ public static Integer getSum(Integer[] intArray) { sum += num; } return sum; - //return null; + } /** @@ -27,7 +27,7 @@ public static Integer getProduct(Integer[] intArray) { product *= num; } return product; - //return null; + } /** @@ -37,6 +37,6 @@ public static Integer getProduct(Integer[] intArray) { public static Double getAverage(Integer[] intArray) { int sum = getSum(intArray); return (double) sum / intArray.length; - //return null; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java index 23dbaaf..1f7548b 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part1/IntegerUtils.java @@ -16,7 +16,7 @@ public static Integer getSumOfN(Integer n) { sum += i; } return sum; - //return null; + } /** @@ -29,7 +29,7 @@ public static Integer getProductOfN(Integer n) { product *= i; } return product; - //return null; + } /** @@ -44,6 +44,6 @@ public static Integer reverseDigits(Integer val) { val /= 10; } return reversed; - //return null; + } } diff --git a/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java b/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java index 9315282..8fc8a86 100644 --- a/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java +++ b/src/main/java/com/zipcodewilmington/assessment1/part2/StringUtils.java @@ -12,7 +12,7 @@ public class StringUtils { */ public static String[] getWords(String sentence) { return sentence.split("\\s+"); - //return null; + } @@ -28,7 +28,7 @@ public static String getFirstWord(String sentence) { }else { return ""; } - //return null; + } /** @@ -44,7 +44,7 @@ public static String reverseFirstWord(String sentence) { } else { return ""; } - //return null; + } /** @@ -59,7 +59,7 @@ public static String reverseFirstWordThenCamelCase(String sentence) { } else { return ""; } - //return null; + } @@ -74,7 +74,7 @@ public static String removeCharacterAtIndex(String str, int index) { return str; } return str.substring(0, index) + str.substring(index + 1); - //return null; + } }