From cb0efb8ed5141d3a7f3d2510663eae96ef31543c Mon Sep 17 00:00:00 2001
From: Sean Clark <sclark94@myune.edu.au>
Date: Tue, 1 Aug 2023 14:14:51 +1000
Subject: [PATCH] Fix square completion and already drawn line bugs
---
src/main/java/dotsandboxes/DotsAndBoxesGrid.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
index a9e7c5b..7191ac4 100644
--- a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+++ b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
@@ -112,7 +112,8 @@ public class DotsAndBoxesGrid {
// 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;
+ // Check if all four sides of the box are drawn
+ return verticals[x][y] && verticals[x + 1][y] && horizontals[x][y] && horizontals[x][y + 1];
}
/** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
@@ -138,8 +139,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.
+ if (horizontals[x][y]) {
+ throw new IllegalStateException("Horizontal line already drawn.");
+ }
this.horizontals[x][y] = true;
@@ -169,8 +172,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.
+ // FIXME: You need to throw an exception if the line was already drawn.
+ if (verticals[x][y]) {
+ throw new IllegalStateException("Vertical line already drawn.");
+ }
this.verticals[x][y] = true;
// Try to claim the north or south boxes
--
GitLab