diff --git a/NumberUtilities.java b/NumberUtilities.java index 1d5ba50..a192361 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -1,32 +1,57 @@ - - public class NumberUtilities { - public static String getRange(int stop) { - return null; + String result = ""; + for(int i = 0; i < stop; i++) { + result = result + Integer.toString(i); + } + return result; } public static String getRange(int start, int stop) { - return null; + 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/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..ac60c7c 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -1,21 +1,30 @@ - public class TriangleUtilities { - public static String getRow(int numberOfStars) { - return null; + String result = ""; + for (int i= 1; i <= numberOfStars; i++) { + result = result + "*"; + } + return result; } - + public static String getTriangle(int numberOfRows) { - return null; + String result = ""; + for (int j= 1; j <= numberOfRows; j++) { + /*for (int j = 0; j < i; j++) { + length+="*"; + }*/ + result += getRow(j); + result += "\n"; + } + return result; } - 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..ede2e12 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=979 +editor.fx.0.width=945 +editor.fx.0.x=2255 +editor.fx.0.y=-121 +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 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=768 +package.editor.y=23 +package.frame.height=710 package.frame.width=508 package.numDependencies=3 package.numTargets=6