Skip to content
Snippets Groups Projects
Commit 55e35eb9 authored by Ethan Carlsson's avatar Ethan Carlsson
Browse files

bugs fixed, gradle tests pass

parent 0e9a7d79
No related branches found
No related tags found
No related merge requests found
...@@ -112,8 +112,14 @@ public class DotsAndBoxesGrid { ...@@ -112,8 +112,14 @@ public class DotsAndBoxesGrid {
} }
// A box is complete if the north and south horizontals and the east and west verticals have all been drawn. // A box is complete if the north and south horizontals and the east and west verticals have all been drawn.
// FIXME: You'll need to fix this code (after writing a test first). if (horizontals[x][y]
return true; && horizontals[x][y+1]
&& verticals[x][y]
&& verticals[x+1][y]) {
return true;
}
return false;
} }
/** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */ /** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
...@@ -139,9 +145,9 @@ public class DotsAndBoxesGrid { ...@@ -139,9 +145,9 @@ public class DotsAndBoxesGrid {
if (y >= height || y < 0) { if (y >= height || y < 0) {
throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height)); throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height));
} }
if (this.horizontals[x][y] == true) {
// FIXME: You need to throw an exception if the line was already drawn. throw new IllegalStateException("You cannot draw on a new line ontop of an already existing line");
}
this.horizontals[x][y] = true; this.horizontals[x][y] = true;
// Try to claim the north or south boxes // Try to claim the north or south boxes
...@@ -170,8 +176,9 @@ public class DotsAndBoxesGrid { ...@@ -170,8 +176,9 @@ public class DotsAndBoxesGrid {
if (y >= height - 1 || y < 0) { if (y >= height - 1 || y < 0) {
throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height - 1)); throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height - 1));
} }
if (this.verticals[x][y] == true) {
// You need to throw an exception if the line was already drawn. throw new IllegalStateException("You cannot draw on a new line ontop of an already existing line");
}
this.verticals[x][y] = true; this.verticals[x][y] = true;
// Try to claim the north or south boxes // Try to claim the north or south boxes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment