From 55e35eb9710c025539d9ef9527f7694d7f201426 Mon Sep 17 00:00:00 2001
From: Ethan Carlsson <ecarlsso@myune.edu.au>
Date: Wed, 21 Jul 2021 23:58:03 +0200
Subject: [PATCH] bugs fixed, gradle tests pass
---
.../java/dotsandboxes/DotsAndBoxesGrid.java | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
index 4f774b1..1efe658 100644
--- a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+++ b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
@@ -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.
- // FIXME: You'll need to fix this code (after writing a test first).
- return true;
+ if (horizontals[x][y]
+ && 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. */
@@ -139,9 +145,9 @@ 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 (this.horizontals[x][y] == true) {
+ throw new IllegalStateException("You cannot draw on a new line ontop of an already existing line");
+ }
this.horizontals[x][y] = true;
// Try to claim the north or south boxes
@@ -170,8 +176,9 @@ 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.
+ if (this.verticals[x][y] == true) {
+ throw new IllegalStateException("You cannot draw on a new line ontop of an already existing line");
+ }
this.verticals[x][y] = true;
// Try to claim the north or south boxes
--
GitLab