diff --git a/NumberUtilities.java b/NumberUtilities.java index 1d5ba50..1ea2e04 100644 --- a/NumberUtilities.java +++ b/NumberUtilities.java @@ -4,29 +4,81 @@ public class NumberUtilities { public static String getRange(int stop) { - return null; + String placeHolder = ""; + int[] intArr = new int[stop]; + for (int i = 0; i < stop; i++) { + intArr[i] = i; + String intStr = Integer.toString(intArr[i]); + placeHolder += intStr; + } + return placeHolder; } + public static String getRange(int start, int stop) { - return null; + String placeHolder = ""; + int[] intArr = new int[stop]; + for (int i = start; i < stop; i++) { + intArr[i] = i; + String intStr = Integer.toString(intArr[i]); + placeHolder += intStr; + } + return placeHolder; } public static String getRange(int start, int stop, int step) { - return null; + String placeHolder = ""; + int[] intArr = new int[stop]; + for (int i = start; i < stop; i += step) { + intArr[i] = i; + String intStr = Integer.toString(intArr[i]); + placeHolder += intStr; + } + return placeHolder; } public static String getEvenNumbers(int start, int stop) { - return null; + String placeHolder = ""; + int[] intArr = new int[stop]; + if (start % 2 == 1) { + start += 1; + } + for (int i = start; i < stop; i += 2) { + intArr[i] = i; + String intStr = Integer.toString(intArr[i]); + placeHolder += intStr; + } + return placeHolder; } public static String getOddNumbers(int start, int stop) { - return null; + String placeHolder = ""; + int[] intArr = new int[stop]; + if (start % 2 == 0) { + start += 1; + } + for (int i = start; i < stop; i += 2) { + intArr[i] = i; + String intStr = Integer.toString(intArr[i]); + placeHolder += intStr; + } + return placeHolder; } public static String getExponentiations(int start, int stop, int exponent) { - return null; + String placeHolder = ""; + int[] intArr = new int[stop]; + int intInt = start; + double intDbl = intInt; + for (int i = 0; i <= stop - start; i++) { + intArr[i] = (int) Math.pow(intDbl, exponent); + String intStr = Integer.toString(intArr[i]); + placeHolder += intStr; + intDbl++; + } + return placeHolder; } } diff --git a/NumberUtilitiesTest.java b/NumberUtilitiesTest.java index 0fb929f..defa0e0 100644 --- a/NumberUtilitiesTest.java +++ b/NumberUtilitiesTest.java @@ -151,9 +151,10 @@ public void testGetOddNumbersStartAndEndAtOdd() { // : Then Assert.assertEquals(expected, actual); } - + + @Test public void testGetOddNumbersStartAndEndAtEven() { - // : Given + // : Given`` String expected = "579111315"; int start = 4; int stop = 16; @@ -166,6 +167,7 @@ public void testGetOddNumbersStartAndEndAtEven() { } + @Test public void testGetExponentiationNumbersForSquare() { // : Given diff --git a/TableUtilities.java b/TableUtilities.java index 03bf004..02332f5 100644 --- a/TableUtilities.java +++ b/TableUtilities.java @@ -2,14 +2,47 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + int i, j; + String output = ""; + for (i = 1; i <= 5; i++) { + String middleMan = ""; + for (j = 1; j <= 5; j++) { + middleMan += " " + (j*i) + " |"; + } + middleMan += "\n"; + output += middleMan; + } + System.out.print(output); + return output; } public static String getLargeMultiplicationTable() { - return null; + int i, j; + String output = ""; + for (i = 1; i <= 10; i++) { + String middleMan = ""; + for (j = 1; j <= 10; j++) { + middleMan += " " + (j*i) + " |"; + } + middleMan += "\n"; + output += middleMan; + } + System.out.print(output); + return output; } public static String getMultiplicationTable(int tableSize) { - return null; + int i, j; + String output = ""; + for (i = 1; i <= tableSize; i++) { + String middleMan = ""; + for (j = 1; j <= tableSize; j++) { + middleMan += " " + (j*i) + " |"; + } + middleMan += "\n"; + output += middleMan; + } + System.out.print(output); + return output; } } diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..7f35d1f 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -3,19 +3,55 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - return null; + String output = ""; + char[] starArr = new char[numberOfStars]; + for (int i = 0; i < numberOfStars; i++) { + starArr[i] = '*'; + String strStars = Character.toString(starArr[i]); + output += strStars; + } + System.out.print(output); + return output; } public static String getTriangle(int numberOfRows) { - return null; - } + int i, j; + String output = ""; + for (i = 0; i < numberOfRows; i++) { + for (j = 0; j <= i; j++) { + output += "*"; + } + output += "\n"; + } + System.out.print(output); + return output; + } + public static String getSmallTriangle() { - return null; + int i, j; + String output = ""; + for (i = 0; i < 4; i++) { + for (j = 0; j <= i; j++) { + output += "*"; + } + output += "\n"; + } + System.out.print(output); + return output; } public static String getLargeTriangle() { - return null; + int i, j; + String output = ""; + for (i = 0; i < 9; i++) { + for (j = 0; j <= i; j++) { + output += "*"; + } + output += "\n"; + } + System.out.print(output); + return output; } } diff --git a/TriangleUtilitiesTest.java b/TriangleUtilitiesTest.java index abead8a..e8d074d 100644 --- a/TriangleUtilitiesTest.java +++ b/TriangleUtilitiesTest.java @@ -1,4 +1,4 @@ - + import org.junit.Assert; @@ -11,23 +11,23 @@ public void testGetRow_ForSmallWidth(){ //Given String expected = "*"; int width = 1; - + //When String actual = TriangleUtilities.getRow(width); - + //Then Assert.assertEquals(expected, actual); } - + @Test public void testGetRow_ForBigWidth() { //Given String expected = "********************"; int width = 20; - + //When String actual = TriangleUtilities.getRow(width); - + //Then Assert.assertEquals(expected, actual); } @@ -39,30 +39,30 @@ public void testGetTriangle_ForOneRow() { // When String actual = TriangleUtilities.getTriangle(1); - + // Then Assert.assertEquals(expected, actual); } - + @Test public void testGetTriangle_ForSmallTriangle() { // Given String expected = - "*\n" + + "*\n" + "**\n" + "***\n"; // When String actual = TriangleUtilities.getTriangle(3); - + // Then Assert.assertEquals(expected, actual); } - + @Test public void testGetTriangle_ForBigTriangle() { String expected = - "*\n" + + "*\n" + "**\n" + "***\n" + "****\n" + @@ -80,14 +80,14 @@ public void testGetTriangle_ForBigTriangle() { public void testGetLargeTriangle() { String expected = "*\n" + - "**\n" + - "***\n" + - "****\n" + - "*****\n" + - "******\n" + - "*******\n" + - "********\n" + - "*********\n"; + "**\n" + + "***\n" + + "****\n" + + "*****\n" + + "******\n" + + "*******\n" + + "********\n" + + "*********\n"; String actual = TriangleUtilities.getLargeTriangle(); Assert.assertEquals(expected, actual); } @@ -96,11 +96,11 @@ public void testGetLargeTriangle() { @Test public void testGetSmallTriangle() { String expected = - "*\n" + + "*\n" + "**\n" + "***\n" + "****\n"; String actual = TriangleUtilities.getSmallTriangle(); Assert.assertEquals(expected, actual); } -} +} \ No newline at end of file diff --git a/package.bluej b/package.bluej index 028bdd0..07d884b 100644 --- a/package.bluej +++ b/package.bluej @@ -1,27 +1,27 @@ #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 -objectbench.width=484 +editor.fx.0.height=0 +editor.fx.0.width=0 +editor.fx.0.x=0 +editor.fx.0.y=0 +objectbench.height=136 +objectbench.width=1256 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.7852852852852853 +package.editor.height=516 +package.editor.width=1162 +package.editor.x=0 +package.editor.y=23 +package.frame.height=724 +package.frame.width=1280 package.numDependencies=3 package.numTargets=6 package.showExtends=true