From 05a52e5c8aff233c99ed362b2998a37a8a129634 Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Thu, 8 Feb 2018 09:22:35 -0500 Subject: [PATCH 01/12] saved --- .../java/io/zipcoder/microlabs/mastering_loops/MainApp.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java index 29e339b..1793a90 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java @@ -5,6 +5,8 @@ /** * Created by leon on 1/31/18. */ + +// saved public class MainApp { public static void main(String[] args) { } From 30b00cab45b06912272a079c80a5640f2d130bbd Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Thu, 8 Feb 2018 17:34:54 -0500 Subject: [PATCH 02/12] saveeeee --- .../microlabs/mastering_loops/MainApp.java | 2 ++ .../mastering_loops/NumberUtilities.java | 23 +++++++++++++++++-- .../mastering_loops/NumberUtilitiesTest.java | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java index 1793a90..08ada4a 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java @@ -9,5 +9,7 @@ // saved public class MainApp { public static void main(String[] args) { + + } } 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..de65149 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -3,12 +3,31 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += 2) { + myString.append(i); + } + + return myString.toString(); + + } public static String getOddNumbers(int start, int stop) { - return null; + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += 2) { + myString.append(i); + } + + return myString.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..2feade3 100644 --- a/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java +++ b/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java @@ -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 c0d74efce392f64c631ed60c0c8746d5487b76c1 Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Thu, 8 Feb 2018 18:02:26 -0500 Subject: [PATCH 03/12] ok ok ok --- .../mastering_loops/NumberUtilities.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 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 de65149..b1cd319 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -32,12 +32,26 @@ public static String getOddNumbers(int start, int stop) { public static String getSquareNumbers(int start, int stop, int step) { - return null; + + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += step) { + myString.append(i*i); + + } + + return myString.toString(); + } public static String getRange(int start, int stop, int step) { - return null; + + + + } From abd3763e0723f34aed770158b867e08041f6b4cb Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Thu, 8 Feb 2018 18:26:27 -0500 Subject: [PATCH 04/12] donezo --- .../mastering_loops/NumberUtilities.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 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 b1cd319..4f03aff 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -38,7 +38,7 @@ public static String getSquareNumbers(int start, int stop, int step) { for (int i = start; i < stop; i += step) { - myString.append(i*i); + myString.append(i * i); } @@ -49,13 +49,27 @@ public static String getSquareNumbers(int start, int stop, int step) { public static String getRange(int start, int stop, int step) { + StringBuilder myString = new StringBuilder(); + for (int i = start; i < stop; i += step) { + myString.append(i); + } - + return myString.toString(); } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += step) { + myString.append((long)(Math.pow(i, 2))); + + } + + return myString.toString(); + } } From b88a038c943f9f9a12695d91c14d88c02b0ecbc1 Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Fri, 9 Feb 2018 08:54:06 -0500 Subject: [PATCH 05/12] save me --- .../microlabs/mastering_loops/TriangleUtilities.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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..6d8c6eb 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,7 +3,14 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 0; i <= numberOfRows; i++) { + myString.append(i); + } + + return myString.toString(); } public static String getRow(int numberOfStars) { From 0055add4a24d30be8bf414d84efbc7c1fe86b8db Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Fri, 9 Feb 2018 11:26:22 -0500 Subject: [PATCH 06/12] one down --- .../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 6d8c6eb..206d7e3 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -2,19 +2,19 @@ public class TriangleUtilities { - public static String getTriangle(int numberOfRows) { + public static String getTriangle(int numberOfRows) { return null; + } + + public static String getRow(int numberOfStars) { StringBuilder myString = new StringBuilder(); - for (int i = 0; i <= numberOfRows; i++) { - myString.append(i); + for (int i = 0; i < numberOfStars; i++) { + myString.append("*"); } return myString.toString(); - } - public static String getRow(int numberOfStars) { - return null; } public static String getSmallTriangle() { From 6aa49ef64de4eeba3df42079fa7fa21b9015725b Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Fri, 9 Feb 2018 13:51:19 -0500 Subject: [PATCH 07/12] getting there --- .../mastering_loops/TriangleUtilities.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 206d7e3..0efb6f0 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -2,7 +2,20 @@ public class TriangleUtilities { - public static String getTriangle(int numberOfRows) { return null; + public static String getTriangle(int numberOfRows) { + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i < numberOfRows; i++) { + + for (int j = 0; j < i; j++) { + myString.append("*"); + + } + myString.append("\n"); + } + + return myString.toString(); } public static String getRow(int numberOfStars) { @@ -22,6 +35,8 @@ public static String getSmallTriangle() { } public static String getLargeTriangle() { + + return null; } } From a9855ddc65f839434621f63c0c1472f657b76eec Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Fri, 9 Feb 2018 15:58:51 -0500 Subject: [PATCH 08/12] triangles done --- .../mastering_loops/TriangleUtilities.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 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 0efb6f0..28ab9e0 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -31,12 +31,37 @@ public static String getRow(int numberOfStars) { } public static String getSmallTriangle() { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 0; i <= 3; i++) { + + for (int j = 0; j < i; j++) { + myString.append("*"); + + } + myString.append("*\n"); + + } + + return myString.toString(); } public static String getLargeTriangle() { + StringBuilder myString = new StringBuilder(); + + for (int i = 0; i <= 8; i++) { + + for (int j = 0; j < i; j++) { + myString.append("*"); + } + + myString.append("*\n"); + + } + + return myString.toString(); - return null; } } From 1b319a47108d52c6a347506729f028ffc9d15d8f Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Fri, 9 Feb 2018 17:19:02 -0500 Subject: [PATCH 09/12] some table work --- .../mastering_loops/TableUtilities.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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..5869e0e 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -2,7 +2,23 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i <= 5; i++) { + + for (int j = 1; j <= 5; j++) { + + myString.append(i + " | "); + + } + + myString.append("\n"); + + } + + return myString.toString(); + } public static String getLargeMultiplicationTable() { From d08f8793b31cf1d4a14e66ff00ec66b4dc1d3d69 Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Fri, 9 Feb 2018 18:27:03 -0500 Subject: [PATCH 10/12] got the table now i gotta format it --- .../io/zipcoder/microlabs/mastering_loops/TableUtilities.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5869e0e..a7ab2e6 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -9,7 +9,7 @@ public static String getSmallMultiplicationTable() { for (int j = 1; j <= 5; j++) { - myString.append(i + " | "); + myString.append(i*j + " | "); } From abb4ff650e6802b8cf25d1e46e6fcf56950387c3 Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Sat, 10 Feb 2018 11:35:55 -0500 Subject: [PATCH 11/12] small table done --- .../zipcoder/microlabs/mastering_loops/TableUtilities.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 a7ab2e6..b6ede4a 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -5,11 +5,12 @@ public static String getSmallMultiplicationTable() { StringBuilder myString = new StringBuilder(); - for (int i = 1; i <= 5; i++) { + for (int i = 1; i < 6; i++) { - for (int j = 1; j <= 5; j++) { + for (int j = 1; j < 6; j++) { + + myString.append(String.format("%3d |", i * j)); - myString.append(i*j + " | "); } From 05084dd3a04af8c11d8a052796bfd824aba39f16 Mon Sep 17 00:00:00 2001 From: Dylan Camac Date: Sat, 10 Feb 2018 12:10:47 -0500 Subject: [PATCH 12/12] all done and understood. --- .../mastering_loops/TableUtilities.java | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 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 b6ede4a..aa4ed1c 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -23,10 +23,42 @@ public static String getSmallMultiplicationTable() { } public static String getLargeMultiplicationTable() { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i < 11; i++) { + + for (int j = 1; j < 11; j++) { + + myString.append(String.format("%3d |", i*j)); + + } + + myString.append("\n"); + + } + + return myString.toString(); + } public static String getMultiplicationTable(int tableSize) { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i <= tableSize; i++) { + + for (int j = 1; j <= tableSize; j++) { + + myString.append(String.format("%3d |", i*j)); + + } + + myString.append("\n"); + + } + + return myString.toString(); + } }