Skip to content

All tests passing #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregdon13 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

All tests passing #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cdb335a
All tests passing
Mar 7, 2021
0a8629c
tests passing on numbers. Not triangles or table
Mar 7, 2021
5bc3f41
triangles utilities tests passing
Mar 9, 2021
bb3ca0b
NOW all triangles are passing
Mar 9, 2021
5a6aef2
formatting isn't exact, but the number outputs are correct for tables
Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 58 additions & 6 deletions NumberUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
6 changes: 4 additions & 2 deletions NumberUtilitiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -166,6 +167,7 @@ public void testGetOddNumbersStartAndEndAtEven() {
}



@Test
public void testGetExponentiationNumbersForSquare() {
// : Given
Expand Down
39 changes: 36 additions & 3 deletions TableUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
46 changes: 41 additions & 5 deletions TriangleUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
44 changes: 22 additions & 22 deletions TriangleUtilitiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@



import org.junit.Assert;
Expand All @@ -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);
}
Expand All @@ -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" +
Expand All @@ -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);
}
Expand All @@ -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);
}
}
}
34 changes: 17 additions & 17 deletions package.bluej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down