diff --git a/NumberUtilities.java b/NumberUtilities.java index 1d5ba50..d68b769 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -4,29 +4,62 @@ public class NumberUtilities { public static String getRange(int stop) { - return null; + String res = ""; + for(int i = 0; i < stop; i++){ + res += i; + } + return res; } public static String getRange(int start, int stop) { - return null; + String res = ""; + for(int i = start; i < stop; i++){ + res += i; + } + return res; } public static String getRange(int start, int stop, int step) { - return null; + String res = ""; + for(int i = start; i < stop; i += step){ + res += i; + } + return res; } public static String getEvenNumbers(int start, int stop) { - return null; + String res = ""; + for(int i = start; i < stop; i++){ + if(i % 2 == 0){ + res += i; + } + } + return res; } public static String getOddNumbers(int start, int stop) { - return null; + String res = ""; + for(int i = start; i < stop; i++){ + if(i % 2 != 0){ + res += i; + } + } + return res; } public static String getExponentiations(int start, int stop, int exponent) { - return null; + String res = ""; + int calculatedValue; + for(int i = start; i <= stop; i++){ + calculatedValue = i; + for(int j = 1; j < exponent; j++){ + calculatedValue *= i; + } + res += calculatedValue; + } + return res; } } diff --git a/README-TableUtilities.md b/README-TableUtilities.md index 535699c..99fc80d 100644 --- a/README-TableUtilities.md +++ b/README-TableUtilities.md @@ -39,7 +39,7 @@ ## `String getSmallMultiplicationTable()` * **Description** * Generate a `String` representation of a multiplication table whose dimensions are `4` by `4` - + ### Example 1 * Sample Script @@ -107,7 +107,7 @@ * **Description** * Generate a `String` representation of a multiplication table whose dimensions are `9` by `9` - + ### Example * Sample Script @@ -176,7 +176,7 @@ * **Description** * Given one integer, `width`, generate a `String` representation of a multiplication table whose dimensions are `width` by `width` - + ### Example 1 * Sample Script diff --git a/README.md b/README.md index 4421908..9e733d9 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,26 @@ -# Leon's Loopy Lab -* Read each of the following `README` files and complete each of the asks. - * [README-NumberUtilities.md](./README-NumberUtilities.md) - * [README-TriangleUtilities.md](./README-TriangleUtilities.md) - * [README-TableUtilities.md](./README-TableUtilities.md) - - - - - - - - - - - - - - - - - - - - - +# Leon's Loopy Lab +* Read each of the following `README` files and complete each of the asks. + * [README-NumberUtilities.md](./README-NumberUtilities.md) + * [README-TriangleUtilities.md](./README-TriangleUtilities.md) + * [README-TableUtilities.md](./README-TableUtilities.md) + + + + + + + + + + + + + + + + + + + + + diff --git a/TableUtilities.java b/TableUtilities.java index 03bf004..9f09367 100644 --- a/TableUtilities.java +++ b/TableUtilities.java @@ -2,14 +2,53 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + String tableResult = ""; + int stringLength = 0; + for(int i = 1; i <= 5; i++){ + for(int j = 1; j <= 5; j++){ + //tableResult += " "; + stringLength = String.valueOf(i * j).length(); + for(int k = 0; k < 3 - stringLength; k++){ + tableResult += " "; + } + tableResult += (i * j) + " |"; + } + tableResult += "\n"; + } + return tableResult; } public static String getLargeMultiplicationTable() { - return null; + String tableResult = ""; + int stringLength = 0; + for(int i = 1; i <= 10; i++){ + for(int j = 1; j <= 10; j++){ + //tableResult += " "; + stringLength = String.valueOf(i * j).length(); + for(int k = 0; k < 3 - stringLength; k++){ + tableResult += " "; + } + tableResult += (i * j) + " |"; + } + tableResult += "\n"; + } + return tableResult; } public static String getMultiplicationTable(int tableSize) { - return null; + String tableResult = ""; + int stringLength = 0; + for(int i = 1; i <= tableSize; i++){ + for(int j = 1; j <= tableSize; j++){ + //tableResult += " "; + stringLength = String.valueOf(i * j).length(); + for(int k = 0; k < 3 - stringLength; k++){ + tableResult += " "; + } + tableResult += (i * j) + " |"; + } + tableResult += "\n"; + } + return tableResult; } -} +} \ No newline at end of file diff --git a/TableUtilitiesTest.java b/TableUtilitiesTest.java index fc078a4..0dd3d16 100644 --- a/TableUtilitiesTest.java +++ b/TableUtilitiesTest.java @@ -55,6 +55,8 @@ public void testGetSmallMultiplicationTable() { " 5 | 10 | 15 | 20 | 25 |\n"; String actual = TableUtilities.getSmallMultiplicationTable(); + System.out.println(expected); + System.out.println(actual); Assert.assertEquals(expected, actual); } diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..7db3a75 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -3,19 +3,44 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - return null; + String result = ""; + for(int i = 0; i < numberOfStars; i++){ + result += "*"; + } + return result; } public static String getTriangle(int numberOfRows) { - return null; + String result = ""; + for(int i = 0; i < numberOfRows; i++){ + for(int j = 0; j <= i; j++){ + result += "*"; + } + result += "\n"; + } + return result; } public static String getSmallTriangle() { - return null; + String result = ""; + for(int i = 0; i < 4; i++){ + for(int j = 0; j <= i; j++){ + result += "*"; + } + result += "\n"; + } + return result; } public static String getLargeTriangle() { - return null; + String result = ""; + for(int i = 0; i < 9; i++){ + for(int j = 0; j <= i; j++){ + result += "*"; + } + result += "\n"; + } + return result; } } diff --git a/package.bluej b/package.bluej index 028bdd0..17debce 100644 --- a/package.bluej +++ b/package.bluej @@ -1,79 +1,103 @@ #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 -objectbench.width=484 +editor.fx.0.x=320 +editor.fx.0.y=56 +objectbench.height=165 +objectbench.width=645 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.7700534759358288 +package.editor.height=569 +package.editor.width=551 +package.editor.x=150 +package.editor.y=42 +package.frame.height=806 +package.frame.width=669 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=10 +target1.y=210 +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=10 +target4.y=210 +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=10 +target6.y=360 +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=10 +target8.y=210 +target9.height=50 +target9.name=NumberUtilitiesTest +target9.showInterface=false +target9.type=UnitTestTargetJunit4 +target9.width=120 +target9.x=110 +target9.y=40