Skip to content
Snippets Groups Projects
Commit 4f3467bc authored by atravain's avatar atravain
Browse files

Resolved known bugs in assignment, all unit tests now pass

parent 3ae346ba
No related branches found
No related tags found
No related merge requests found
...@@ -110,11 +110,14 @@ public class DotsAndBoxesGrid { ...@@ -110,11 +110,14 @@ public class DotsAndBoxesGrid {
if (x >= width - 1 || x < 0 || y >= height - 1 || y < 0) { if (x >= width - 1 || x < 0 || y >= height - 1 || y < 0) {
return false; return false;
} }
else if (this.getVertical(x, y) && this.getHorizontal(x, y) && this.getVertical(x + 1, y) &&
// A box is complete if the north and south horizontals and the east and west verticals have all been drawn. this.getHorizontal(x, y + 1)) {
// FIXME: You'll need to fix this code (after writing a test first).
return true; return true;
} }
else {
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. */
private boolean claimBox(int x, int y, int p) { private boolean claimBox(int x, int y, int p) {
...@@ -139,8 +142,9 @@ public class DotsAndBoxesGrid { ...@@ -139,8 +142,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]) {
// FIXME: You need to throw an exception if the line was already drawn. throw new IllegalStateException("This location already has a horizontal line");
}
this.horizontals[x][y] = true; this.horizontals[x][y] = true;
...@@ -171,7 +175,9 @@ public class DotsAndBoxesGrid { ...@@ -171,7 +175,9 @@ public class DotsAndBoxesGrid {
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));
} }
// You need to throw an exception if the line was already drawn. if (this.verticals[x][y]) {
throw new IllegalStateException("This location already has a vertical 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.
Please register or to comment