Bug fix for X Within Y direct rules

summerhenson · Jul 16, 2024 · 2e62d41 · 2e62d41
1 parent f32fe76
commit 2e62d41
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 12 deletions.
diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRegionsDirectRule.java
@@ -57,9 +57,9 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
             for (int i = 0; i < regionsToCheck.size(); ++i) {
                 int r = regionsToCheck.get(i);
                 regionStars += board.getRegion(r).numStars();
-                for (PuzzleElement c : board.getRegion(r).getCells()) {
+                for (StarBattleCell c : board.getRegion(r).getCells()) {
                     int column = ((StarBattleCell) c).getLocation().x;
-                    if (column != cell.getLocation().x && ((StarBattleCell) c).getType() == StarBattleCellType.UNKNOWN && columns.add(column)) {
+                    if (column != cell.getLocation().x && c.getType() == StarBattleCellType.UNKNOWN && columns.add(column)) {
                         columnsToCheck.add(column);
                     }
                 }

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/ColumnsWithinRowsDirectRule.java
@@ -61,9 +61,9 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
             for (int i = 0; i < rowsToCheck.size(); ++i) {
                 int r = rowsToCheck.get(i);
                 rowStars += board.rowStars(r);
-                for (PuzzleElement c : board.getRow(r)) {
-                    int column = ((StarBattleCell) c).getLocation().x;
-                    if (columns.add(column)) {
+                for (StarBattleCell c : board.getRow(r)) {
+                    int column = c.getLocation().x;
+                    if (c.getType() == StarBattleCellType.UNKNOWN && columns.add(column)) {
                         columnsToCheck.add(column);
                     }
                 }
@@ -73,9 +73,9 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
             for (int i = 0; i < columnsToCheck.size(); ++i) {
                 int c = columnsToCheck.get(i);
                 columnStars += board.columnStars(c);
-                for (PuzzleElement r : board.getCol(c)) {
-                    int row = ((StarBattleCell) r).getLocation().y;
-                    if (rows.add(row)) {
+                for (StarBattleCell r : board.getCol(c)) {
+                    int row = r.getLocation().y;
+                    if (r.getType() == StarBattleCellType.UNKNOWN && rows.add(row)) {
                         rowsToCheck.add(row);
                     }
                 }

diff --git a/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java b/src/main/java/edu/rpi/legup/puzzle/starbattle/rules/RowsWithinRegionsDirectRule.java
@@ -58,9 +58,9 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
             for (int i = 0; i < regionsToCheck.size(); ++i) {
                 int r = regionsToCheck.get(i);
                 regionStars += board.getRegion(r).numStars();
-                for (PuzzleElement ro : board.getRegion(r).getCells()) {
-                    int row = ((StarBattleCell) ro).getLocation().y;
-                    if (rows.add(row)) {
+                for (StarBattleCell ro : board.getRegion(r).getCells()) {
+                    int row = ro.getLocation().y;
+                    if (ro.getType() == StarBattleCellType.UNKNOWN && rows.add(row)) {
                         rowsToCheck.add(row);
                     }
                 }
@@ -72,7 +72,7 @@ public String checkRuleRawAt(TreeTransition transition, PuzzleElement puzzleElem
                 rowStars += board.rowStars(r);
                 for (int i = 0; i < board.getSize(); ++i) {
                     int region = board.getCell(i, r).getGroupIndex();
-                    if (regions.add(region)) {
+                    if (board.getCell(i,r).getType() == StarBattleCellType.UNKNOWN && regions.add(region)) {
                         regionsToCheck.add(region);
                     }
                 }

diff --git a/src/test/java/puzzles/starbattle/rules/ColumnsWithinRegionsDirectRuleTest.java b/src/test/java/puzzles/starbattle/rules/ColumnsWithinRegionsDirectRuleTest.java
@@ -147,6 +147,34 @@ public void ColumnsWithinRegionsDirectRule_TwoColumns()
         }
     }
 
+    @Test
+    public void ColumnsWithinRegionsDirectRule_TwoColumnsWaitAMinute()
+            throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/starbattle/rules/ColumnsWithinRegionsDirectRule/TwoColumns", starbattle);
+        TreeNode rootNode = starbattle.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        StarBattleBoard board = (StarBattleBoard) transition.getBoard();
+        StarBattleCell cell1 = board.getCell(2,1);
+        cell1.setData(StarBattleCellType.BLACK.value);
+        board.addModifiedData(cell1);
+
+        Assert.assertNull(RULE.checkRule(transition));
+
+        Point location1 = new Point(2, 1);
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int k = 0; k < board.getWidth(); k++) {
+                Point point = new Point(k, i);
+                if (point.equals(location1)) {
+                    Assert.assertNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
+                } else {
+                    Assert.assertNotNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
+                }
+            }
+        }
+    }
+
     @Test
     public void ColumnsWithinRegionsDirectRule_TwoColumnsStarOverlap()
             throws InvalidFileFormatException {