Merge pull request #353 from ThisMatt/new_puzzle-skyscrapers

Case rules now use preemptive visibility
Bram-Hub · Oct 28, 2022 · ed13589 · ed13589
2 parents 877093c + c737e61
commit ed13589
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/edu/rpi/legup/puzzle/skyscrapers/rules/CellForNumberCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/skyscrapers/rules/CellForNumberCaseRule.java
@@ -77,7 +77,7 @@ public ArrayList<Board> getCasesFor(Board board, PuzzleElement puzzleElement, In
                 passed = passed && DupeRule.checkContradictionAt(newCase,newCell)!=null;
             }
             if(skyscrapersboard.getViewFlag()){
-                PreemptiveTooFewContradictionRule ViewRule = new PreemptiveTooFewContradictionRule();
+                PreemptiveVisibilityContradictionRule ViewRule = new PreemptiveVisibilityContradictionRule();
                 passed = passed && ViewRule.checkContradictionAt(newCase,newCell)!=null;
             }
             if(passed){cases.add(newCase);}

diff --git a/src/main/java/edu/rpi/legup/puzzle/skyscrapers/rules/NumberForCellCaseRule.java b/src/main/java/edu/rpi/legup/puzzle/skyscrapers/rules/NumberForCellCaseRule.java
@@ -65,9 +65,8 @@ public ArrayList<Board> getCases(Board board, PuzzleElement puzzleElement) {
                 passed = passed && DupeRule.checkContradictionAt(newCase,newCell)!=null;
             }
             if(skyscrapersboard.getViewFlag()){
-                InsufficientVisibilityContradictionRule fewRule = new InsufficientVisibilityContradictionRule();
-                ExceedingVisibilityContradictionRule moreRule = new ExceedingVisibilityContradictionRule();
-                passed = passed && fewRule.checkContradictionAt(newCase,newCell)!=null && moreRule.checkContradictionAt(newCase,newCell)!=null;
+                PreemptiveVisibilityContradictionRule ViewRule = new PreemptiveVisibilityContradictionRule();
+                passed = passed && ViewRule.checkContradictionAt(newCase,newCell)!=null;
             }
             //how should unresolved be handled? should it be?
             if(passed){cases.add(newCase);}