From e5513c9b6fab8284541eb91245fc0b79c1e01b0d Mon Sep 17 00:00:00 2001
From: Ellis John <ellisjohn@zipcodes-MacBook-Pro-chuck.local>
Date: Sun, 31 Oct 2021 21:39:16 -0400
Subject: [PATCH 1/4] lab

---
 .../MathUtilities.java                        | 55 ++++++++++++-------
 .../StringUtilities.java                      | 10 ++--
 .../ZipcodeRocks.java                         |  2 +-
 .../mathutilities/TestAddition.java           |  2 +-
 4 files changed, 44 insertions(+), 25 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..510ee6e 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,8 @@ public class MathUtilities {
      * @return sum of `baseValue` and `difference`
      */
     public Integer add(int baseValue, int difference) {
-        return null;
+
+        return baseValue + difference;
     }
 
     /**
@@ -20,7 +21,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;
     }
 
     /**
@@ -28,8 +29,12 @@ public Long add(long baseValue, long difference) {
      * @param difference value to add to starting value
      * @return sum of `baseValue` and `difference`
      */
-    public Short add(short baseValue, short difference) {
-        return null;
+    public int add(short baseValue, short difference) {
+
+        int i = baseValue;
+        int j = difference;
+        return i + j;
+
     }
 
     /**
@@ -37,8 +42,17 @@ public Short add(short baseValue, short difference) {
      * @param difference value to add to starting value
      * @return sum of `baseValue` and `difference`
      */
-    public Byte add(byte baseValue, byte difference) {
-        return null;
+    public int add(byte baseValue, byte difference) {
+        Byte a = new Byte(baseValue);
+        Byte b = new Byte(difference);
+        int a2 = a.intValue();
+        int b2 = b.intValue();
+
+//        double i = baseValue;
+//        double j = difference;
+        return a2 + b2;
+
+
     }
 
     /**
@@ -47,7 +61,9 @@ public Byte add(byte baseValue, byte difference) {
      * @return sum of `baseValue` and `difference`
      */
     public Float add(float baseValue, float difference) {
-        return null;
+        Float a = baseValue;
+        Float b = difference;
+        return a + b;
     }
 
     /**
@@ -116,7 +132,7 @@ public Double subtract(double baseValue, double difference) {
 
     /**
      * @param dividend value to be divided
-     * @param divisor value to divide by
+     * @param divisor  value to divide by
      * @return division of `dividend` by `divisor
      */
     public Integer divide(int dividend, int divisor) {
@@ -125,7 +141,7 @@ public Integer divide(int dividend, int divisor) {
 
     /**
      * @param dividend value to be divided
-     * @param divisor value to divide by
+     * @param divisor  value to divide by
      * @return division of `dividend` by `divisor
      */
     public Long divide(long dividend, long divisor) {
@@ -134,7 +150,7 @@ public Long divide(long dividend, long divisor) {
 
     /**
      * @param dividend value to be divided
-     * @param divisor value to divide by
+     * @param divisor  value to divide by
      * @return division of `dividend` by `divisor
      */
     public Short divide(short dividend, short divisor) {
@@ -143,7 +159,7 @@ public Short divide(short dividend, short divisor) {
 
     /**
      * @param dividend value to be divided
-     * @param divisor value to divide by
+     * @param divisor  value to divide by
      * @return division of `dividend` by `divisor
      */
     public Byte divide(byte dividend, byte divisor) {
@@ -152,7 +168,7 @@ public Byte divide(byte dividend, byte divisor) {
 
     /**
      * @param dividend value to be divided
-     * @param divisor value to divide by
+     * @param divisor  value to divide by
      * @return division of `dividend` by `divisor
      */
     public Float divide(float dividend, float divisor) {
@@ -161,7 +177,7 @@ public Float divide(float dividend, float divisor) {
 
     /**
      * @param dividend value to be divided
-     * @param divisor value to divide by
+     * @param divisor  value to divide by
      * @return division of `dividend` by `divisor
      */
     public Double divide(double dividend, double divisor) {
@@ -171,7 +187,7 @@ public Double divide(double dividend, double divisor) {
 
     /**
      * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
+     * @param multiplier   value to multiply by
      * @return product of `multiplicand` by `multiplier`
      */
     public Integer multiply(int multiplicand, int multiplier) {
@@ -180,7 +196,7 @@ public Integer multiply(int multiplicand, int multiplier) {
 
     /**
      * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
+     * @param multiplier   value to multiply by
      * @return product of `multiplicand` by `multiplier`
      */
     public Long multiply(long multiplicand, long multiplier) {
@@ -189,15 +205,16 @@ public Long multiply(long multiplicand, long multiplier) {
 
     /**
      * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
+     * @param multiplier   value to multiply by
      * @return product of `multiplicand` by `multiplier`
      */
     public Short multiply(short multiplicand, short multiplier) {
         return null;
     }
+
     /**
      * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
+     * @param multiplier   value to multiply by
      * @return product of `multiplicand` by `multiplier`
      */
     public Byte multiply(byte multiplicand, byte multiplier) {
@@ -206,7 +223,7 @@ public Byte multiply(byte multiplicand, byte multiplier) {
 
     /**
      * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
+     * @param multiplier   value to multiply by
      * @return product of `multiplicand` by `multiplier`
      */
     public Float multiply(float multiplicand, float multiplier) {
@@ -215,7 +232,7 @@ public Float multiply(float multiplicand, float multiplier) {
 
     /**
      * @param multiplicand value to be multiplied
-     * @param multiplier value to multiply by
+     * @param multiplier   value to multiply by
      * @return product of `multiplicand` by `multiplier`
      */
     public Double multiply(double multiplicand, double 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..96ca816 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,8 @@ public class StringUtilities {
      * @return `Hello World` as a string
      */
     public static String getHelloWorld() {
-        return null;
+
+        return "Hello World";
     }
 
     /**
@@ -17,7 +18,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;
     }
 
     /**
@@ -34,7 +35,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, 2);
     }
 
     /**
@@ -42,7 +43,8 @@ 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() - 2, input.length());
+
     }
 
     /**
diff --git a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java
index 819f21b..fdef5bb 100644
--- a/src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java
+++ b/src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java
@@ -5,6 +5,6 @@
  */
 public class ZipcodeRocks {
     public static void main(String[] args) {
-//         System.out.println("Zipcode Rocks!");
+         System.out.println("Zipcode Rocks!");
     }
 }
diff --git a/src/test/java/com/zipcodewilmington/danny_do_better_exercises/mathutilities/TestAddition.java b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/mathutilities/TestAddition.java
index 03981ff..7ea4bf7 100644
--- a/src/test/java/com/zipcodewilmington/danny_do_better_exercises/mathutilities/TestAddition.java
+++ b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/mathutilities/TestAddition.java
@@ -42,7 +42,7 @@ public void testShortAddition() {
         short addedValue = 7;
         short expected = 16391;
         // : When
-        short actual = mathUtils.add(baseValue, addedValue);
+        short actual = (short) mathUtils.add(baseValue, addedValue);
         // : Then
         assertEquals(expected, actual);
     }

From 96e4d11fc0f93b6751da7c28e24c4be1b3ca7520 Mon Sep 17 00:00:00 2001
From: Ellis John <ellisjohn@zipcodes-MacBook-Pro-chuck.local>
Date: Mon, 1 Nov 2021 08:15:50 -0400
Subject: [PATCH 2/4] lab

---
 .../MathUtilities.java                        | 69 +++++++++++--------
 .../StringUtilities.java                      | 12 ++--
 2 files changed, 47 insertions(+), 34 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 510ee6e..8d97110 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
@@ -1,5 +1,7 @@
 package com.zipcodewilmington.danny_do_better_exercises;
 
+import java.nio.ByteBuffer;
+
 /**
  * Created by dan on 6/14/17.
  */
@@ -42,15 +44,10 @@ public int add(short baseValue, short difference) {
      * @param difference value to add to starting value
      * @return sum of `baseValue` and `difference`
      */
-    public int add(byte baseValue, byte difference) {
-        Byte a = new Byte(baseValue);
-        Byte b = new Byte(difference);
-        int a2 = a.intValue();
-        int b2 = b.intValue();
+    public Byte add(byte baseValue, byte difference) {
+
+        return (byte)(baseValue + difference);
 
-//        double i = baseValue;
-//        double j = difference;
-        return a2 + b2;
 
 
     }
@@ -61,9 +58,7 @@ public int add(byte baseValue, byte difference) {
      * @return sum of `baseValue` and `difference`
      */
     public Float add(float baseValue, float difference) {
-        Float a = baseValue;
-        Float b = difference;
-        return a + b;
+        return baseValue + difference;
     }
 
     /**
@@ -72,7 +67,8 @@ 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;
+
     }
 
     /**
@@ -81,7 +77,8 @@ 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;
     }
 
     /**
@@ -90,7 +87,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;
     }
 
     /**
@@ -99,7 +96,8 @@ 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);
     }
 
     /**
@@ -108,7 +106,8 @@ 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);
     }
 
     /**
@@ -117,7 +116,8 @@ 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;
     }
 
     /**
@@ -126,7 +126,8 @@ 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;
     }
 
 
@@ -136,7 +137,8 @@ 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;
     }
 
     /**
@@ -145,7 +147,8 @@ 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;
     }
 
     /**
@@ -154,7 +157,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);
     }
 
     /**
@@ -163,7 +166,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);
     }
 
     /**
@@ -172,7 +175,8 @@ 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;
     }
 
     /**
@@ -181,7 +185,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;
     }
 
 
@@ -191,7 +195,8 @@ 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;
     }
 
     /**
@@ -200,7 +205,8 @@ 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;
     }
 
     /**
@@ -209,7 +215,8 @@ 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);
     }
 
     /**
@@ -218,7 +225,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);
     }
 
     /**
@@ -227,7 +234,8 @@ 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;
     }
 
     /**
@@ -236,6 +244,7 @@ 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 96ca816..accef96 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
@@ -18,7 +18,7 @@ public static String getHelloWorld() {
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
      */
     public static String concatenation(String firstSegment, String secondSegment){
-        return firstSegment + secondSegment;
+        return firstSegment.concat(secondSegment);
     }
 
     /**
@@ -27,7 +27,8 @@ 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;
     }
 
     /**
@@ -53,7 +54,8 @@ 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;
+            if (inputValue.equals(comparableValue))
+                return true;
     }
 
     /**
@@ -61,7 +63,9 @@ public static Boolean compareTwoStrings(String inputValue, String comparableValu
      * @return the middle character of `inputValue`
      */
     public static Character getMiddleCharacter(String inputValue){
-        return null;
+        int length = inputValue.length();
+        int middle = length / 2;
+        return inputValue.substring(middle); // not sure from here
     }
 
     /**

From 43960c4d918dbbfa2dbd4cb424d5d5fa55d4436b Mon Sep 17 00:00:00 2001
From: Ellis John <ellisjohn@zipcodes-MacBook-Pro-chuck.local>
Date: Tue, 2 Nov 2021 10:49:30 -0400
Subject: [PATCH 3/4] message

---
 GroupDemoRecap | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 GroupDemoRecap

diff --git a/GroupDemoRecap b/GroupDemoRecap
new file mode 160000
index 0000000..a37da59
--- /dev/null
+++ b/GroupDemoRecap
@@ -0,0 +1 @@
+Subproject commit a37da59c88b05cba3e89e207c93ca20039ce7b8a

From 59cb7334bb5d27927a9157f0b061a87e5790aa24 Mon Sep 17 00:00:00 2001
From: Ellis John <ellisjohn@zipcodes-MacBook-Pro-chuck.local>
Date: Tue, 2 Nov 2021 13:16:54 -0400
Subject: [PATCH 4/4] changes

---
 GroupDemoRecap                                             | 1 -
 .../danny_do_better_exercises/PredicateUtilities.java      | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 160000 GroupDemoRecap

diff --git a/GroupDemoRecap b/GroupDemoRecap
deleted file mode 160000
index a37da59..0000000
--- a/GroupDemoRecap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a37da59c88b05cba3e89e207c93ca20039ce7b8a
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..d04fe45 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,7 @@ public class PredicateUtilities {
      * @return true if `x` is greater than `y`
      */
     public Boolean isGreaterThan(int x, int y) {
-        return null;
+        if ()
     }
 
     /**
@@ -19,7 +19,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 true;
+        }
+
     }
 
     /**