Skip to content
Snippets Groups Projects
Commit da4899d5 authored by Peter Wallbank's avatar Peter Wallbank
Browse files

Commit bugfixes for code

parent b0c681dd
No related branches found
No related tags found
No related merge requests found
...@@ -110,10 +110,14 @@ public class DotsAndBoxesGrid { ...@@ -110,10 +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;
} }
if ((getHorizontal(x, y) && getHorizontal(x, y + 1) &&
// A box is complete if the north and south horizontals and the east and west verticals have all been drawn. getVertical(x, y) && getVertical(x + 1, y))) {
// FIXME: You'll need to fix this code (after writing a test first). return true;
}
else
{
return true; return true;
} }
/** 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. */
...@@ -140,7 +144,9 @@ public class DotsAndBoxesGrid { ...@@ -140,7 +144,9 @@ public class DotsAndBoxesGrid {
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));
} }
// FIXME: You need to throw an exception if the line was already drawn. if (getHorizontal(x, y)) {
throw new RuntimeException("Line already drawn.");
}
this.horizontals[x][y] = true; this.horizontals[x][y] = true;
...@@ -171,7 +177,9 @@ public class DotsAndBoxesGrid { ...@@ -171,7 +177,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 (getVertical(x, y)) {
throw new RuntimeException("Line already drawn.");
}
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