From cdb335a6c236f97ee9cc07db9fd6fe5b73dfed9e Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Sun, 7 Mar 2021 10:43:39 -0500 Subject: [PATCH 1/5] All tests passing --- NumberUtilities.java | 64 ++++++++++++++++++++++++++++++++++++---- NumberUtilitiesTest.java | 6 ++-- 2 files changed, 62 insertions(+), 8 deletions(-) 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 From 0a8629cd050c773875e70d8ee3753227272e2243 Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Sun, 7 Mar 2021 14:29:28 -0500 Subject: [PATCH 2/5] tests passing on numbers. Not triangles or table Please enter the commit message for your changes. Lines starting --- TriangleUtilities.java | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 8755fd0..1b1a8a3 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -3,12 +3,40 @@ 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; + } + return output; } public static String getTriangle(int numberOfRows) { - return null; - } + int i, j; + String output = ""; + // outer loop to handle number of rows + // n in this case + for(i=0; i<=numberOfRows; i++) + { String holder = ""; + + // inner loop to handle number of columns + // values changing acc. to outer loop + for(j=0; j Date: Mon, 8 Mar 2021 19:19:54 -0500 Subject: [PATCH 3/5] triangles utilities tests passing --- TriangleUtilities.java | 24 ++++++--------------- TriangleUtilitiesTest.java | 44 +++++++++++++++++++------------------- package.bluej | 34 ++++++++++++++--------------- 3 files changed, 46 insertions(+), 56 deletions(-) diff --git a/TriangleUtilities.java b/TriangleUtilities.java index 1b1a8a3..f4d808b 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -10,28 +10,18 @@ public static String getRow(int numberOfStars) { String strStars = Character.toString(starArr[i]); output += strStars; } + System.out.print(output); return output; } public static String getTriangle(int numberOfRows) { - int i, j; - String output = ""; - // outer loop to handle number of rows - // n in this case - for(i=0; i<=numberOfRows; i++) - { String holder = ""; - - // inner loop to handle number of columns - // values changing acc. to outer loop - for(j=0; j Date: Mon, 8 Mar 2021 19:22:14 -0500 Subject: [PATCH 4/5] NOW all triangles are passing --- TriangleUtilities.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/TriangleUtilities.java b/TriangleUtilities.java index f4d808b..7f35d1f 100644 --- a/TriangleUtilities.java +++ b/TriangleUtilities.java @@ -30,10 +30,28 @@ public static String getTriangle(int numberOfRows) { 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; } } From 5a6aef21e6cfdd2226121833351af9946ddae6fa Mon Sep 17 00:00:00 2001 From: Greg Donnelly Date: Tue, 9 Mar 2021 14:52:55 -0500 Subject: [PATCH 5/5] formatting isn't exact, but the number outputs are correct for tables --- TableUtilities.java | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) 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; } }