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/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(); } -} + } + 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..523e3dc 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 = 1; i < numberOfRows; i++){ + for(int j = 0; j < i;j++){ + output += "*"; + + } + + output += "\n"; + + } + + return output; + + + } 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 = 1; i <= 4; i++){ + for(int j = 0; j < i;j++){ + output += "*"; + + } + + output += "\n"; + + } + + return output; + } public static String getLargeTriangle() { - return null; + String output =""; + for(int i = 1; i < 10; i++){ + for(int j = 0; j < i;j++){ + output += "*"; + + } + + output += "\n"; + + } + + return output; + + } } + + + 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;