diff --git a/NumberUtilities.java b/NumberUtilities.java index 1d5ba50..e0def68 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -4,29 +4,69 @@ public class NumberUtilities { public static String getRange(int stop) { - return null; + String SmallRange = ""; + for (Integer i = 0; i < stop; i++) { + SmallRange = SmallRange + i.toString(); + } + return SmallRange; } public static String getRange(int start, int stop) { - return null; + String StartNumber = ""; + for (Integer i = start; i < stop; i++) { + StartNumber = StartNumber + i.toString(); + } + return StartNumber; } public static String getRange(int start, int stop, int step) { - return null; + String OneStepTwoStep = ""; + for (Integer i = start; i < stop; i += step) { + OneStepTwoStep = OneStepTwoStep + i.toString(); + } + return OneStepTwoStep; } public static String getEvenNumbers(int start, int stop) { - return null; + String EvenStep = ""; + if(start%2 == 0) { + for (Integer i = start; i < stop; i += 2) { + EvenStep = EvenStep + i.toString(); + } + } else { + start+=1; + for (Integer i = start; i < stop; i += 2) { + EvenStep = EvenStep + i.toString(); + } + } + return EvenStep; } public static String getOddNumbers(int start, int stop) { - return null; + String OddStep = ""; + if(start%2 > 0) { + for (Integer i = start; i < stop; i+=2) { + OddStep = OddStep + i.toString(); + } + } else { + start+=1; + for (Integer i = start; i < stop; i+=2) { + OddStep = OddStep + i.toString(); + } + } + return OddStep; } public static String getExponentiations(int start, int stop, int exponent) { - return null; + String SquareCube = ""; + for (Integer i = start; i <= stop; i++) { + Double d = Math.pow(i, exponent); + String str = d.toString(); + SquareCube = SquareCube + str.substring(0, str.length()-2); + } + return SquareCube; } } diff --git a/TableUtilities.java b/TableUtilities.java index 03bf004..34594ac 100644 --- a/TableUtilities.java +++ b/TableUtilities.java @@ -2,14 +2,30 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + return TableUtilities.getMultiplicationTable(5); } public static String getLargeMultiplicationTable() { - return null; + return TableUtilities.getMultiplicationTable(10); } public static String getMultiplicationTable(int tableSize) { - return null; + String MultiTable = ""; + for (Integer i = 0; i < tableSize; i++) { + String RowOfNum = ""; + Integer n = 0; + for(Integer j = 0; j < tableSize; j++){ + n = n + (i+1); + if(n < 10) { + RowOfNum += " " + n + " |"; + } else if (n > 9 && n < 100) { + RowOfNum += " " + n + " |"; + } else { + RowOfNum += n + " |"; + } + } + MultiTable += RowOfNum + "\n"; + } + return MultiTable; } } diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..855a495 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -3,19 +3,44 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - return null; + String StarRow = ""; + for (Integer i = 0; i < numberOfStars; i++) { + StarRow += "*"; + } + return StarRow; } public static String getTriangle(int numberOfRows) { - return null; + String str1 = ""; + + //for each iteration of the loop, str1 concatenates with the output of the function + for (Integer i = 0; i < numberOfRows; i++) { + str1 += TriangleUtilities.getRow(i+1) + "\n"; + } + + return str1; } public static String getSmallTriangle() { - return null; + String SmallTri = ""; + + //same as getTriangle, but limited to 4 loops (0, 1, 2, 3) + for (Integer i = 0; i < 4; i++) { + SmallTri += TriangleUtilities.getRow(i+1) + "\n"; + } + + return SmallTri; } public static String getLargeTriangle() { - return null; + String LargeTri = ""; + + //same as getTriangle, but limited to 9 loops (0 - 8) + for (Integer i = 0; i < 9; i++) { + LargeTri += TriangleUtilities.getRow(i+1) + "\n"; + } + + return LargeTri; } } diff --git a/package.bluej b/package.bluej index 028bdd0..bc0a506 100644 --- a/package.bluej +++ b/package.bluej @@ -1,79 +1,103 @@ #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.from=NumberUtilitiesTest +dependency2.to=NumberUtilities dependency2.type=UsesDependency -dependency3.from=TableUtilitiesTest -dependency3.to=TableUtilities +dependency3.from=TriangleUtilitiesTest +dependency3.to=TriangleUtilities 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 +editor.fx.0.height=703 +editor.fx.0.width=1020 +editor.fx.0.x=2731 +editor.fx.0.y=-9 +objectbench.height=149 +objectbench.width=974 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 +package.divider.vertical=0.755868544600939 +package.editor.height=476 +package.editor.width=881 +package.editor.x=1400 +package.editor.y=0 +package.frame.height=703 +package.frame.width=998 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=420 +target1.y=10 +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=610 +target4.y=10 +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=500 +target6.y=90 +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=290 +target8.y=10 +target9.height=50 +target9.name=NumberUtilitiesTest +target9.showInterface=false +target9.type=UnitTestTargetJunit4 +target9.width=120 +target9.x=110 +target9.y=40