From b1563ddc232f5c7afce20246ad5ce5e68690cf5b Mon Sep 17 00:00:00 2001 From: Ben Coon Date: Thu, 17 Oct 2019 18:13:20 -0400 Subject: [PATCH 1/4] NumberUtilities 1 and 2 working --- NumberUtilities.java | 12 ++++++++++-- package.bluej | 34 +++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/NumberUtilities.java b/NumberUtilities.java index 1d5ba50..a4b188c 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -3,12 +3,20 @@ public class NumberUtilities { + public static String result = ""; + public static String getRange(int stop) { - return null; + for(int i = 0; i < stop; i++) { + result = result + Integer.toString(i); + } + return result; } public static String getRange(int start, int stop) { - return null; + for(int i = 0; start < stop; i++) { + result = result + Integer.toString(start); + } + return result; } diff --git a/package.bluej b/package.bluej index 028bdd0..7f1dfcf 100644 --- a/package.bluej +++ b/package.bluej @@ -1,26 +1,30 @@ #BlueJ package file -dependency1.from=NumberUtilitiesTest -dependency1.to=NumberUtilities +dependency1.from=TableUtilitiesTest +dependency1.to=TableUtilities dependency1.type=UsesDependency dependency2.from=TriangleUtilitiesTest dependency2.to=TriangleUtilities dependency2.type=UsesDependency -dependency3.from=TableUtilitiesTest -dependency3.to=TableUtilities +dependency3.from=NumberUtilitiesTest +dependency3.to=NumberUtilities 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 +editor.fx.0.height=980 +editor.fx.0.width=909 +editor.fx.0.x=1280 +editor.fx.0.y=-121 +editor.fx.1.height=980 +editor.fx.1.width=1010 +editor.fx.1.x=2190 +editor.fx.1.y=-121 +objectbench.height=153 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.divider.vertical=0.754601226993865 +package.editor.height=485 +package.editor.width=390 +package.editor.x=2649 +package.editor.y=0 +package.frame.height=710 package.frame.width=508 package.numDependencies=3 package.numTargets=6 From ec68280339285d6fb13c01f204c47d5db10fa368 Mon Sep 17 00:00:00 2001 From: Ben Coon Date: Thu, 17 Oct 2019 19:34:32 -0400 Subject: [PATCH 2/4] Finished NumberUtilities --- NumberUtilities.java | 45 ++++++++++++++++++++++++++++++-------------- package.bluej | 12 ++++++------ 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/NumberUtilities.java b/NumberUtilities.java index a4b188c..a192361 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -1,11 +1,7 @@ - - public class NumberUtilities { - - public static String result = ""; - public static String getRange(int stop) { + String result = ""; for(int i = 0; i < stop; i++) { result = result + Integer.toString(i); } @@ -13,28 +9,49 @@ public static String getRange(int stop) { } public static String getRange(int start, int stop) { - for(int i = 0; start < stop; i++) { - result = result + Integer.toString(start); + String result = ""; + for(int i = start; i < stop; i++) { + result = result + Integer.toString(i); } return result; } - public static String getRange(int start, int stop, int step) { - return null; + String result = ""; + for(int i = start; i < stop; i++) { + if (i % step == 0) { + result = result + Integer.toString(i); + } + } + return result; } public static String getEvenNumbers(int start, int stop) { - return null; + String result = ""; + for(int i = start; i < stop; i++) { + if (i % 2 == 0) { + result = result + Integer.toString(i); + } + } + return result; } - public static String getOddNumbers(int start, int stop) { - return null; + String result = ""; + for(int i = start; i < stop; i++) { + if (i % 2 == 1) { + result = result + Integer.toString(i); + } + } + return result; } - public static String getExponentiations(int start, int stop, int exponent) { - return null; + String result = ""; + for(int i = start; i <= stop; i++) { + int num = (int) Math.pow(i, exponent); + result = result + Integer.toString(num); + } + return result; } } diff --git a/package.bluej b/package.bluej index 7f1dfcf..23639cc 100644 --- a/package.bluej +++ b/package.bluej @@ -8,13 +8,13 @@ dependency2.type=UsesDependency dependency3.from=NumberUtilitiesTest dependency3.to=NumberUtilities dependency3.type=UsesDependency -editor.fx.0.height=980 -editor.fx.0.width=909 +editor.fx.0.height=990 +editor.fx.0.width=938 editor.fx.0.x=1280 editor.fx.0.y=-121 -editor.fx.1.height=980 -editor.fx.1.width=1010 -editor.fx.1.x=2190 +editor.fx.1.height=989 +editor.fx.1.width=981 +editor.fx.1.x=2219 editor.fx.1.y=-121 objectbench.height=153 objectbench.width=484 @@ -22,7 +22,7 @@ package.divider.horizontal=0.6 package.divider.vertical=0.754601226993865 package.editor.height=485 package.editor.width=390 -package.editor.x=2649 +package.editor.x=2688 package.editor.y=0 package.frame.height=710 package.frame.width=508 From 11f6b244813c9e3f0db094b7dc029feba4ac2398 Mon Sep 17 00:00:00 2001 From: Ben Coon Date: Thu, 17 Oct 2019 22:04:50 -0400 Subject: [PATCH 3/4] Mostly done Triangle part --- TriangleUtilities.java | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..87e2c5e 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -1,21 +1,40 @@ - public class TriangleUtilities { - public static String getRow(int numberOfStars) { - return null; + String width = ""; + for (int i= 0; i < numberOfStars; i++) { + width = width + "*"; + } + return width; } - + public static String getTriangle(int numberOfRows) { - return null; + String length = ""; + for (int i= 0; i < numberOfRows; i++) { + length = "*\n"; + } + return length; } - public static String getSmallTriangle() { - return null; + String star = ""; + for (int i = 1; i < 5; i++){ + for (int j = 0; j < i; j++){ + star = star + "*"; + } + star = star + "\n"; + } + return star; } public static String getLargeTriangle() { - return null; + String star = ""; + for (int i = 0; i < 10; i++){ + for (int j = 0; j < i; j++){ + star = star + "*"; + } + star = star + "\n"; + } + return star; } } From 29797a65f8ce2696a55361b1fe24a7de21e70208 Mon Sep 17 00:00:00 2001 From: Ben Coon Date: Fri, 18 Oct 2019 13:01:35 -0400 Subject: [PATCH 4/4] Working Triangle Builder --- TriangleUtilities.java | 38 ++++++++++++++------------------------ package.bluej | 16 ++++++++-------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 87e2c5e..ac60c7c 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -1,40 +1,30 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - String width = ""; - for (int i= 0; i < numberOfStars; i++) { - width = width + "*"; + String result = ""; + for (int i= 1; i <= numberOfStars; i++) { + result = result + "*"; } - return width; + return result; } public static String getTriangle(int numberOfRows) { - String length = ""; - for (int i= 0; i < numberOfRows; i++) { - length = "*\n"; + String result = ""; + for (int j= 1; j <= numberOfRows; j++) { + /*for (int j = 0; j < i; j++) { + length+="*"; + }*/ + result += getRow(j); + result += "\n"; } - return length; + return result; } public static String getSmallTriangle() { - String star = ""; - for (int i = 1; i < 5; i++){ - for (int j = 0; j < i; j++){ - star = star + "*"; - } - star = star + "\n"; - } - return star; + return getTriangle(4); } public static String getLargeTriangle() { - String star = ""; - for (int i = 0; i < 10; i++){ - for (int j = 0; j < i; j++){ - star = star + "*"; - } - star = star + "\n"; - } - return star; + return getTriangle(9); } } diff --git a/package.bluej b/package.bluej index 23639cc..ede2e12 100644 --- a/package.bluej +++ b/package.bluej @@ -8,13 +8,13 @@ dependency2.type=UsesDependency dependency3.from=NumberUtilitiesTest dependency3.to=NumberUtilities dependency3.type=UsesDependency -editor.fx.0.height=990 -editor.fx.0.width=938 -editor.fx.0.x=1280 +editor.fx.0.height=979 +editor.fx.0.width=945 +editor.fx.0.x=2255 editor.fx.0.y=-121 -editor.fx.1.height=989 -editor.fx.1.width=981 -editor.fx.1.x=2219 +editor.fx.1.height=979 +editor.fx.1.width=974 +editor.fx.1.x=1280 editor.fx.1.y=-121 objectbench.height=153 objectbench.width=484 @@ -22,8 +22,8 @@ package.divider.horizontal=0.6 package.divider.vertical=0.754601226993865 package.editor.height=485 package.editor.width=390 -package.editor.x=2688 -package.editor.y=0 +package.editor.x=768 +package.editor.y=23 package.frame.height=710 package.frame.width=508 package.numDependencies=3