diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java index 29e339b..08ada4a 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java @@ -5,7 +5,11 @@ /** * Created by leon on 1/31/18. */ + +// saved public class MainApp { public static void main(String[] args) { + + } } 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..4f03aff 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,73 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += 2) { + myString.append(i); + } + + return myString.toString(); + + } public static String getOddNumbers(int start, int stop) { - return null; + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += 2) { + myString.append(i); + } + + return myString.toString(); + } public static String getSquareNumbers(int start, int stop, int step) { - return null; + + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += step) { + myString.append(i * i); + + } + + return myString.toString(); + } public static String getRange(int start, int stop, int step) { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = start; i < stop; i += step) { + myString.append(i); + } + + return myString.toString(); } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + + StringBuilder myString = new StringBuilder(); + + + for (int i = start; i < stop; i += step) { + myString.append((long)(Math.pow(i, 2))); + + } + + return myString.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..aa4ed1c 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,63 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i < 6; i++) { + + for (int j = 1; j < 6; j++) { + + myString.append(String.format("%3d |", i * j)); + + + } + + myString.append("\n"); + + } + + return myString.toString(); + } public static String getLargeMultiplicationTable() { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i < 11; i++) { + + for (int j = 1; j < 11; j++) { + + myString.append(String.format("%3d |", i*j)); + + } + + myString.append("\n"); + + } + + return myString.toString(); + } public static String getMultiplicationTable(int tableSize) { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i <= tableSize; i++) { + + for (int j = 1; j <= tableSize; j++) { + + myString.append(String.format("%3d |", i*j)); + + } + + myString.append("\n"); + + } + + return myString.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..28ab9e0 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,65 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 1; i < numberOfRows; i++) { + + for (int j = 0; j < i; j++) { + myString.append("*"); + + } + myString.append("\n"); + } + + return myString.toString(); } public static String getRow(int numberOfStars) { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 0; i < numberOfStars; i++) { + myString.append("*"); + } + + return myString.toString(); + } public static String getSmallTriangle() { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 0; i <= 3; i++) { + + for (int j = 0; j < i; j++) { + myString.append("*"); + + } + myString.append("*\n"); + + } + + return myString.toString(); } public static String getLargeTriangle() { - return null; + + StringBuilder myString = new StringBuilder(); + + for (int i = 0; i <= 8; i++) { + + for (int j = 0; j < i; j++) { + myString.append("*"); + } + + myString.append("*\n"); + + } + + return myString.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..2feade3 100644 --- a/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java +++ b/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java @@ -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;