From 0d4312cac74a45670a3d52b75e9807669764cffa Mon Sep 17 00:00:00 2001 From: Amanda Huang <79762895+AmandaJ-Huang@users.noreply.github.com> Date: Sun, 31 Oct 2021 01:24:01 -0400 Subject: [PATCH 1/3] MathUtilities in progress --- .../MathUtilities.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java index 8076dfe..5884c16 100644 --- a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java +++ b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java @@ -11,7 +11,7 @@ public class MathUtilities { * @return sum of `baseValue` and `difference` */ public Integer add(int baseValue, int difference) { - return null; + return baseValue + difference; } /** @@ -20,7 +20,7 @@ public Integer add(int baseValue, int difference) { * @return sum of `baseValue` and `difference` */ public Long add(long baseValue, long difference) { - return null; + return baseValue + difference; } /** @@ -29,7 +29,7 @@ public Long add(long baseValue, long difference) { * @return sum of `baseValue` and `difference` */ public Short add(short baseValue, short difference) { - return null; + return (short)(baseValue + difference); } /** @@ -38,7 +38,7 @@ public Short add(short baseValue, short difference) { * @return sum of `baseValue` and `difference` */ public Byte add(byte baseValue, byte difference) { - return null; + return (byte)(baseValue + difference); } /** @@ -47,7 +47,7 @@ public Byte add(byte baseValue, byte difference) { * @return sum of `baseValue` and `difference` */ public Float add(float baseValue, float difference) { - return null; + return baseValue + difference; } /** @@ -56,7 +56,7 @@ public Float add(float baseValue, float difference) { * @return sum of `baseValue` and `difference` */ public Double add(double baseValue, double difference) { - return null; + return baseValue + difference; } /** @@ -65,7 +65,7 @@ public Double add(double baseValue, double difference) { * @return difference between `baseValue` and `difference` */ public Integer subtract(int baseValue, int difference) { - return null; + return baseValue - difference; } /** @@ -74,7 +74,7 @@ public Integer subtract(int baseValue, int difference) { * @return difference between `baseValue` and `difference` */ public Long subtract(long baseValue, long difference) { - return null; + return baseValue - difference; } /** @@ -83,7 +83,7 @@ public Long subtract(long baseValue, long difference) { * @return difference between `baseValue` and `difference` */ public Short subtract(short baseValue, short difference) { - return null; + return (short)(baseValue - difference); } /** @@ -92,7 +92,7 @@ public Short subtract(short baseValue, short difference) { * @return difference between `baseValue` and `difference` */ public Byte subtract(byte baseValue, byte difference) { - return null; + return (byte)(baseValue - difference); } /** @@ -101,7 +101,7 @@ public Byte subtract(byte baseValue, byte difference) { * @return difference between `baseValue` and `difference` */ public Float subtract(float baseValue, float difference) { - return null; + return baseValue - difference; } /** @@ -110,7 +110,7 @@ public Float subtract(float baseValue, float difference) { * @return difference between `baseValue` and `difference` */ public Double subtract(double baseValue, double difference) { - return null; + return baseValue - difference; } @@ -120,7 +120,7 @@ public Double subtract(double baseValue, double difference) { * @return division of `dividend` by `divisor */ public Integer divide(int dividend, int divisor) { - return null; + return dividend / divisor; } /** @@ -129,7 +129,7 @@ public Integer divide(int dividend, int divisor) { * @return division of `dividend` by `divisor */ public Long divide(long dividend, long divisor) { - return null; + return dividend / divisor; } /** @@ -138,7 +138,7 @@ public Long divide(long dividend, long divisor) { * @return division of `dividend` by `divisor */ public Short divide(short dividend, short divisor) { - return null; + return (short)(dividend / divisor); } /** @@ -147,7 +147,7 @@ public Short divide(short dividend, short divisor) { * @return division of `dividend` by `divisor */ public Byte divide(byte dividend, byte divisor) { - return null; + return (byte)(dividend / divisor); } /** @@ -156,7 +156,7 @@ public Byte divide(byte dividend, byte divisor) { * @return division of `dividend` by `divisor */ public Float divide(float dividend, float divisor) { - return null; + return dividend / divisor; } /** @@ -165,7 +165,7 @@ public Float divide(float dividend, float divisor) { * @return division of `dividend` by `divisor */ public Double divide(double dividend, double divisor) { - return null; + return dividend / divisor; } From e160630895e5493ba04cd97bee3ad4a63c25487f Mon Sep 17 00:00:00 2001 From: Amanda Huang <79762895+AmandaJ-Huang@users.noreply.github.com> Date: Sun, 31 Oct 2021 01:55:38 -0400 Subject: [PATCH 2/3] StringUtilities complete and passing --- .../MathUtilities.java | 12 ++++---- .../StringUtilities.java | 30 ++++++++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java index 5884c16..b5e6659 100644 --- a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java +++ b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java @@ -175,7 +175,7 @@ public Double divide(double dividend, double divisor) { * @return product of `multiplicand` by `multiplier` */ public Integer multiply(int multiplicand, int multiplier) { - return null; + return multiplicand * multiplier; } /** @@ -184,7 +184,7 @@ public Integer multiply(int multiplicand, int multiplier) { * @return product of `multiplicand` by `multiplier` */ public Long multiply(long multiplicand, long multiplier) { - return null; + return multiplicand * multiplier; } /** @@ -193,7 +193,7 @@ public Long multiply(long multiplicand, long multiplier) { * @return product of `multiplicand` by `multiplier` */ public Short multiply(short multiplicand, short multiplier) { - return null; + return (short)(multiplicand * multiplier); } /** * @param multiplicand value to be multiplied @@ -201,7 +201,7 @@ public Short multiply(short multiplicand, short multiplier) { * @return product of `multiplicand` by `multiplier` */ public Byte multiply(byte multiplicand, byte multiplier) { - return null; + return (byte)(multiplicand * multiplier); } /** @@ -210,7 +210,7 @@ public Byte multiply(byte multiplicand, byte multiplier) { * @return product of `multiplicand` by `multiplier` */ public Float multiply(float multiplicand, float multiplier) { - return null; + return multiplicand * multiplier; } /** @@ -219,6 +219,6 @@ public Float multiply(float multiplicand, float multiplier) { * @return product of `multiplicand` by `multiplier` */ public Double multiply(double multiplicand, double multiplier) { - return null; + return multiplicand * multiplier; } } diff --git a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java index 2f776a9..5e1f1e0 100644 --- a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java +++ b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java @@ -8,7 +8,7 @@ public class StringUtilities { * @return `Hello World` as a string */ public static String getHelloWorld() { - return null; + return "Hello World"; } /** @@ -17,7 +17,7 @@ public static String getHelloWorld() { * @return the concatenation of two strings, `firstSegment`, and `secondSegment` */ public static String concatenation(String firstSegment, String secondSegment){ - return null; + return firstSegment + secondSegment; } /** @@ -26,7 +26,7 @@ public static String concatenation(String firstSegment, String secondSegment){ * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment` */ public static String concatenation(int firstSegment, String secondSegment){ - return null; + return firstSegment + secondSegment; } /** @@ -34,7 +34,7 @@ public static String concatenation(int firstSegment, String secondSegment){ * @return the first 3 characters of `input` */ public static String getPrefix(String input){ - return null; + return input.substring(0, 3); } /** @@ -42,7 +42,7 @@ public static String getPrefix(String input){ * @return the last 3 characters of `input` */ public static String getSuffix(String input){ - return null; + return input.substring(input.length()-3); } /** @@ -51,7 +51,7 @@ public static String getSuffix(String input){ * @return the equivalence of two strings, `inputValue` and `comparableValue` */ public static Boolean compareTwoStrings(String inputValue, String comparableValue){ - return null; + return inputValue.equals(comparableValue); } /** @@ -59,7 +59,14 @@ public static Boolean compareTwoStrings(String inputValue, String comparableValu * @return the middle character of `inputValue` */ public static Character getMiddleCharacter(String inputValue){ - return null; + int middle = 0; + if (inputValue.length()%2 == 0) { + middle = inputValue.length()/2-1; + } else { + middle = inputValue.length()/2; + } + + return inputValue.charAt(middle); } /** @@ -67,7 +74,8 @@ public static Character getMiddleCharacter(String inputValue){ * @return the first sequence of characters */ public static String getFirstWord(String spaceDelimitedString){ - return null; + String[] wordArray = spaceDelimitedString.split(" "); + return wordArray[0]; } /** @@ -75,7 +83,8 @@ public static String getFirstWord(String spaceDelimitedString){ * @return the second word of a string delimited by spaces. */ public static String getSecondWord(String spaceDelimitedString){ - return null; + String[] wordArray = spaceDelimitedString.split(" "); + return wordArray[1]; } /** @@ -83,6 +92,7 @@ public static String getSecondWord(String spaceDelimitedString){ * @return an identical string with characters in reverse order. */ public static String reverse(String stringToReverse){ - return null; + StringBuilder reversal = new StringBuilder(stringToReverse); + return reversal.reverse().toString(); } } From 2e96f59c32617c887e4c54ed3967209a227f0c0a Mon Sep 17 00:00:00 2001 From: Amanda Huang <79762895+AmandaJ-Huang@users.noreply.github.com> Date: Sun, 31 Oct 2021 01:58:58 -0400 Subject: [PATCH 3/3] Predicate complete and passing. Lab completed --- .../PredicateUtilities.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java index cb5f822..fb020fd 100644 --- a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java +++ b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java @@ -10,7 +10,10 @@ public class PredicateUtilities { * @return true if `x` is greater than `y` */ public Boolean isGreaterThan(int x, int y) { - return null; + if (x > y) { + return returnTrue(); + } + return returnFalse(); } /** @@ -19,7 +22,10 @@ public Boolean isGreaterThan(int x, int y) { * @return true if `x` is less than `y` */ public Boolean isLessThan(int x, int y) { - return null; + if (x < y) { + return returnTrue(); + } + return returnFalse(); } /** @@ -28,7 +34,10 @@ public Boolean isLessThan(int x, int y) { * @return true if `x` is greater than or equal to `y` */ public Boolean isGreaterThanOrEqualTo(int x, int y) { - return null; + if(x >= y) { + return returnTrue(); + } + return returnFalse(); } /** @@ -37,7 +46,10 @@ public Boolean isGreaterThanOrEqualTo(int x, int y) { * @return true if `x` is less than or equal to `y` */ public Boolean isLessThanOrEqualTo(int x, int y) { - return null; + if(x <= y) { + return returnTrue(); + } + return returnFalse(); } @@ -45,14 +57,14 @@ public Boolean isLessThanOrEqualTo(int x, int y) { * @return true */ public Boolean returnTrue() { - return null; + return true; } /** * @return false */ public Boolean returnFalse() { - return null; + return false; } } \ No newline at end of file