From cb3fdd185a3d2fb7c44db540450fcf05cae5d624 Mon Sep 17 00:00:00 2001
From: Carolynn Vansant <cvansant@MacBook-Pro-5.fios-router.home>
Date: Wed, 7 Feb 2018 22:13:08 -0500
Subject: [PATCH 1/4] first commit

---
 .../mastering_loops/NumberUtilities.java      | 39 ++++++++++++++++---
 .../mastering_loops/TriangleUtilities.java    | 38 ++++++++++++++++--
 .../mastering_loops/NumberUtilitiesTest.java  |  4 +-
 3 files changed, 70 insertions(+), 11 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..62db795 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,56 @@
 
 
 public class NumberUtilities {
+
     public static String getEvenNumbers(int start, int stop) {
-        return null;
+        String evens = "";
+        int count = start;
+        if((count / 2) != 0) {
+            count += 1;
+        }
+        for(int i = count; i < stop; i+=2) {
+            evens = evens + i;
+        }
+        return evens;
     }
 
 
     public static String getOddNumbers(int start, int stop) {
-        return null;
+        String odds = "";
+        int count = start;
+        if((count / 2) == 0) {
+            count += 1;
+        }
+        for(int i = count; i < stop; i+=2) {
+            odds += i;
+        }
+        return odds;
     }
 
 
     public static String getSquareNumbers(int start, int stop, int step) {
-        return null;
+        String square = "";
+        for(int i = start; i < stop; i+=step) {
+            square += (i*i);
+        }
+        return square;
     }
 
 
     public static String getRange(int start, int stop, int step) {
-        return null;
+        String xEach = "";
+        for(int i = start; i < stop; i+=step){
+            xEach += i;
+        }
+        return xEach;
     }
 
 
     public static String getExponentiations(int start, int stop, int step, int exponent) {
-        return null;
+        String expo = "";
+        for(int i = start; i< stop; i+=step){
+            expo += (int)(Math.pow(i, exponent));
+        }
+        return expo;
     }
 }
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..87df420 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,48 @@
 public class TriangleUtilities {
 
     public static String getTriangle(int numberOfRows) {
-        return null;
+        int counter = 1;
+        String aTri= "*\n";
+        String aLine= "*";
+        while(counter < numberOfRows-1){
+            aLine += "*";
+            aTri += aLine + "\n";
+            counter++;
+        }
+        return aTri;
     }
 
     public static String getRow(int numberOfStars) {
-        return null;
+        String aster = "";
+        int counter = 1;
+        while(counter <= numberOfStars) {
+            aster = aster + "*";
+            counter++;
+        }
+        return aster;
     }
 
     public static String getSmallTriangle() {
-        return null;
+        int counter = 1;
+        String aTri= "*\n";
+        String aLine= "*";
+        while(counter < 4){
+            aLine += "*";
+            aTri += aLine + "\n";
+            counter++;
+        }
+        return aTri;
     }
 
     public static String getLargeTriangle() {
-        return null;
+        int counter = 1;
+        String aTri= "*\n";
+        String aLine= "*";
+        while(counter < 9){
+            aLine += "*";
+            aTri += aLine + "\n";
+            counter++;
+        }
+        return aTri;
     }
 }
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;

From 6b6d3f0e0b5c6ab7b2ebdc987a1445044ace79e3 Mon Sep 17 00:00:00 2001
From: Carolynn Vansant <cvansant@MacBook-Pro-5.local>
Date: Thu, 8 Feb 2018 14:31:13 -0500
Subject: [PATCH 2/4] final commit

