From 82bb7f079a54fce7eab6a13e57467fcca5d6df58 Mon Sep 17 00:00:00 2001 From: jorge Date: Fri, 5 Mar 2021 23:02:15 -0500 Subject: [PATCH 1/2] completed methods --- NumberUtilities.java | 42 ++++++++++++++++++++++++++++++++++++------ README.TXT | 0 TableUtilities.java | 34 +++++++++++++++++++++++++++++++--- TriangleUtilities.java | 38 ++++++++++++++++++++++++++++++++++---- package.bluej | 34 +++++++++++++++++----------------- 5 files changed, 118 insertions(+), 30 deletions(-) create mode 100644 README.TXT diff --git a/NumberUtilities.java b/NumberUtilities.java index 1d5ba50..1fec7f2 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -4,29 +4,59 @@ public class NumberUtilities { public static String getRange(int stop) { - return null; + String numbers = ""; + for(int i = 0; i < stop; i++){ + numbers += i; + } + + return numbers; } public static String getRange(int start, int stop) { - return null; + String numbers = ""; + for(int i = start; i < stop; i++){ + numbers += i; + } + return numbers; } public static String getRange(int start, int stop, int step) { - return null; + String numbers = ""; + for(int i = start; i < stop; i += step){ + numbers += i; + } + return numbers; } public static String getEvenNumbers(int start, int stop) { - return null; + String numbers = ""; + for(int i = start; i < stop; i++){ + if(i % 2 == 0){ + numbers += i; + } + } + return numbers; } public static String getOddNumbers(int start, int stop) { - return null; + String numbers = ""; + for(int i = start; i < stop; i++){ + if(i % 2 != 0){ + numbers += i; + } + } + return numbers; } public static String getExponentiations(int start, int stop, int exponent) { - return null; + String numbers = ""; + StringBuffer exp = new StringBuffer(); + for(int i = start; i <= stop; i++){ + numbers = exp.append(Math.round(Math.pow(i,exponent))).toString(); + } + return numbers; } } diff --git a/README.TXT b/README.TXT new file mode 100644 index 0000000..e69de29 diff --git a/TableUtilities.java b/TableUtilities.java index 03bf004..8c3dc37 100644 --- a/TableUtilities.java +++ b/TableUtilities.java @@ -2,14 +2,42 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + String table =""; + StringBuilder sb = new StringBuilder(); + for(int i = 1; i <= 5; i++){ + for(int j = 1; j <= 5; j++){ + table = sb.append(i*j).toString(); + table = sb.append(" |").toString(); + } + table = sb.append("\n").toString(); + } + return table; } public static String getLargeMultiplicationTable() { - return null; + String table=""; + StringBuilder sb = new StringBuilder(); + for(int i = 1; i <= 10; i++){ + for(int j = 1; j <= 10; j++){ + table = sb.append(i*j).toString(); + table = sb.append(" |").toString(); + } + table = sb.append("\n").toString(); + } + return table; } public static String getMultiplicationTable(int tableSize) { - return null; + String table =""; + StringBuilder sb = new StringBuilder(); + for(int i = 1; i <= tableSize; i++){ + for(int j = 1; j <= tableSize; j++){ + table = sb.append(" " + i*j).toString(); + table = sb.append(" |").toString(); + } + table = sb.append("\n").toString(); + + } + return table; } } diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..ede6cbe 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -3,19 +3,49 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - return null; + String stars = ""; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i <= numberOfStars; i++){ + stars = sb.append("*").toString(); + } + return stars; } public static String getTriangle(int numberOfRows) { - return null; + String rows = ""; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i < numberOfRows; i++){ + rows = sb.append("*").toString(); + } + return rows; } public static String getSmallTriangle() { - return null; + String smallTriangle = ""; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i < 4; i++){ + for(int j = 0; j < 4; j++){ + if(j <= i){ + smallTriangle = sb.append("*").toString(); + } + } + smallTriangle = sb.append("\n").toString(); + } + return smallTriangle; } public static String getLargeTriangle() { - return null; + String largeTriangle = ""; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i < 9; i++){ + for(int j = 0; j < 9; j++){ + if(j <= i){ + largeTriangle = sb.append("*").toString(); + } + } + largeTriangle = sb.append("\n").toString(); + } + return largeTriangle; } } diff --git a/package.bluej b/package.bluej index 028bdd0..e386d8b 100644 --- a/package.bluej +++ b/package.bluej @@ -1,35 +1,35 @@ #BlueJ package file -dependency1.from=NumberUtilitiesTest -dependency1.to=NumberUtilities +dependency1.from=TriangleUtilitiesTest +dependency1.to=TriangleUtilities dependency1.type=UsesDependency -dependency2.from=TriangleUtilitiesTest -dependency2.to=TriangleUtilities +dependency2.from=NumberUtilitiesTest +dependency2.to=NumberUtilities 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 +editor.fx.0.height=715 +editor.fx.0.width=958 +editor.fx.0.x=322 +editor.fx.0.y=23 +objectbench.height=154 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.7549467275494672 +package.editor.height=489 +package.editor.width=390 +package.editor.x=0 +package.editor.y=23 +package.frame.height=715 package.frame.width=508 package.numDependencies=3 package.numTargets=6 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 From 17a89d127414f1bcbf080d5d328f5c30f885e155 Mon Sep 17 00:00:00 2001 From: jorge Date: Fri, 5 Mar 2021 23:57:12 -0500 Subject: [PATCH 2/2] completed methods --- NumberUtilities.java | 7 +++---- TableUtilities.java | 27 ++++++++++++--------------- TriangleUtilities.java | 34 +++++++++++++--------------------- package.bluej | 24 ++++++++++++------------ 4 files changed, 40 insertions(+), 52 deletions(-) diff --git a/NumberUtilities.java b/NumberUtilities.java index 1fec7f2..9572dcd 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -52,11 +52,10 @@ public static String getOddNumbers(int start, int stop) { public static String getExponentiations(int start, int stop, int exponent) { - String numbers = ""; - StringBuffer exp = new StringBuffer(); + StringBuilder exp = new StringBuilder(); for(int i = start; i <= stop; i++){ - numbers = exp.append(Math.round(Math.pow(i,exponent))).toString(); + exp = exp.append(Math.round(Math.pow(i,exponent))); } - return numbers; + return exp.toString(); } } diff --git a/TableUtilities.java b/TableUtilities.java index 8c3dc37..8a6b6f0 100644 --- a/TableUtilities.java +++ b/TableUtilities.java @@ -2,42 +2,39 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - String table =""; StringBuilder sb = new StringBuilder(); for(int i = 1; i <= 5; i++){ for(int j = 1; j <= 5; j++){ - table = sb.append(i*j).toString(); - table = sb.append(" |").toString(); + sb = sb.append(" " + (i*j)); + sb = sb.append(" |"); } - table = sb.append("\n").toString(); + sb = sb.append("\n"); } - return table; + return sb.toString(); } public static String getLargeMultiplicationTable() { - String table=""; StringBuilder sb = new StringBuilder(); for(int i = 1; i <= 10; i++){ for(int j = 1; j <= 10; j++){ - table = sb.append(i*j).toString(); - table = sb.append(" |").toString(); + sb = sb.append(" " + (i*j)); + sb = sb.append(" |"); } - table = sb.append("\n").toString(); + sb = sb.append("\n"); } - return table; + return sb.toString(); } public static String getMultiplicationTable(int tableSize) { - String table =""; StringBuilder sb = new StringBuilder(); for(int i = 1; i <= tableSize; i++){ for(int j = 1; j <= tableSize; j++){ - table = sb.append(" " + i*j).toString(); - table = sb.append(" |").toString(); + sb = sb.append(" " + (i*j)); + sb = sb.append(" |"); } - table = sb.append("\n").toString(); + sb = sb.append("\n"); } - return table; + return sb.toString(); } } diff --git a/TriangleUtilities.java b/TriangleUtilities.java index ede6cbe..78fbc14 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -3,49 +3,41 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - String stars = ""; StringBuilder sb = new StringBuilder(); for(int i = 0; i <= numberOfStars; i++){ - stars = sb.append("*").toString(); + sb = sb.append("*"); } - return stars; + return sb.toString(); } public static String getTriangle(int numberOfRows) { - String rows = ""; StringBuilder sb = new StringBuilder(); - for(int i = 0; i < numberOfRows; i++){ - rows = sb.append("*").toString(); + for(int i = 0; i <= numberOfRows; i++){ + sb = sb.append("*"); } - return rows; + return sb.toString(); } public static String getSmallTriangle() { - String smallTriangle = ""; StringBuilder sb = new StringBuilder(); for(int i = 0; i < 4; i++){ - for(int j = 0; j < 4; j++){ - if(j <= i){ - smallTriangle = sb.append("*").toString(); - } + for(int j = 0; j <= i; j++){ + sb = sb.append("*"); } - smallTriangle = sb.append("\n").toString(); + sb = sb.append("\n"); } - return smallTriangle; + return sb.toString(); } public static String getLargeTriangle() { - String largeTriangle = ""; StringBuilder sb = new StringBuilder(); for(int i = 0; i < 9; i++){ - for(int j = 0; j < 9; j++){ - if(j <= i){ - largeTriangle = sb.append("*").toString(); - } + for(int j = 0; j <= i; j++){ + sb = sb.append("*"); } - largeTriangle = sb.append("\n").toString(); + sb= sb.append("\n"); } - return largeTriangle; + return sb.toString(); } } diff --git a/package.bluej b/package.bluej index e386d8b..7893dc6 100644 --- a/package.bluej +++ b/package.bluej @@ -1,26 +1,26 @@ #BlueJ package file -dependency1.from=TriangleUtilitiesTest -dependency1.to=TriangleUtilities +dependency1.from=TableUtilitiesTest +dependency1.to=TableUtilities dependency1.type=UsesDependency -dependency2.from=NumberUtilitiesTest -dependency2.to=NumberUtilities +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=715 +editor.fx.0.height=709 editor.fx.0.width=958 editor.fx.0.x=322 editor.fx.0.y=23 -objectbench.height=154 +objectbench.height=152 objectbench.width=484 package.divider.horizontal=0.6 -package.divider.vertical=0.7549467275494672 -package.editor.height=489 +package.divider.vertical=0.7557603686635944 +package.editor.height=485 package.editor.width=390 -package.editor.x=0 +package.editor.x=55 package.editor.y=23 -package.frame.height=715 +package.frame.height=709 package.frame.width=508 package.numDependencies=3 package.numTargets=6