Skip to content
Snippets Groups Projects
Commit 41b353f3 authored by Ben OToole's avatar Ben OToole
Browse files

Fixed the bugs in boxComplete(), drawHorizontal() and drawVertical()

parent 9114ee1c
No related branches found
No related tags found
No related merge requests found
......@@ -110,10 +110,9 @@ public class DotsAndBoxesGrid {
if (x >= width - 1 || x < 0 || y >= height - 1 || y < 0) {
return false;
}
// 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).
return true;
// Bug was fixed with the following return statement.
return this.horizontals[x][y] && this.horizontals[x][y+1] && this.verticals[x][y] && this.verticals[x+1][y];
}
/** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
......@@ -139,8 +138,10 @@ public class DotsAndBoxesGrid {
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));
}
// FIXME: You need to throw an exception if the line was already drawn.
// IllegalStateException thrown if the line was already drawn.
if (horizontals[x][y]){
throw new IllegalStateException("Line already drawn");
}
this.horizontals[x][y] = true;
......@@ -170,8 +171,10 @@ public class DotsAndBoxesGrid {
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));
}
// You need to throw an exception if the line was already drawn.
// IllegalStateException thrown if the line was already drawn.
if (verticals[x][y]) {
throw new IllegalStateException("Line already drawn");
}
this.verticals[x][y] = true;
// 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