diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..f0a9209 Binary files /dev/null and b/.DS_Store differ 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..ebe19c5 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -1,28 +1,55 @@ package io.zipcoder.microlabs.mastering_loops; + + public class NumberUtilities { + + public static String getEvenNumbers(int start, int stop) { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = start; i < stop; i+=2){ + myRange.append(i); + } + return myRange.toString(); + } public static String getOddNumbers(int start, int stop) { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = start; i < stop; i+=2){ + myRange.append(i); + } + return myRange.toString(); } public static String getSquareNumbers(int start, int stop, int step) { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = start; i < stop; i+=step){ + myRange.append((long)(Math.pow(i,2))); + } + return myRange.toString(); } public static String getRange(int start, int stop, int step) { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = start; i < stop; i+=step){ + myRange.append(i); + } + return myRange.toString(); + + } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = start; i < stop; i+=step){ + myRange.append((long)(Math.pow(i, exponent))); + } + return myRange.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..a0c3f22 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -1,15 +1,54 @@ package io.zipcoder.microlabs.mastering_loops; + + +@SuppressWarnings("ALL") public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + StringBuilder myRange = new StringBuilder(); + + for (int i = 1; i <=5; i++){ + for (int n = 1; n <= 5; n++) { + + myRange.append(String.format("%3d |", n * i)); + } + myRange.append("\n"); + } + + return myRange.toString(); } + + public static String getLargeMultiplicationTable() { - return null; + StringBuilder myRange = new StringBuilder(); + + for (int i = 1; i <=10; i++){ + for (int n = 1; n <= 10; n++) { + + myRange.append(String.format("%3d |", n * i)); + + } + myRange.append("\n"); + + } + + return myRange.toString(); } public static String getMultiplicationTable(int tableSize) { - return null; + StringBuilder myRange = new StringBuilder(); + + for (int i = 1; i <= tableSize; i++){ + for (int n = 1; n <= tableSize; n++) { + + myRange.append(String.format("%3d |", n * i)); + + } + myRange.append("\n"); + + } + + return myRange.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..2e815a7 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,44 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = 1; i < numberOfRows; i++){ + for (int n = 1; n <= i; n++) { + myRange.append("*"); + } + myRange.append("\n"); + } + return myRange.toString(); } public static String getRow(int numberOfStars) { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = 0; i < numberOfStars; i++){ + myRange.append("*"); + } + return myRange.toString(); + } public static String getSmallTriangle() { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = 1; i <= 4; i++){ + for (int n = 1; n <= i; n++) { + myRange.append("*"); + } + myRange.append("\n"); + } + return myRange.toString(); } public static String getLargeTriangle() { - return null; + StringBuilder myRange = new StringBuilder(); + for (int i = 1; i < 10; i++){ + for (int n = 1; n <= i; n++) { + myRange.append("*"); + } + myRange.append("\n"); + } + return myRange.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..2793098 100644 --- a/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java +++ b/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java @@ -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);