From 4b351b37c2f2a1883fe8d166dc23fe0e263b1de3 Mon Sep 17 00:00:00 2001 From: Madeline Bowe Date: Wed, 7 Feb 2018 19:44:35 -0500 Subject: [PATCH 1/2] First Commit --- .../mastering_loops/NumberUtilities.java | 47 ++++++++++++++++-- .../mastering_loops/TableUtilities.java | 48 +++++++++++++++++-- .../mastering_loops/TriangleUtilities.java | 37 ++++++++++++-- .../mastering_loops/NumberUtilitiesTest.java | 4 +- 4 files changed, 122 insertions(+), 14 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..35ac2c0 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,63 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + StringBuilder sb = new StringBuilder(); + for (int i = start; i < stop; i++) { + if (i % 2 == 0) { + sb.append(i).toString(); + } + } + return sb.toString(); } public static String getOddNumbers(int start, int stop) { - return null; + StringBuilder sb = new StringBuilder(); + for (int i = start; i < stop; i++) { + if (i % 2 != 0) { + sb.append(i).toString(); + } + } + return sb.toString(); } public static String getSquareNumbers(int start, int stop, int step) { - return null; + + StringBuilder sb = new StringBuilder(); + + for (int i = start; i < stop; i += step) { + sb.append((int) Math.pow(i, 2)); + } + + return sb.toString(); + + } public static String getRange(int start, int stop, int step) { - return null; + + StringBuilder sb = new StringBuilder(); + + for (int i = start; i < stop; i += step) { + sb.append(i).toString(); + } + + return sb.toString(); + } + public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + StringBuilder sb = new StringBuilder(); + + for (int i = start; i < stop; i += step) { + sb.append((int) Math.pow(i, exponent)); + } + + return sb.toString(); + } } 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..7c92000 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,56 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + + StringBuilder builder = new StringBuilder(); + + for (int row = 1; row <= 5; row++) { + for(int col = 1; col <=5; col++) { + int table = row * col; + builder.append(String.format("%3d |", table)); + + } + + builder.append("\n"); + + } + + return builder.toString(); } public static String getLargeMultiplicationTable() { - return null; + + StringBuilder builder = new StringBuilder(); + + for (int row = 1; row <= 10; row++) { + for(int col = 1; col <=10; col++) { + int table = row * col; + builder.append(String.format("%3d |", table)); + + } + + builder.append("\n"); + + } + + return builder.toString(); } public static String getMultiplicationTable(int tableSize) { - return null; + + StringBuilder builder = new StringBuilder(); + + for (int row = 1; row <= tableSize; row++) { + for(int col = 1; col <= tableSize; col++) { + int table = row * col; + builder.append(String.format("%3d |", table)); + + } + + builder.append("\n"); + + } + + return builder.toString(); } } 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..25d4f5b 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,47 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + StringBuilder builder = new StringBuilder(); + for (int row = 1; row < numberOfRows; row++) { + for (int col = 0; col < row; col++) { + builder.append("*"); + } + builder.append("\n"); + } + + return builder.toString(); + } public static String getRow(int numberOfStars) { - return null; + String asterisk = ""; + for (int i = 0; i < numberOfStars; i++) { + asterisk += "*"; + } + return asterisk; } public static String getSmallTriangle() { - return null; + StringBuilder builder = new StringBuilder(); + for (int row = 1; row <= 4; row++) { + for (int col = 0; col < row; col++) { + builder.append("*"); + } + builder.append("\n"); + } + + return builder.toString(); } public static String getLargeTriangle() { - return null; + StringBuilder builder = new StringBuilder(); + for (int row = 1; row <= 9; row++) { + for (int col = 0; col < row; col++) { + builder.append("*"); + } + builder.append("\n"); + } + + return builder.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 ecb1913733e3fa876c45bc688a5bd42ea611c0cb Mon Sep 17 00:00:00 2001 From: mbowe4 Date: Wed, 7 Feb 2018 21:02:14 -0500 Subject: [PATCH 2/2] Cleaned up code --- .../mastering_loops/TriangleUtilities.java | 39 +++++-------------- .../TriangleUtilitiesTest.java | 4 +- 2 files changed, 12 insertions(+), 31 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 25d4f5b..0aa8f96 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -4,46 +4,27 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { StringBuilder builder = new StringBuilder(); - for (int row = 1; row < numberOfRows; row++) { - for (int col = 0; col < row; col++) { - builder.append("*"); - } - builder.append("\n"); + for (int row = 0; row < numberOfRows; row++) { + builder.append(getRow(row)); } - return builder.toString(); - } public static String getRow(int numberOfStars) { - String asterisk = ""; - for (int i = 0; i < numberOfStars; i++) { - asterisk += "*"; + StringBuilder builder = new StringBuilder(); + + for (int i = 0; i <= numberOfStars; i++) { + builder.append("*"); } - return asterisk; + builder.append("\n"); + return builder.toString(); } public static String getSmallTriangle() { - StringBuilder builder = new StringBuilder(); - for (int row = 1; row <= 4; row++) { - for (int col = 0; col < row; col++) { - builder.append("*"); - } - builder.append("\n"); - } - - return builder.toString(); + return getTriangle(4); } public static String getLargeTriangle() { - StringBuilder builder = new StringBuilder(); - for (int row = 1; row <= 9; row++) { - for (int col = 0; col < row; col++) { - builder.append("*"); - } - builder.append("\n"); - } - - return builder.toString(); + return getTriangle(9); } } diff --git a/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java b/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java index 47846c2..7633a52 100644 --- a/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java +++ b/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java @@ -18,7 +18,7 @@ public void getRow() { @Test public void getTriangleTest1() { String expected = - "*\n" + + "*\n" + "**\n" + "***\n" + "****\n" + @@ -27,7 +27,7 @@ public void getTriangleTest1() { "*******\n" + "********\n" + "*********\n"; - String actual = TriangleUtilities.getTriangle(10); + String actual = TriangleUtilities.getTriangle(9); Assert.assertEquals(expected, actual); }