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..18c9e55 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,88 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + + StringBuilder even = new StringBuilder(); + + + if (start %2 != 0){ + + start += 1; + + } + + for (int i = start; i < stop; i += 2){ + + even.append(i); + } + + return even.toString(); } public static String getOddNumbers(int start, int stop) { - return null; + + StringBuilder odd = new StringBuilder(); + + if (start %2 == 0){ + + start -= 1; + + } + + for (int i = start; i < stop; i += 2){ + + odd.append(i); + } + + return odd.toString(); } public static String getSquareNumbers(int start, int stop, int step) { - return null; + + StringBuilder square = new StringBuilder(); + + for (int i = start; i < stop; i += step) { + + int sqrRoot = (int) Math.pow(i,2); + square.append(sqrRoot); + } + + return square.toString(); + } public static String getRange(int start, int stop, int step) { - return null; + + StringBuilder range = new StringBuilder(); + + for (int i = start; i < stop; i += step){ + + range.append(i); + } + + return range.toString(); + } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + + StringBuilder expon = new StringBuilder(); + + for (int i = start; i < stop; i += step){ + + int exponVar = exponent; + + int startExpon = (int) Math.pow(i, exponVar); + + expon.append(startExpon); + + } + + return expon.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..0fdb5e6 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,30 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + + return getMultiplicationTable(5); } public static String getLargeMultiplicationTable() { - return null; + + return getMultiplicationTable(10); } public static String getMultiplicationTable(int tableSize) { - return null; + + StringBuilder getSmol = new StringBuilder(); + + for (int r = 1; r <= tableSize; r++){ + + for(int c = 1; c <= tableSize; c++){ + + getSmol.append(String.format("%3d |", r*c)); + + } + + getSmol.append("\n"); + } + + return getSmol.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..49ab5e4 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,35 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + + String result = ""; + + for (int iteration = 1; iteration < numberOfRows; iteration++) { + result += getRow(iteration) + "\n"; + } + + return result; } public static String getRow(int numberOfStars) { - return null; + + String getRow = ""; + + for (int row = 0; row < numberOfStars; row++) { + + getRow += "*"; + } + + return getRow; + } public static String getSmallTriangle() { - return null; + return getTriangle(5); } public static String getLargeTriangle() { - return null; + + return getTriangle(10); } } 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;