diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..93f8eca 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..350ac9a 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,38 @@ public class NumberUtilities { + public static String getEvenNumbers(int start, int stop) { - return null; + if(start%2 != 0) start += 1; + return getRange(start,stop,2); } - public static String getOddNumbers(int start, int stop) { - return null; + if(start %2 == 0) start += 1; + return getRange(start,stop,2); } - public static String getSquareNumbers(int start, int stop, int step) { - return null; + StringBuilder square = new StringBuilder(); + for(int i = start; i < stop; i+=step) square.append(i*i); + return square.toString(); } - public static String getRange(int start, int stop, int step) { - return null; + StringBuilder xEach = new StringBuilder(); + for(int i = start; i < stop; i+=step) xEach.append(i); + return xEach.toString(); } - public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + StringBuilder expo = new StringBuilder(); + for(int i = start; i< stop; i+=step){ + expo.append((int)(Math.pow(i, exponent))); + } + return expo.toString(); + } + + public static void main(String[] args){ + } } 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..1d02125 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,23 @@ package io.zipcoder.microlabs.mastering_loops; 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 size = new StringBuilder(); + for(int i = 1; i <= tableSize; i++) { + for (int j = 1; j <= tableSize; j++) { + size.append(String.format("%3d |", j*i)); + } + size.append("\n"); + } + return size.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..23e1ac8 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -2,19 +2,31 @@ public class TriangleUtilities { - public static String getTriangle(int numberOfRows) { - return null; - } public static String getRow(int numberOfStars) { - return null; + StringBuilder aster = new StringBuilder(); + int counter = 0; + while(counter < numberOfStars) { + aster.append("*"); + counter++; + } + return aster.toString(); + } + + public static String getTriangle(int numberOfRows) { + StringBuilder builder = new StringBuilder(); + for(int i = 1; i<=numberOfRows; i++){ + builder.append(getRow(i)) + .append("\n"); + } + return builder.toString(); } public static String getSmallTriangle() { - return null; + return getTriangle(4); } public static String getLargeTriangle() { - return null; + return getTriangle(9); } } 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; diff --git a/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java b/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java index 47846c2..3f7d7cb 100644 --- a/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java +++ b/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java @@ -18,7 +18,7 @@ public void getRow() { @Test public void getTriangleTest1() { String expected = - "*\n" + + "*\n" + "**\n" + "***\n" + "****\n" + @@ -26,7 +26,8 @@ public void getTriangleTest1() { "******\n" + "*******\n" + "********\n" + - "*********\n"; + "*********\n" + + "**********\n"; String actual = TriangleUtilities.getTriangle(10); Assert.assertEquals(expected, actual); } @@ -34,10 +35,11 @@ public void getTriangleTest1() { @Test public void getTriangleTest2() { String expected = - "*\n" + + "*\n" + "**\n" + "***\n" + - "****\n"; + "****\n" + + "*****\n"; String actual = TriangleUtilities.getTriangle(5); Assert.assertEquals(expected, actual); }