finished tables and triangles and refactored numbers

src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java

@@ -7,5 +7,8 @@ import java.util.Scanner;
  */
 public class MainApp {
     public static void main(String[] args) {
+        TriangleUtilities.getRow(10);
+        TriangleUtilities.getSmallTriangle();
+        TableUtilities.getSmallMultiplicationTable();
     }
 }

src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java

@@ -2,125 +2,72 @@ package io.zipcoder.microlabs.mastering_loops;
 
 public class NumberUtilities {
     public static String getEvenNumbers(int start, int stop) {
-        int i = 0;
-        int j = start;
-        StringBuilder builder = new StringBuilder();
-
-        while(j < stop) {
-            if(j % 2 == 0)
-            {
-                builder.append(j);
-                j+=2;
-                i++;
-            }
-            else
-            {
-                j++;
-            }
-        }
-
-        return builder.toString();
+        return getNumberSequence(start, stop, true);
     }
 
-
     public static String getOddNumbers(int start, int stop) {
-        int i = 0;
-        int j = start;
-        StringBuilder builder = new StringBuilder();
-
-        while(j < stop)
-        {
-            if(j % 2 != 0)
-            {
-                builder.append(j);
-                j+=2;
-                i++;
-            }
-            else
-            {
-                j++;
-            }
-        }
-
-        return builder.toString();
+        return getNumberSequence(start, stop, false);
     }
 
     public static String getSquareNumbers(int start, int stop) {
-        int i = start;
-        StringBuilder builder = new StringBuilder();
-
-        while(i < stop)
-        {
-            builder.append(i * i);
-            i++;
-        }
-
-        return builder.toString();
+        return getSquareNumbers(start, stop, 1);
     }
 
-
     public static String getSquareNumbers(int start, int stop, int step) {
-        int i = start;
-        StringBuilder builder = new StringBuilder();
-
-        while(i < stop)
-        {
-            builder.append(i * i);
-            i += step;
-        }
-
-        return builder.toString();
+        return getExponentiations(start, stop, step, 2);
     }
 
     public static String getRange(int stop) {
-        int i = 0;
-        StringBuilder builder = new StringBuilder();
-
-        while(i < stop)
-        {
-            builder.append(i);
-            i++;
-        }
-
-        return builder.toString();
+        return getRange(0, stop, 1);
     }
 
     public static String getRange(int start, int stop) {
+        return getRange(start, stop, 1);
+    }
+
+    public static String getRange(int start, int stop, int step) {
         int i = start;
         StringBuilder builder = new StringBuilder();
 
         while(i < stop)
         {
             builder.append(i);
-            i++;
+            i += step;
         }
 
         return builder.toString();
     }
 
-
-    public static String getRange(int start, int stop, int step) {
+    public static String getExponentiations(int start, int stop, int step, int exponent) {
         int i = start;
         StringBuilder builder = new StringBuilder();
 
         while(i < stop)
         {
-            builder.append(i);
-            i+=step;
+            builder.append((int)Math.pow(i, exponent));
+            i += step;
         }
 
         return builder.toString();
     }
 
-
-    public static String getExponentiations(int start, int stop, int step, int exponent) {
-        int i = start;
+    private static String getNumberSequence(int start, int stop, boolean isEven) {
+        int i = 0;
+        int j = start;
         StringBuilder builder = new StringBuilder();
 
-        while(i < stop)
+        while(j < stop)
         {
-            builder.append((int)Math.pow(i, exponent));
-            i += step;
+            if((isEven && j % 2 == 0) || (!isEven && j % 2 != 0))
+            {
+                builder.append(j);
+                j+=2;
+                i++;
+            }
+            else
+            {
+                j++;
+            }
         }
 
         return builder.toString();

src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java

@@ -2,14 +2,40 @@ package io.zipcoder.microlabs.mastering_loops;
 
 public class TableUtilities {
     public static String getSmallMultiplicationTable() {
-        return null;
+        return getMultiplicationTable(4);
     }
 
     public static String getLargeMultiplicationTable() {
-        return null;
+        return getMultiplicationTable(9);
     }
 
     public static String getMultiplicationTable(int tableSize) {
-        return null;
+        int rowNumber = 1;
+        int columnNumber = 1;
+        StringBuilder builder = new StringBuilder();
+
+        while (rowNumber <= tableSize)
+        {
+            while (columnNumber <= tableSize)
+            {
+                int product = rowNumber * columnNumber;
+                if (product < 10)
+                {
+                    builder.append("  " + product + " |");
+                }
+                else if(product < 100)
+                {
+                    builder.append(" " + product + " |");
+                }
+                else {
+                    builder.append(product + " |");
+                }
+                columnNumber++;
+            }
+            columnNumber = 1;
+            rowNumber++;
+            builder.append('\n');
+        }
+        return builder.toString();
     }
 }

src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java

@@ -2,19 +2,38 @@ package io.zipcoder.microlabs.mastering_loops;
 
 public class TriangleUtilities {
 
-    public static String getTriangle(int numberOfRows) {
-        return null;
+    public static String getSmallTriangle() {
+        return getTriangle(4);
     }
 
-    public static String getRow(int numberOfStars) {
-        return null;
+    public static String getLargeTriangle() {
+        return getTriangle(10);
     }
 
-    public static String getSmallTriangle() {
-        return null;
+    public static String getTriangle(int numberOfRows) {
+        int rowNumber = 1;
+        StringBuilder builder = new StringBuilder();
+
+        while (rowNumber <= numberOfRows)
+        {
+            builder.append(getRow(rowNumber));
+            rowNumber++;
+            builder.append('\n');
+        }
+
+        return builder.toString();
     }
 
-    public static String getLargeTriangle() {
-        return null;
+    public static String getRow(int numberOfStars) {
+        int i = 0;
+        StringBuilder builder = new StringBuilder();
+
+        while(i < numberOfStars)
+        {
+            builder.append('*');
+            i++;
+        }
+
+        return builder.toString();
     }
 }

src/test/java/io/zipcoder/microlabs/mastering_loops/TableUtilitiesTest.java

@@ -10,16 +10,15 @@ public class TableUtilitiesTest {
     @Test
     public void testGetLargeMultiplicationTable() {
         String expected =
-                "  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 | 10 |\n" +
-                "  2 |  4 |  6 |  8 | 10 | 12 | 14 | 16 | 18 | 20 |\n" +
-                "  3 |  6 |  9 | 12 | 15 | 18 | 21 | 24 | 27 | 30 |\n" +
-                "  4 |  8 | 12 | 16 | 20 | 24 | 28 | 32 | 36 | 40 |\n" +
-                "  5 | 10 | 15 | 20 | 25 | 30 | 35 | 40 | 45 | 50 |\n" +
-                "  6 | 12 | 18 | 24 | 30 | 36 | 42 | 48 | 54 | 60 |\n" +
-                "  7 | 14 | 21 | 28 | 35 | 42 | 49 | 56 | 63 | 70 |\n" +
-                "  8 | 16 | 24 | 32 | 40 | 48 | 56 | 64 | 72 | 80 |\n" +
-                "  9 | 18 | 27 | 36 | 45 | 54 | 63 | 72 | 81 | 90 |\n" +
-                " 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 |100 |\n";
+                "  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |\n" +
+                "  2 |  4 |  6 |  8 | 10 | 12 | 14 | 16 | 18 |\n" +
+                "  3 |  6 |  9 | 12 | 15 | 18 | 21 | 24 | 27 |\n" +
+                "  4 |  8 | 12 | 16 | 20 | 24 | 28 | 32 | 36 |\n" +
+                "  5 | 10 | 15 | 20 | 25 | 30 | 35 | 40 | 45 |\n" +
+                "  6 | 12 | 18 | 24 | 30 | 36 | 42 | 48 | 54 |\n" +
+                "  7 | 14 | 21 | 28 | 35 | 42 | 49 | 56 | 63 |\n" +
+                "  8 | 16 | 24 | 32 | 40 | 48 | 56 | 64 | 72 |\n" +
+                "  9 | 18 | 27 | 36 | 45 | 54 | 63 | 72 | 81 |\n";
 
         String actual = TableUtilities.getLargeMultiplicationTable();
         Assert.assertEquals(expected, actual);
@@ -29,11 +28,10 @@ public class TableUtilitiesTest {
     @Test
     public void testGetSmallMultiplicationTable() {
         String expected =
-                        "  1 |  2 |  3 |  4 |  5 |\n" +
-                        "  2 |  4 |  6 |  8 | 10 |\n" +
-                        "  3 |  6 |  9 | 12 | 15 |\n" +
-                        "  4 |  8 | 12 | 16 | 20 |\n" +
-                        "  5 | 10 | 15 | 20 | 25 |\n";
+                        "  1 |  2 |  3 |  4 |\n" +
+                        "  2 |  4 |  6 |  8 |\n" +
+                        "  3 |  6 |  9 | 12 |\n" +
+                        "  4 |  8 | 12 | 16 |\n";
 
         String actual = TableUtilities.getSmallMultiplicationTable();
         Assert.assertEquals(expected, actual);

src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java

@@ -26,7 +26,8 @@ public class TriangleUtilitiesTest {
                         "******\n" +
                         "*******\n" +
                         "********\n" +
-                        "*********\n";
+                        "*********\n" +
+                        "**********\n";;
         String actual = TriangleUtilities.getTriangle(10);
         Assert.assertEquals(expected, actual);
     }
@@ -37,7 +38,8 @@ public class TriangleUtilitiesTest {
                 "*\n" +
                         "**\n" +
                         "***\n" +
-                        "****\n";
+                        "****\n" +
+                        "*****\n";
         String actual = TriangleUtilities.getTriangle(5);
         Assert.assertEquals(expected, actual);
     }
@@ -53,7 +55,8 @@ public class TriangleUtilitiesTest {
                 "******\n" +
                 "*******\n" +
                 "********\n" +
-                "*********\n";
+                "*********\n" +
+                "**********\n";
         String actual = TriangleUtilities.getLargeTriangle();
         Assert.assertEquals(expected, actual);
     }