From 536dd35a0c8f9639e683553db6011220afa6ec4e Mon Sep 17 00:00:00 2001 From: Garrett Arant Date: Wed, 7 Feb 2018 15:33:50 -0500 Subject: [PATCH 1/4] Third of the way done --- .../mastering_loops/NumberUtilities.java | 68 +++++++++++++++++-- .../mastering_loops/NumberUtilitiesTest.java | 4 +- 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java index 5a742c4..30a764f 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -3,26 +3,84 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + + StringBuilder evenNumbers = new StringBuilder(); + + for(int i = start; i < stop; i++){ + + if (i % 2 == 0){ + evenNumbers.append(i); + } + } + + + return evenNumbers.toString(); } public static String getOddNumbers(int start, int stop) { - return null; + + StringBuilder oddNumbers = new StringBuilder(); + + for(int i = start; i < stop; i++){ + + if (i % 2 != 0){ + oddNumbers.append(i); + } + } + + + return oddNumbers.toString(); + } public static String getSquareNumbers(int start, int stop, int step) { - return null; + + StringBuilder squareNumbers = new StringBuilder(); + + for(int i = start; i < stop; i += step){ + + + + squareNumbers.append((int)(Math.pow(i,2))); + } + + + return squareNumbers.toString(); } public static String getRange(int start, int stop, int step) { - return null; + + StringBuilder rangeNumbers = new StringBuilder(); + + for(int i = start; i < stop; i += step){ + + + + rangeNumbers.append(i); + } + + + return rangeNumbers.toString(); + } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + StringBuilder exponentNumbers = new StringBuilder(); + + for(int i = start; i < stop; i += step){ + + + + exponentNumbers.append((int)(Math.pow(i,exponent))); + } + + + return exponentNumbers.toString(); } + } + diff --git a/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java b/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java index e579b43..5ce91f7 100644 --- a/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java +++ b/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java @@ -51,7 +51,7 @@ public void testGetRange2() { @Test public void testGetEvenNumbers() { // : Given - String expected = "5791113151719"; + String expected = "681012141618"; int start = 5; int stop = 20; @@ -65,7 +65,7 @@ public void testGetEvenNumbers() { @Test public void testGetOddNumbers() { // : Given - String expected = "681012141618"; + String expected = "5791113151719"; int start = 5; int stop = 20; int step = 5; From ef848efd68b82e4ad67017e3e5a2bed611164732 Mon Sep 17 00:00:00 2001 From: Garrett Arant Date: Wed, 7 Feb 2018 18:29:23 -0500 Subject: [PATCH 2/4] Two Thirds Done --- .../mastering_loops/TriangleUtilities.java | 60 +++++++++++++++++-- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java index 0c7cd35..9f40ff8 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,18 +3,70 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + String output =""; + for(int i = 0; i < numberOfRows; i++){ + for(int j = 0; j < i;j++){ + output += "*"; + + } + + output += "\n"; + + } + + return output.trim() + "\n"; + + + } public static String getRow(int numberOfStars) { - return null; + String output =""; + for(int i = 0; i < numberOfStars; i++){ + output += "*"; + + + + } + + return output; + + } public static String getSmallTriangle() { - return null; + String output =""; + for(int i = 0; i <= 4; i++){ + for(int j = 0; j < i;j++){ + output += "*"; + + } + + output += "\n"; + + } + + return output.trim() + "\n"; + } public static String getLargeTriangle() { - return null; + String output =""; + for(int i = 0; i < 10; i++){ + for(int j = 0; j < i;j++){ + output += "*"; + + } + + output += "\n"; + + } + + return output.trim() + "\n"; + + } } + + + From fc8089b36bd7ee10a0ca13459117d4d8f1a77b72 Mon Sep 17 00:00:00 2001 From: Garrett Arant Date: Wed, 7 Feb 2018 22:09:42 -0500 Subject: [PATCH 3/4] Garrett Completed Lab --- .../mastering_loops/TableUtilities.java | 56 +++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java index e27a826..8899ecd 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -2,14 +2,62 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + + + StringBuilder output = new StringBuilder(); + + + for (int i = 1; i <=5; ++i) + { + + for (int j =1; j<=5; ++j) + { + + int product = i*j; + output.append(String.format("%3d |", product)); + } + System.out.println(); + output.append("\n"); + } + return output.toString(); } public static String getLargeMultiplicationTable() { - return null; + StringBuilder output = new StringBuilder(); + + + for (int i = 1; i <=10; ++i) + { + + for (int j =1; j<=10; ++j) + { + + int product = i*j; + output.append(String.format("%3d |", product)); + } + System.out.println(); + output.append("\n"); + } + return output.toString(); } public static String getMultiplicationTable(int tableSize) { - return null; + StringBuilder output = new StringBuilder(); + + + for (int i = 1; i <=tableSize; ++i) + { + + for (int j =1; j<=tableSize; ++j) + { + + int product = i*j; + output.append(String.format("%3d |", product)); + } + System.out.println(); + output.append("\n"); + } + return output.toString(); } -} + } + From 5707f3c470f163e6deb82308c768b81158f0a4a3 Mon Sep 17 00:00:00 2001 From: Garrett Arant Date: Thu, 8 Feb 2018 07:46:35 -0500 Subject: [PATCH 4/4] Update to Completed Lab --- .../microlabs/mastering_loops/TriangleUtilities.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java index 9f40ff8..523e3dc 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -4,7 +4,7 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { String output =""; - for(int i = 0; i < numberOfRows; i++){ + for(int i = 1; i < numberOfRows; i++){ for(int j = 0; j < i;j++){ output += "*"; @@ -14,7 +14,7 @@ public static String getTriangle(int numberOfRows) { } - return output.trim() + "\n"; + return output; @@ -36,7 +36,7 @@ public static String getRow(int numberOfStars) { public static String getSmallTriangle() { String output =""; - for(int i = 0; i <= 4; i++){ + for(int i = 1; i <= 4; i++){ for(int j = 0; j < i;j++){ output += "*"; @@ -46,13 +46,13 @@ public static String getSmallTriangle() { } - return output.trim() + "\n"; + return output; } public static String getLargeTriangle() { String output =""; - for(int i = 0; i < 10; i++){ + for(int i = 1; i < 10; i++){ for(int j = 0; j < i;j++){ output += "*"; @@ -62,7 +62,7 @@ public static String getLargeTriangle() { } - return output.trim() + "\n"; + return output; }