---
 .../mastering_loops/TableUtilities.java       | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 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 e27a826..ef65c25 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,44 @@
 package io.zipcoder.microlabs.mastering_loops;
 
 public class TableUtilities {
+
     public static String getSmallMultiplicationTable() {
-        return null;
+        String small = "";
+        for(int i = 1; i < 6; i++) {
+            String multiply = "";
+            for (int j = 1; j < 6; j++) {
+                int x = j*i;
+                multiply += String.format("%3d", x) + " |";
+            }
+            small += multiply + "\n";
+        }
+        return small;
     }
 
     public static String getLargeMultiplicationTable() {
-        return null;
+        String large = "";
+        for(int i = 1; i < 11; i++) {
+            String multiply = "";
+            for (int j = 1; j < 11; j++) {
+                int x = j * i;
+                multiply += String.format("%3d", x) + " |";
+            }
+            large += multiply + "\n";
+        }
+
+        return large;
     }
 
     public static String getMultiplicationTable(int tableSize) {
-        return null;
+        String size = "";
+        for(int i = 1; i <= tableSize; i++) {
+            String multiply = "";
+            for (int j = 1; j <= tableSize; j++) {
+                int x = j * i;
+                multiply += String.format("%3d", x) + " |";
+            }
+            size += multiply + "\n";
+        }
+        return size;
     }
 }

From b5ae6b4656d63252ed78fd1caa4f461ae791aa42 Mon Sep 17 00:00:00 2001
From: Carolynn Vansant <cvansant@MacBook-Pro-7.fios-router.home>
Date: Thu, 3 May 2018 20:01:51 -0400
Subject: [PATCH 3/4] refactoring old labs is fun

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 .../mastering_loops/NumberUtilities.java      |  33 ++++--------------
 .../mastering_loops/TableUtilities.java       |   1 -
 .../mastering_loops/TriangleUtilities.java    |   2 +-
 4 files changed, 8 insertions(+), 28 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d33b93526774c09b0e405eee0ba120b5d4108acc
GIT binary patch
literal 6148
zcmeH~O-chn5QSf976B1v>9Vij4TcaGuDyUHf(XF@lk8`gW9zFQ#bF}uT*xb^{-&#|
zx|z3_ng(F2<I^qB0a((VIQcL)Uw5C`MMaFHbB_bwaKx5;nPs03c<nWwnSa23Qa|7o
z`}^In-Ry=9v%2?*o!?GTDIf);fE17dQs5T_y!X<US4oXhKnh5KF9rPj(CE&-I40xM
z!6B{y<bvTaKF3{xY#t!{;+SNFW?4#Rsnr$3vYhc&d3|wAW;rZQ=00_@)eXhsbjDkx
z!}_E~DIf)=3S8#2^ZtKF|Ka{WEz(R1NP&N)fGyS!>lI(Adh6`vyw^7RBmL8u8|fUP
k6_e45Iq_C}^DVFWGuQj#n2d79qny-_fa@ZY0)L^v2bJ_BK>z>%

literal 0
HcmV?d00001

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 62db795..0e97806 100644
--- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java
+++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java
@@ -5,53 +5,34 @@ public class NumberUtilities {
 
     public static String getEvenNumbers(int start, int stop) {
         String evens = "";
-        int count = start;
-        if((count / 2) != 0) {
-            count += 1;
-        }
-        for(int i = count; i < stop; i+=2) {
-            evens = evens + i;
-        }
+        if(start%2 != 0)  start += 1;
+        for(int i = start; i < stop; i+=2)  evens += i;
         return evens;
     }
 
-
     public static String getOddNumbers(int start, int stop) {
         String odds = "";
-        int count = start;
-        if((count / 2) == 0) {
-            count += 1;
-        }
-        for(int i = count; i < stop; i+=2) {
-            odds += i;
-        }
+        if(start %2 == 0) start += 1;
+        for(int i = start; i < stop; i+=2)  odds += i;
         return odds;
     }
 
-
     public static String getSquareNumbers(int start, int stop, int step) {
         String square = "";
-        for(int i = start; i < stop; i+=step) {
-            square += (i*i);
-        }
+        for(int i = start; i < stop; i+=step) square += (i*i);
         return square;
     }
 
-
     public static String getRange(int start, int stop, int step) {
         String xEach = "";
-        for(int i = start; i < stop; i+=step){
-            xEach += i;
-        }
+        for(int i = start; i < stop; i+=step) xEach += i;
         return xEach;
     }
 
-
     public static String getExponentiations(int start, int stop, int step, int exponent) {
         String expo = "";
         for(int i = start; i< stop; i+=step){
-            expo += (int)(Math.pow(i, exponent));
-        }
+            expo += (int)(Math.pow(i, exponent)); }
         return expo;
     }
 }
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 ef65c25..58bee97 100644
--- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java
+++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java
@@ -25,7 +25,6 @@ public static String getLargeMultiplicationTable() {
             }
             large += multiply + "\n";
         }
