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..afb6736 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -2,27 +2,57 @@ public class NumberUtilities { + public static String getEvenNumbers(int start, int stop) { - return null; + StringBuilder evens = new StringBuilder(); + for (int i = start; i = 10){ + myTable += " " + checkSpace + " | "; + } + + } + myTable += "\n"; + } + + return myTable; } 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(); } } 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..cc58fb2 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,49 @@ 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() { - return null; + StringBuilder smallTri = new StringBuilder(); + for (int i = 1; i < 5; i++) { + for (int j = 0; j < i; j++) { + smallTri.append("*"); + } + smallTri.append("\n"); + } + + return smallTri.toString(); } public static String getLargeTriangle() { - return null; + + StringBuilder largeTri = new StringBuilder(); + for (int i = 1; i < 10; i++) { + for (int j = 0; j < i; j++) { + largeTri.append("*"); + } + largeTri.append("\n"); + } + + return largeTri.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..1a11f36 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,10 +65,10 @@ public void testGetEvenNumbers() { @Test public void testGetOddNumbers() { // : Given - String expected = "681012141618"; + String expected = "5791113151719"; int start = 5; int stop = 20; - int step = 5; + // : When String actual = NumberUtilities.getOddNumbers(start, stop);