From c8bc860b4d204cba2ad353c5f0dfc69d8148c8a4 Mon Sep 17 00:00:00 2001
From: Kaitrina High <kaitrinahigh@zipcoders-MacBook-Pro-3.local>
Date: Wed, 7 Feb 2018 23:32:04 -0500
Subject: [PATCH 1/2] Loop d Loop

---
 .../mastering_loops/NumberUtilities.java      | 46 ++++++++++++++++---
 .../mastering_loops/TableUtilities.java       | 33 +++++++++++--
 .../mastering_loops/TriangleUtilities.java    | 44 ++++++++++++++++--
 .../mastering_loops/NumberUtilitiesTest.java  |  5 +-
 4 files changed, 112 insertions(+), 16 deletions(-)

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..6b4760b 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,62 @@
 package io.zipcoder.microlabs.mastering_loops;
-
+import java.lang.*;
 
 public class NumberUtilities {
     public static String getEvenNumbers(int start, int stop) {
-        return null;
+
+
+        StringBuilder evenNum = new StringBuilder();
+        for (int i = start; i < stop; i++) {
+            if (i % 2 == 0) {
+                evenNum.append(i);
+            }
+        }
+        return evenNum.toString();
     }
 
 
     public static String getOddNumbers(int start, int stop) {
-        return null;
+
+        StringBuilder oddNum = new StringBuilder();
+        for (int i = start; i <= stop; i++) {
+            if (i % 2 != 0) {
+                oddNum.append(i);
+            }
+        }
+        return oddNum.toString();
     }
 
 
     public static String getSquareNumbers(int start, int stop, int step) {
-        return null;
+
+        StringBuilder sqNum = new StringBuilder();
+
+        for (int i = start; i < stop; i+=step) {
+            sqNum.append(Math.round(Math.pow(i, 2)));
+        }
+        return sqNum.toString();
     }
 
 
     public static String getRange(int start, int stop, int step) {
-        return null;
+
+        StringBuilder rangeNum = new StringBuilder();
+
+        for (int i = start; i < stop; i+=step) {
+            rangeNum.append(i);
+        }
+        return rangeNum.toString();
+
     }
 
 
     public static String getExponentiations(int start, int stop, int step, int exponent) {
-        return null;
+
+        StringBuilder exponentNum = new StringBuilder();
+
+        for (int i = start; i < stop; i+=step) {
+            exponentNum.append(Math.round(Math.pow(i, exponent)));
+        }
+        return exponentNum.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..0d93cb4 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,41 @@
 
 public class TableUtilities {
     public static String getSmallMultiplicationTable() {
-        return null;
+
+        StringBuilder matrix = new StringBuilder();
+
+        for(int row = 1; row <= 5; row++) {
+            for(int col = 1; col <= 5; col++){
+                matrix.append(String.format("%3d |", row * col));
+            }
+            matrix.append("\n");
+        }
+        return matrix.toString();
     }
 
     public static String getLargeMultiplicationTable() {
-        return null;
+        StringBuilder matrix = new StringBuilder();
+
+        for(int row = 1; row <= 10; row++) {
+            for(int col = 1; col <= 10; col++){
+                matrix.append(String.format("%3d |", row * col));
+            }
+            matrix.append("\n");
+        }
+        return matrix.toString();
     }
 
     public static String getMultiplicationTable(int tableSize) {
-        return null;
+        StringBuilder matrix = new StringBuilder();
+
+        for(int row = 1; row <= tableSize; row++) {
+            for(int col = 1; col <= tableSize; col++){
+                matrix.append(String.format("%3d |", row * col));
+            }
+            matrix.append("\n");
+        }
+        return matrix.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..5f961b8 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,54 @@
 public class TriangleUtilities {
 
     public static String getTriangle(int numberOfRows) {
-        return null;
+
+        String triangleContainer = "";
+        for (int row=1; row < numberOfRows; row++)
+        {
+            for (int column=0; column<row; column++)
+            {
+               triangleContainer += "*";
+            }
+            triangleContainer += "\n";
+        }
+        return triangleContainer;
     }
 
     public static String getRow(int numberOfStars) {
-        return null;
+
+        String triangleContainer = "";
+        for (int row=0; row < 20; row++)
+        {
+            triangleContainer += "*";
+        }
+        return triangleContainer;
     }
 
     public static String getSmallTriangle() {
-        return null;
+
+        String triangleContainer = "";
+        for (int row=1; row < 5; row++)
+        {
+            for (int column=0; column<row; column++)
+            {
+                triangleContainer += "*";
+            }
+            triangleContainer += "\n";
+        }
+        return triangleContainer;
     }
 
     public static String getLargeTriangle() {
-        return null;
+
+        String triangleContainer = "";
+        for (int row=1; row < 10; row++)
+        {
+            for (int column=0; column<row; column++)
+            {
+                triangleContainer += "*";
+            }
+            triangleContainer += "\n";
+        }
+        return triangleContainer;
     }
 }
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..4f5fb24 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,10 +65,9 @@ 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);

From 250f459bcaa69218b374697709e00244079d521b Mon Sep 17 00:00:00 2001
From: Kaitrina High <kaitrinahigh@zipcoders-MacBook-Pro-3.local>
Date: Wed, 7 Feb 2018 23:51:16 -0500
Subject: [PATCH 2/2] Deleted code block, utilized functions

---
 .../mastering_loops/TableUtilities.java       | 20 +++-----------
 .../mastering_loops/TriangleUtilities.java    | 26 ++++---------------
 2 files changed, 8 insertions(+), 38 deletions(-)

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 0d93cb4..34c2a09 100644
--- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java
+++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java
@@ -1,29 +1,15 @@
 package io.zipcoder.microlabs.mastering_loops;
 
 public class TableUtilities {
-    public static String getSmallMultiplicationTable() {
 
-        StringBuilder matrix = new StringBuilder();
+    public static String getSmallMultiplicationTable() {
 
-        for(int row = 1; row <= 5; row++) {
-            for(int col = 1; col <= 5; col++){
-                matrix.append(String.format("%3d |", row * col));
-            }
-            matrix.append("\n");
-        }
-        return matrix.toString();
+        return getMultiplicationTable(5);
     }
 
     public static String getLargeMultiplicationTable() {
-        StringBuilder matrix = new StringBuilder();
 
-        for(int row = 1; row <= 10; row++) {
-            for(int col = 1; col <= 10; col++){
-                matrix.append(String.format("%3d |", row * col));
-            }
-            matrix.append("\n");
-        }
-        return matrix.toString();
+        return getMultiplicationTable(10);
     }
 
     public static String getMultiplicationTable(int tableSize) {
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 5f961b8..97dbc3b 100644
--- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java
+++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java
@@ -5,6 +5,7 @@ public class TriangleUtilities {
     public static String getTriangle(int numberOfRows) {
 
         String triangleContainer = "";
+
         for (int row=1; row < numberOfRows; row++)
         {
             for (int column=0; column<row; column++)
@@ -19,7 +20,8 @@ public static String getTriangle(int numberOfRows) {
     public static String getRow(int numberOfStars) {
 
         String triangleContainer = "";
-        for (int row=0; row < 20; row++)
+
+        for (int row=0; row < numberOfStars; row++)
         {
             triangleContainer += "*";
         }
@@ -28,29 +30,11 @@ public static String getRow(int numberOfStars) {
 
     public static String getSmallTriangle() {
 
-        String triangleContainer = "";
-        for (int row=1; row < 5; row++)
-        {
-            for (int column=0; column<row; column++)
-            {
-                triangleContainer += "*";
-            }
-            triangleContainer += "\n";
-        }
-        return triangleContainer;
+        return getTriangle(5);
     }
 
     public static String getLargeTriangle() {
 
-        String triangleContainer = "";
-        for (int row=1; row < 10; row++)
-        {
-            for (int column=0; column<row; column++)
-            {
-                triangleContainer += "*";
-            }
-            triangleContainer += "\n";
-        }
-        return triangleContainer;
+        return getTriangle(10);
     }
 }