Bram-Hub · jac-oblong · Nov 17, 2023 · Sep 30, 2023 · Oct 5, 2023 · Oct 5, 2023
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/bin/main/edu/rpi/legup/log4j2.properties b/bin/main/edu/rpi/legup/log4j2.properties
@@ -1,15  1,15 @@
-# Logging level
-# Root logger option
-log4j.rootLogger=DEBUG, stdout, file
-# Redirect log messages to console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p     %c{1}:%L - %m%n
-# Redirect log messages to a log file, support file rolling.
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=Legup.log
-log4j.appender.file.MaxFileSize=5MB
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
 # Logging level
 # Root logger option
 log4j.rootLogger=DEBUG, stdout, file
 # Redirect log messages to console
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p     %c{1}:%L - %m%n
 # Redirect log messages to a log file, support file rolling.
 log4j.appender.file=org.apache.log4j.RollingFileAppender
 log4j.appender.file.File=Legup.log
 log4j.appender.file.MaxFileSize=5MB
 log4j.appender.file.MaxBackupIndex=10
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/CannotFillMiddle b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/CannotFillMiddle
diff --git a/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath b/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath
diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath
diff --git a/.../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners b/.../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners
diff --git a/...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle b/...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed
diff --git a/...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed b/...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed
diff --git a/...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed b/...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed
diff --git a/src/test/java/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRuleTest.java
@@ -30,6  30,9 @@ public static void setUp() {
         nurikabe = new Nurikabe();
     }
 
     /**
      * Tests the Black Between Regions direct rule for regions that are diagonal to each other (diagonal going from top left to bottom right)
      */
     @Test
     public void BlackBetweenRegionsDirectRule_DiagonalBlackBetweenRegions1Test() throws InvalidFileFormatException {
         TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/DiagonalBlackBetweenRegions1", nurikabe);
@@ -62,6  65,9 @@ public void BlackBetweenRegionsDirectRule_DiagonalBlackBetweenRegions1Test() thr
         }
     }
 
     /**
      * Tests the Black Between Regions direct rule for regions that are diagonal to each other (diagonal going from bottom left to top right)
      */
     @Test
     public void BlackBetweenRegionsDirectRule_DiagonalBlackBetweenRegions2Test() throws InvalidFileFormatException {
         TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/DiagonalBlackBetweenRegions2", nurikabe);
@@ -94,6  100,9 @@ public void BlackBetweenRegionsDirectRule_DiagonalBlackBetweenRegions2Test() thr
         }
     }
 
     /**
      * Tests the Black Between Regions direct rule for regions that are horizontally opposite each other
      */
     @Test
     public void BlackBetweenRegionsDirectRule_HorizontalBlackBetweenRegionsTest() throws InvalidFileFormatException {
         TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/HorizontalBlackBetweenRegions", nurikabe);
@@ -123,6  132,9 @@ public void BlackBetweenRegionsDirectRule_HorizontalBlackBetweenRegionsTest() th
         }
     }
 
     /**
      * Tests the Black Between Regions direct rule for regions that are vertically opposite each other
      */
     @Test
     public void BlackBetweenRegionsDirectRule_VerticalBlackBetweenRegionsTest() throws InvalidFileFormatException {
         TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/VerticalBlackBetweenRegions", nurikabe);

diff --git a/src/test/java/puzzles/nurikabe/rules/BlackBottleNeckDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/BlackBottleNeckDirectRuleTest.java
@@ -27,6  27,9 @@ public static void setUp() {
         nurikabe = new Nurikabe();
     }
 
     /**
      * Tests the Black BottleNeck direct rule for a bottleneck in the center of the board
      */
     @Test
     public void BlackBottleNeckDirectRule_TwoSurroundBlackTest() throws InvalidFileFormatException {
         TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBottleNeckDirectRule/SimpleBlackBottleNeck", nurikabe);
@@ -54,4  57,64 @@ public void BlackBottleNeckDirectRule_TwoSurroundBlackTest() throws InvalidFileF
             }
         }
     }
 
 
     /**
      * Tests the Black BottleNeck direct rule for a bottleneck in the corner of the board
      */
     @Test
     public void BlackBottleNeckDirectRule_CornerBottleneck() throws InvalidFileFormatException{
         TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBottleNeckDirectRule/CornerBottleNeck", nurikabe);
         TreeNode rootNode = nurikabe.getTree().getRootNode();
         TreeTransition transition = rootNode.getChildren().get(0);
         transition.setRule(RULE);
 
         NurikabeBoard board = (NurikabeBoard)transition.getBoard();
         NurikabeCell cell = board.getCell(0,1);
         cell.setData(NurikabeType.BLACK.toValue());
 
         board.addModifiedData(cell);
 
         Assert.assertNull(RULE.checkRule(transition));
 
         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(cell.getLocation())){
                     Assert.assertNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
                 }
                 else {
                     Assert.assertNotNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
                 }
             }
         }
     }
 
 
     /**
      * Tests the Black BottleNeck direct rule for a false bottleneck
      */
     @Test
     public void BlackBottleNeckDirectRule_FalseBottleneck() throws InvalidFileFormatException{
         TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBottleNeckDirectRule/FalseBottleNeck", nurikabe);
         TreeNode rootNode = nurikabe.getTree().getRootNode();
         TreeTransition transition = rootNode.getChildren().get(0);
         transition.setRule(RULE);
 
         NurikabeBoard board = (NurikabeBoard)transition.getBoard();
         NurikabeCell cell = board.getCell(0,1);
         cell.setData(NurikabeType.BLACK.toValue());
 
         board.addModifiedData(cell);
 
         Assert.assertNotNull(RULE.checkRule(transition));
 
         for(int i = 0; i < board.getHeight(); i  ){
             for(int k = 0; k < board.getWidth(); k  ){
                 Assert.assertNotNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
             }
         }
     }
 }