From 7a4e8c0018df2af8eb15701e2fc00ec36d72056a Mon Sep 17 00:00:00 2001 From: Amy Gill Date: Thu, 8 Feb 2018 19:01:32 -0500 Subject: [PATCH 1/5] ignore this it's just an inital iteration. i'll let you know when it's finished tsm --- .../mastering_loops/TableUtilities.java | 19 ++++++++++++++++++- .../mastering_loops/NumberUtilitiesTest.java | 4 ++-- 2 files changed, 20 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 e27a826..88962e7 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,24 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + String myTable = ""; + + for (int row =1; row <=5; row++){ + for (int col=1; col<=5; col++){ + + int checkSpace = col*row; + if (checkSpace < 10) { + myTable += " " + checkSpace + " | "; + } else if (checkSpace >= 10){ + myTable += " " + checkSpace + " | "; + } + + + } + myTable += "\n"; + } + + return myTable; } public static String getLargeMultiplicationTable() { 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 9f1d963177fef686572bb35a86370be676160dff Mon Sep 17 00:00:00 2001 From: Amy Gill Date: Thu, 8 Feb 2018 19:32:19 -0500 Subject: [PATCH 2/5] again not quite ready --- .../mastering_loops/TriangleUtilities.java | 17 +++++++++++++++-- 1 file changed, 15 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 0c7cd35..41a7389 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,11 +3,24 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + + StringBuilder myTri = new StringBuilder(); + for (int i = 1; i < numberOfRows; i++) { + for (int j = 0; j < i; j++) { + myTri.append("*"); + } + myTri.append("\n"); + } + + return myTri.toString(); } public static String getRow(int numberOfStars) { - return null; + StringBuilder newRow = new StringBuilder(); + for (int i = 0; i < numberOfStars; i++){ + newRow.append("*"); + } + return newRow.toString(); } public static String getSmallTriangle() { From 566c7f9dbfa5b5b082b562b227636f0b6b06c673 Mon Sep 17 00:00:00 2001 From: Amy Gill Date: Thu, 8 Feb 2018 20:05:19 -0500 Subject: [PATCH 3/5] not ready yet thanks --- .../mastering_loops/NumberUtilities.java | 10 +++++++- .../mastering_loops/TriangleUtilities.java | 24 ++++++++++++++++--- 2 files changed, 30 insertions(+), 4 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..7fc5aae 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -2,8 +2,16 @@ public class NumberUtilities { + public static String getEvenNumbers(int start, int stop) { - return null; + StringBuilder evens = new StringBuilder(); + for (int i = start; i Date: Thu, 8 Feb 2018 20:26:57 -0500 Subject: [PATCH 4/5] just have to do tables i'll let you know when that's done tsm --- .../mastering_loops/NumberUtilities.java | 30 ++++++++++++++++--- .../mastering_loops/NumberUtilitiesTest.java | 2 +- 2 files changed, 27 insertions(+), 5 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 7fc5aae..afb6736 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -16,21 +16,43 @@ public static String getEvenNumbers(int start, int stop) { public static String getOddNumbers(int start, int stop) { - return null; + StringBuilder odds = new StringBuilder(); + for (int i = start; i Date: Thu, 8 Feb 2018 20:58:17 -0500 Subject: [PATCH 5/5] FINALLLLLLLLLLLLL --- .../mastering_loops/TableUtilities.java | 22 ++++++++++++++++--- 1 file changed, 19 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 88962e7..2f8efc9 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -14,7 +14,6 @@ public static String getSmallMultiplicationTable() { myTable += " " + checkSpace + " | "; } - } myTable += "\n"; } @@ -23,10 +22,27 @@ public static String getSmallMultiplicationTable() { } public static String getLargeMultiplicationTable() { - return null; + StringBuilder getLarge = new StringBuilder(); + for (int row=1; row <11 ; row++){ + for (int col=1; col<11; col++){ + getLarge.append(col*row + " | "); + } + getLarge.append("\n"); + + } + + return getLarge.toString(); } public static String getMultiplicationTable(int tableSize) { - return null; + StringBuilder getMult = new StringBuilder(); + for (int row = 1; row <= tableSize; row++){ + for (int col = 1; col <= tableSize; col++){ + getMult.append(row * col + " | "); + } + getMult.append("\n"); + } + + return getMult.toString(); } }