From 88e2ff07e386c6109f6a27c443fe539fdb816042 Mon Sep 17 00:00:00 2001
From: Rex <rex@zipcodes-mbp-51.lan>
Date: Sun, 4 Jul 2021 21:17:31 -0400
Subject: [PATCH] Finished

---
 NumberUtilities.java    |  42 +++++++++++--
 README.md               |  52 ++++++++--------
 TableUtilities.java     |  14 ++++-
 TableUtilitiesTest.java |   3 +
 TriangleUtilities.java  |  20 ++++--
 package.bluej           | 132 ++++++++++++++++++++++++----------------
 6 files changed, 170 insertions(+), 93 deletions(-)

diff --git a/NumberUtilities.java b/NumberUtilities.java
index 1d5ba50..fdc9fef 100644
--- a/NumberUtilities.java
+++ b/NumberUtilities.java
@@ -4,29 +4,59 @@
 public class NumberUtilities {
 
     public static String getRange(int stop) {
-        return null;
+        String x = "";
+        for (int i=0;i<stop;i++){
+            x+=i;
+        }
+        return x;
+        
     }
 
     public static String getRange(int start, int stop) {
-        return null;
+        String x = "";
+        for (int i=start; i<stop; i++){
+            x+=i;
+        }
+        return x;
     }
 
 
     public static String getRange(int start, int stop, int step) {
-        return null;
+        String x = "";
+        for (int i=start; i<stop;i+=step){
+            x+=i;
+        }
+    
+        return x;
     }
 
     public static String getEvenNumbers(int start, int stop) {
-        return null;
+        String x = "";
+        for (int i=start; i<stop; i++){
+            if( i % 2 == 0){
+                x+=i;
+            }
+        }
+        return x;
     }
 
 
     public static String getOddNumbers(int start, int stop) {
-        return null;
+        String x = "";
+        for (int i=start; i<stop; i++){
+            if(i % 2 != 0){
+                x+=i;
+            }
+        }
+        return x;
     }
 
 
     public static String getExponentiations(int start, int stop, int exponent) {
-        return null;
+        String x = "";
+        for (int i = start; i <= stop; i++){
+            x += (int)Math.pow(i, exponent);
+        }
+        return x;
     }
 }
diff --git a/README.md b/README.md
index 4421908..9e733d9 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,26 @@
-# Leon's Loopy Lab
-* Read each of the following `README` files and complete each of the asks.
-    * [README-NumberUtilities.md](./README-NumberUtilities.md)
-    * [README-TriangleUtilities.md](./README-TriangleUtilities.md)
-    * [README-TableUtilities.md](./README-TableUtilities.md)
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+# Leon's Loopy Lab
+* Read each of the following `README` files and complete each of the asks.
+    * [README-NumberUtilities.md](./README-NumberUtilities.md)
+    * [README-TriangleUtilities.md](./README-TriangleUtilities.md)
+    * [README-TableUtilities.md](./README-TableUtilities.md)
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TableUtilities.java b/TableUtilities.java
index 03bf004..7650bf1 100644
--- a/TableUtilities.java
+++ b/TableUtilities.java
@@ -2,14 +2,22 @@
 
 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;
+        String x = "";
+        for (int i = 1; i <= tableSize; i++){
+            for (int j = 1; j<= tableSize; j++){
+                x+=String.format("%3d", (i*j))+" |" ;
+            }
+            x += "\n";
+        }
+
+        return x;
     }
 }
diff --git a/TableUtilitiesTest.java b/TableUtilitiesTest.java
index fc078a4..5dcce2e 100644
--- a/TableUtilitiesTest.java
+++ b/TableUtilitiesTest.java
@@ -82,6 +82,9 @@ public void testGetMultiplicationTable() {
                 " 19 | 38 | 57 | 76 | 95 |114 |133 |152 |171 |190 |209 |228 |247 |266 |285 |304 |323 |342 |361 |380 |\n" +
                 " 20 | 40 | 60 | 80 |100 |120 |140 |160 |180 |200 |220 |240 |260 |280 |300 |320 |340 |360 |380 |400 |\n";
         String actual = TableUtilities.getMultiplicationTable(20);
+        
+        System.out.println(actual);
+        System.out.println(expected);
         Assert.assertEquals(expected, actual);
     }
 