-
         return large;
     }
 
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 87df420..bb4154a 100644
--- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java
+++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java
@@ -18,7 +18,7 @@ public static String getRow(int numberOfStars) {
         String aster = "";
         int counter = 1;
         while(counter <= numberOfStars) {
-            aster = aster + "*";
+            aster += "*";
             counter++;
         }
         return aster;

From 5dd788189cd0de6c6c0ba3c0c2c821619fc202bb Mon Sep 17 00:00:00 2001
From: Carolynn Vansant <carolynnmarie@gmail.com>
Date: Thu, 28 Mar 2019 16:34:08 -0400
Subject: [PATCH 4/4] refactoring really, really old lab assignments

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../mastering_loops/NumberUtilities.java      |  31 +++++------
 .../mastering_loops/TableUtilities.java       |  32 +++---------
 .../mastering_loops/TriangleUtilities.java    |  48 ++++++------------
 .../TriangleUtilitiesTest.java                |  10 ++--
 5 files changed, 43 insertions(+), 78 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index d33b93526774c09b0e405eee0ba120b5d4108acc..93f8ecaa6ea4dff1c17322f53adc32c4c55935bc 100644
GIT binary patch
literal 6148
zcmeHKyH3ME5S&dSNJNv4AR3o6AW_qpC@CnQ;L($p5RyYsAQGh;{()cM`}hEuy*)*-
z9VBQXgm$I9Iq%($eRG!A2SB=u@iEW_(4;HYT5Q&sj;mL!79(3k2^=q&B0I}wqhVH=
z?Sa3jfbQKk9x>z29bskvW<!qXYjHw9_zcD#u!l?Zaf%+!iHEqrg1JLXFvks^agU6y
zIKdM+rx@ECv1EKNF?LFf*BFp5WB!l$WVgh(U*VhcX$E+}-7i>QORTK|>zZ}RM=7Ju
z_0KUXtzPwfThWu3ZmxhU;0kP50oH7_=8mDau7E4x3M>`S??XaYOe5xo;nTq;907<8
zhJ&%MKaHA`L`);*h8&@Zr4lVw;t@kEo$(~jOC#onmJW%B4~ch{ctVkIck(A;IwUpp
z))jCCiVD>2vaR*M|NZ&DnB-TkfGhB?6p%*ms@LU`Vr{J~PHSyKzoo0`yxee^!cHi~
foU5g{Ll4Gyq8(xyF*js{=05^K25($}jVka3Uo>l;

delta 136
zcmZoMXfc=|#>CJ*u~2NHo}wrt0|NsP3otO0FcdMAG9&}(%!!5SmLLgUhIEEZpg=LQ
zBtt$!9z(HbPJVJyPJR+lmB4=#uz4bL8O!Dc%x9T4vvcrs0IdRwd}p4_FJj2ZFxiGj
KdUK4(3T6P<N-Dts

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 0e97806..350ac9a 100644
--- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java
+++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java
@@ -4,35 +4,36 @@
 public class NumberUtilities {
 
     public static String getEvenNumbers(int start, int stop) {
-        String evens = "";
         if(start%2 != 0)  start += 1;
-        for(int i = start; i < stop; i+=2)  evens += i;
-        return evens;
+        return getRange(start,stop,2);
     }
 
     public static String getOddNumbers(int start, int stop) {
-        String odds = "";
         if(start %2 == 0) start += 1;
-        for(int i = start; i < stop; i+=2)  odds += i;
-        return odds;
+        return getRange(start,stop,2);
     }
 
     public static String getSquareNumbers(int start, int stop, int step) {
-        String square = "";
-        for(int i = start; i < stop; i+=step) square += (i*i);
-        return square;
+        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) {
-        String xEach = "";
-        for(int i = start; i < stop; i+=step) xEach += i;
-        return xEach;
+        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) {
-        String expo = "";
+        StringBuilder expo = new StringBuilder();
         for(int i = start; i< stop; i+=step){
-            expo += (int)(Math.pow(i, exponent)); }
-        return expo;
+            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 58bee97..1d02125 100644
--- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java
+++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java
@@ -3,41 +3,21 @@
 public class TableUtilities {
 
     public static String getSmallMultiplicationTable() {
-        String small = "";
-        for(int i = 1; i < 6; i++) {
-            String multiply = "";
-            for (int j = 1; j < 6; j++) {
-                int x = j*i;
-                multiply += String.format("%3d", x) + " |";
-            }
-            small += multiply + "\n";
-        }
-        return small;
+        return getMultiplicationTable(5);
     }
 
     public static String getLargeMultiplicationTable() {
-        String large = "";
-        for(int i = 1; i < 11; i++) {
-            String multiply = "";
-            for (int j = 1; j < 11; j++) {
-                int x = j * i;
-                multiply += String.format("%3d", x) + " |";
-            }
-            large += multiply + "\n";
-        }
-        return large;
+        return getMultiplicationTable(10);
     }
 
     public static String getMultiplicationTable(int tableSize) {
-        String size = "";
+        StringBuilder size = new StringBuilder();
         for(int i = 1; i <= tableSize; i++) {
-            String multiply = "";
             for (int j = 1; j <= tableSize; j++) {
-                int x = j * i;
-                multiply += String.format("%3d", x) + " |";
+                size.append(String.format("%3d |", j*i));
             }
-            size += multiply + "\n";
+            size.append("\n");
         }
-        return size;
+        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 bb4154a..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,49 +2,31 @@
 
 public class TriangleUtilities {
 
-    public static String getTriangle(int numberOfRows) {
-        int counter = 1;
-        String aTri= "*\n";
-        String aLine= "*";
-        while(counter < numberOfRows-1){
-            aLine += "*";
-            aTri += aLine + "\n";
+
+    public static String getRow(int numberOfStars) {
+        StringBuilder aster = new StringBuilder();
+        int counter = 0;
+        while(counter < numberOfStars) {
+            aster.append("*");
             counter++;
         }
-        return aTri;
+        return aster.toString();
     }
 
-    public static String getRow(int numberOfStars) {
-        String aster = "";
-        int counter = 1;
-        while(counter <= numberOfStars) {
-            aster += "*";
-            counter++;
+    public static String getTriangle(int numberOfRows) {
+        StringBuilder builder = new StringBuilder();
+        for(int i = 1; i<=numberOfRows; i++){
+            builder.append(getRow(i))
+                    .append("\n");
         }
-        return aster;
+        return builder.toString();
     }
 
     public static String getSmallTriangle() {
-        int counter = 1;
-        String aTri= "*\n";
-        String aLine= "*";
-        while(counter < 4){
-            aLine += "*";
-            aTri += aLine + "\n";
-            counter++;
-        }
-        return aTri;
+        return getTriangle(4);
     }
 
     public static String getLargeTriangle() {
-        int counter = 1;
-        String aTri= "*\n";
-        String aLine= "*";
-        while(counter < 9){
-            aLine += "*";
-            aTri += aLine + "\n";
-            counter++;
-        }
-        return aTri;
+        return getTriangle(9);
     }
 }
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);
     }