diff --git a/ChapterOneMicro.iml b/ChapterOneMicro.iml
index 4e3316b..ccf0dd4 100644
--- a/ChapterOneMicro.iml
+++ b/ChapterOneMicro.iml
@@ -12,5 +12,7 @@
+
+
\ No newline at end of file
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 eba760c..35bc7d9 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,3 +1,4 @@
+
package com.zipcodewilmington.danny_do_better_exercises;
/**
@@ -11,7 +12,7 @@ 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;
}
/**
@@ -29,7 +30,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 +39,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 +48,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 +57,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 +66,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 +75,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 +84,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 +93,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 +102,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 +111,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 +121,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 +130,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 +139,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 +148,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 +157,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 +166,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;
}
@@ -175,7 +176,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 +185,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 +194,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 +202,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 +211,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,7 +220,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;
}
@@ -227,14 +228,14 @@ public Double multiply(double multiplicand, double multiplier) {
* @return true
*/
public Boolean returnTrue() {
- return null;
+ return true;
}
/**
* @return false
*/
public Boolean returnFalse() {
- return null;
+ return false;
}
}
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 9795ee1..1848002 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
@@ -1,5 +1,4 @@
package com.zipcodewilmington.danny_do_better_exercises;
-
/**
* Created by dan on 6/14/17.
*/
@@ -10,16 +9,26 @@ public class PredicateUtilities {
* @return true if `x` is greater than `y`
*/
public Boolean isGreaterThan(int x, int y) {
- return null;
+ if(x > y){
+ return true;
+ }
+ return false;
}
-
/**
* @param x
* @param y
* @return true if `x` is less than `y`
*/
+
public Boolean isLessThan(int x, int y) {
- return null;
+ /*System.out.println("The value of x = " + x);
+ System.out.println("The value of y = " + y);
+ System.out.println("x < y = " + (x < y));
+ */
+ if(x < y) {
+ return true;
+ }
+ return false;
}
/**
@@ -28,7 +37,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 true;
+ }
+ return false;
}
/**
@@ -37,6 +49,9 @@ 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 true;
+ }
+ return false;
}
}
\ No newline at end of file
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 64e90a1..8a290f4 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,15 +59,21 @@ public static Boolean compareTwoStrings(String inputValue, String comparableValu
* @return the middle character of `inputValue`
*/
public static Character getMiddleCharacter(String inputValue){
- return null;
+ double middle = inputValue.length()/2;
+ int i = (int)middle;
+ if(inputValue.length() % 2 != 0) {
+ return inputValue.charAt(i);
+ } else {
+ return inputValue.charAt(i -1);
+ }
}
-
/**
* @param spaceDelimitedString a string, representative of a sentence, containing spaces
* @return the first sequence of characters
*/
public static String getFirstWord(String spaceDelimitedString){
- return null;
+ String [] array1 = spaceDelimitedString.split(" ",0);
+ return array1[0];
}
/**
@@ -75,14 +81,15 @@ 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 [] array2 = spaceDelimitedString.split(" ", 0);
+ return array2[1];
}
/**
* @param stringToReverse
* @return an identical string with characters in reverse order.
*/
- public static String reverseTheTwo(String stringToReverse){
- return null;
+ public static String reverseTheTwo(String stringToReverse) {
+ return new StringBuilder(stringToReverse).reverse().toString();
}
}
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..486cb5d 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/TestMathUtilities.java b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java
index 0ff8d7f..87c1c67 100644
--- a/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java
+++ b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java
@@ -36,7 +36,7 @@ public void testAdditions2() {
// : Given
short baseValue = 16384;
short addedValue = 7;
- short expected = 32767;
+ short expected = 16391;
// : When
short actual = primativeTypes.add(baseValue, addedValue);
// : Then
@@ -78,21 +78,6 @@ public void testAdditions6() {
assertEquals(expected,actual, 0);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@Test
public void testSubtractions(){
// : Given
@@ -146,7 +131,7 @@ public void testSubtractions4() {
// : When
float actualFloat = primativeTypes.subtract(baseValue,difference);
// : Then
- assertEquals(expectedFloat,actualFloat, 0);
+ assertEquals(expectedFloat,actualFloat, 0.003);
}
@Test
public void testSubtractions5() {
@@ -294,9 +279,9 @@ public void testMultiplication2() {
@Test
public void testMultiplication3() {
// : Given
- byte multiplicand = 16;
- byte multiplier = 14;
- byte expectedByte = 64;
+ byte multiplicand = 6;
+ byte multiplier = 4;
+ byte expectedByte = 24;
// : When
byte actualByte = primativeTypes.multiply(multiplicand, multiplier);
// : Then
diff --git a/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java
index 0df7b5f..71f7dff 100644
--- a/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java
+++ b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java
@@ -33,7 +33,7 @@ public void testGreaterThanFalse(){
boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
// : Then
- assertTrue(outcome);
+ assertFalse(outcome);
}
@@ -62,7 +62,7 @@ public void testLessThan1(){
boolean outcome = math.isLessThan(greaterValue, lesserValue);
// : Then
- assertTrue(outcome);
+ assertFalse(outcome);
}
@@ -116,6 +116,6 @@ public void testGreaterOrEqual2(){
boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
// : Then
- assertTrue(outcome);
+ assertFalse(outcome);
}
}
diff --git a/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java
index 688ffa9..cb93419 100644
--- a/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java
+++ b/src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java
@@ -56,7 +56,7 @@ public void concatenationStringAndIntegerTest(){
public void substringBeginTest(){
// : Given
String input = "Hello";
- String expected = "olleH";
+ String expected = "Hel";
// : When
String actual = StringUtilities.getPrefix(input);
@@ -154,7 +154,7 @@ public void getTheSecondWord(){
String expected = "Wilmington";
// : When
- String actual = StringUtilities.getFirstWord(input);
+ String actual = StringUtilities.getSecondWord(input);
// : Then
assertEquals(expected, actual);
diff --git a/target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class b/target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class
index 52b4106..8e51bda 100644
Binary files a/target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class and b/target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class differ
diff --git a/target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class b/target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class
index 741385c..343d2b0 100644
Binary files a/target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class and b/target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class differ
diff --git a/target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class b/target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class
index 30859bd..5455d1a 100644
Binary files a/target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class and b/target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class differ
diff --git a/target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class b/target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class
index 5c385be..492f646 100644
Binary files a/target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class and b/target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class differ
diff --git a/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class b/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class
index 46ee355..3e3a463 100644
Binary files a/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class and b/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class differ
diff --git a/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class b/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class
index 3790f41..25c8d36 100644
Binary files a/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class and b/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class differ
diff --git a/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class b/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class
index 30fe38a..1e8a9c6 100644
Binary files a/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class and b/target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class differ