diff --git a/NumberUtilities.java b/NumberUtilities.java index 1d5ba50..9572dcd 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -4,29 +4,58 @@ 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; + StringBuilder exp = new StringBuilder(); + for(int i = start; i <= stop; i++){ + exp = exp.append(Math.round(Math.pow(i,exponent))); + } + return exp.toString(); } } 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..8a6b6f0 100644 --- a/TableUtilities.java +++ b/TableUtilities.java @@ -2,14 +2,39 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + StringBuilder sb = new StringBuilder(); + for(int i = 1; i <= 5; i++){ + for(int j = 1; j <= 5; j++){ + sb = sb.append(" " + (i*j)); + sb = sb.append(" |"); + } + sb = sb.append("\n"); + } + return sb.toString(); } public static String getLargeMultiplicationTable() { - return null; + StringBuilder sb = new StringBuilder(); + for(int i = 1; i <= 10; i++){ + for(int j = 1; j <= 10; j++){ + sb = sb.append(" " + (i*j)); + sb = sb.append(" |"); + } + sb = sb.append("\n"); + } + return sb.toString(); } public static String getMultiplicationTable(int tableSize) { - return null; + StringBuilder sb = new StringBuilder(); + for(int i = 1; i <= tableSize; i++){ + for(int j = 1; j <= tableSize; j++){ + sb = sb.append(" " + (i*j)); + sb = sb.append(" |"); + } + sb = sb.append("\n"); + + } + return sb.toString(); } } diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..78fbc14 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -3,19 +3,41 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - return null; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i <= numberOfStars; i++){ + sb = sb.append("*"); + } + return sb.toString(); } public static String getTriangle(int numberOfRows) { - return null; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i <= numberOfRows; i++){ + sb = sb.append("*"); + } + return sb.toString(); } public static String getSmallTriangle() { - return null; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i < 4; i++){ + for(int j = 0; j <= i; j++){ + sb = sb.append("*"); + } + sb = sb.append("\n"); + } + return sb.toString(); } public static String getLargeTriangle() { - return null; + StringBuilder sb = new StringBuilder(); + for(int i = 0; i < 9; i++){ + for(int j = 0; j <= i; j++){ + sb = sb.append("*"); + } + sb= sb.append("\n"); + } + return sb.toString(); } } diff --git a/package.bluej b/package.bluej index 028bdd0..7893dc6 100644 --- a/package.bluej +++ b/package.bluej @@ -1,35 +1,35 @@ #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=709 +editor.fx.0.width=958 +editor.fx.0.x=322 +editor.fx.0.y=23 +objectbench.height=152 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.7557603686635944 +package.editor.height=485 +package.editor.width=390 +package.editor.x=55 +package.editor.y=23 +package.frame.height=709 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