diff --git a/TriangleUtilities.java b/TriangleUtilities.java
index 8755fd0..cdd48da 100644
--- a/TriangleUtilities.java
+++ b/TriangleUtilities.java
@@ -3,19 +3,31 @@
 public class TriangleUtilities {
 
     public static String getRow(int numberOfStars) {
-        return null;
+        String x = "";
+        for( int i=0; i < numberOfStars; i++){
+            x += "*";
+        }
+        return x;
     }
     
     public static String getTriangle(int numberOfRows) {
-        return null;
+        String x = "";
+        for (int i=0; i < numberOfRows; i++){
+            for (int j = 0; j <= i; j++){
+                x += "*";
+            }
+            x += "\n";
+        }
+            return x;
     }
 
 
     public static String getSmallTriangle() {
-        return null;
+        
+        return getTriangle(4);
     }
 
     public static String getLargeTriangle() {
-        return null;
+        return getTriangle(9);
     }
 }
diff --git a/package.bluej b/package.bluej
index 028bdd0..cced5fa 100644
--- a/package.bluej
+++ b/package.bluej
@@ -8,72 +8,96 @@ dependency2.type=UsesDependency
 dependency3.from=TableUtilitiesTest
 dependency3.to=TableUtilities
 dependency3.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=537
-editor.fx.0.y=28
-objectbench.height=164
-objectbench.width=484
-package.divider.horizontal=0.6
-package.divider.vertical=0.7560627674750356
-package.editor.height=523
-package.editor.width=382
-package.editor.x=20
-package.editor.y=57
-package.frame.height=759
-package.frame.width=508
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=100
+objectbench.width=417
+package.divider.horizontal=0.6005665722379604
+package.divider.vertical=0.8225538971807629
+package.editor.height=489
+package.editor.width=609
+package.editor.x=100
+package.editor.y=88
+package.frame.height=667
+package.frame.width=726
 package.numDependencies=3
-package.numTargets=6
+package.numTargets=10
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
-readme.height=58
+readme.height=60
 readme.name=@README
-readme.width=47
+readme.width=48
 readme.x=10
 readme.y=10
-target1.height=50
-target1.name=TableUtilitiesTest
-target1.showInterface=false
-target1.type=UnitTestTargetJunit4
-target1.width=110
-target1.x=100
-target1.y=270
+target1.height=70
+target1.name=README-TriangleUtilities.md
+target1.type=TextTarget
+target1.width=180
+target1.x=310
+target1.y=170
+target10.association=TriangleUtilitiesTest
+target10.height=50
+target10.name=TriangleUtilities
+target10.showInterface=false
+target10.type=ClassTarget
+target10.width=120
+target10.x=70
+target10.y=190
 target2.height=50
-target2.name=TriangleUtilitiesTest
+target2.name=TableUtilitiesTest
 target2.showInterface=false
 target2.type=UnitTestTargetJunit4
-target2.width=120
+target2.width=110
 target2.x=100
-target2.y=160
-target3.association=TableUtilitiesTest
+target2.y=270
 target3.height=50
-target3.name=TableUtilities
+target3.name=TriangleUtilitiesTest
 target3.showInterface=false
-target3.type=ClassTarget
-target3.width=110
-target3.x=70
-target3.y=300
-target4.association=NumberUtilitiesTest
-target4.height=50
-target4.name=NumberUtilities
-target4.showInterface=false
-target4.type=ClassTarget
-target4.width=120
-target4.x=80
-target4.y=70
+target3.type=UnitTestTargetJunit4
+target3.width=120
+target3.x=100
+target3.y=160
+target4.height=70
+target4.name=README-TableUtilities.md
+target4.type=TextTarget
+target4.width=170
+target4.x=400
+target4.y=260
+target5.association=TableUtilitiesTest
 target5.height=50
-target5.name=NumberUtilitiesTest
+target5.name=TableUtilities
 target5.showInterface=false
-target5.type=UnitTestTargetJunit4
-target5.width=120
-target5.x=110
-target5.y=40
-target6.association=TriangleUtilitiesTest
-target6.height=50
-target6.name=TriangleUtilities
-target6.showInterface=false
-target6.type=ClassTarget
-target6.width=120
-target6.x=70
-target6.y=190
+target5.type=ClassTarget
+target5.width=110
+target5.x=70
+target5.y=300
+target6.height=70
+target6.name=README-NumberUtilities.md
+target6.type=TextTarget
+target6.width=180
+target6.x=10
+target6.y=360
+target7.association=NumberUtilitiesTest
+target7.height=50
+target7.name=NumberUtilities
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=120
+target7.x=80
+target7.y=70
+target8.height=70
+target8.name=README.md
+target8.type=TextTarget
+target8.width=120
+target8.x=370
+target8.y=80
+target9.height=50
+target9.name=NumberUtilitiesTest
+target9.showInterface=false
+target9.type=UnitTestTargetJunit4
+target9.width=120
+target9.x=110
+target9.y=40