Merge pull request Bram-Hub#800 from B-McCusker56/binary

Added final rule images, adjusted naming conventions for rule images,…
B-McCusker56 · Apr 12, 2024 · 5d9064a · 5d9064a
2 parents 10efd8b + 51b5646
commit 5d9064a
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/edu/rpi/legup/puzzle/binary/rules/DuplicateRowsOrColumnsContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/binary/rules/DuplicateRowsOrColumnsContradictionRule.java
@@ -18,7 +18,7 @@ public DuplicateRowsOrColumnsContradictionRule() {
         super("BINA-CONT-0003",
                 "Duplicate Rows Or Columns",
                 "There must not be two rows or two columns that are duplicates",
-                "edu/rpi/legup/images/binary/rules/DuplicateRowsContradictionRule.png");
+                "edu/rpi/legup/images/binary/rules/DuplicateRowOrColumnContradictionRule.png");
     }
 
     @Override

diff --git a/src/main/java/edu/rpi/legup/puzzle/binary/rules/ThreeAdjacentContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/binary/rules/ThreeAdjacentContradictionRule.java
@@ -14,7 +14,7 @@ public ThreeAdjacentContradictionRule() {
         super("BINA-CONT-0001",
                 "Three Adjacent",
                 "There must not be three adjacent zeros or three adjacent ones in a row or column",
-                "edu/rpi/legup/images/binary/rules/ThreeAdjacentZerosContradictionRule.png");
+                "edu/rpi/legup/images/binary/rules/ThreeAdjacentContradictionRule.png");
     }
 
     @Override

diff --git a/src/main/java/edu/rpi/legup/puzzle/binary/rules/UnbalancedRowOrColumnContradictionRule.java b/src/main/java/edu/rpi/legup/puzzle/binary/rules/UnbalancedRowOrColumnContradictionRule.java
@@ -17,7 +17,7 @@ public UnbalancedRowOrColumnContradictionRule() {
         super("BINA-CONT-0002",
                 "Unbalanced Row Or Column",
                 "Each row or column must contain an equal number of zeros and ones",
-                "edu/rpi/legup/images/binary/rules/UnbalancedRowContradictionRule.png");
+                "edu/rpi/legup/images/binary/rules/UnbalancedRowColumnContradictionRule.png");
     }
 
     @Override

diff --git a/...ain/resources/edu/rpi/legup/images/binary/rules/CompleteRowColumnDirectRule.png b/...ain/resources/edu/rpi/legup/images/binary/rules/CompleteRowColumnDirectRule.png
diff --git a/...sources/edu/rpi/legup/images/binary/rules/DuplicateColumnsContradictionRule.png b/...sources/edu/rpi/legup/images/binary/rules/DuplicateColumnsContradictionRule.png
diff --git a/...ces/edu/rpi/legup/images/binary/rules/DuplicateRowOrColumnContradictionRule.png b/...ces/edu/rpi/legup/images/binary/rules/DuplicateRowOrColumnContradictionRule.png
diff --git a/.../resources/edu/rpi/legup/images/binary/rules/DuplicateRowsContradictionRule.png b/.../resources/edu/rpi/legup/images/binary/rules/DuplicateRowsContradictionRule.png
diff --git a/src/main/resources/edu/rpi/legup/images/binary/rules/OneOrZeroCaseRule.png b/src/main/resources/edu/rpi/legup/images/binary/rules/OneOrZeroCaseRule.png
diff --git a/src/main/resources/edu/rpi/legup/images/binary/rules/OneTileGapDirectRule.png b/src/main/resources/edu/rpi/legup/images/binary/rules/OneTileGapDirectRule.png
diff --git a/src/main/resources/edu/rpi/legup/images/binary/rules/SurroundPairDirectRule.png b/src/main/resources/edu/rpi/legup/images/binary/rules/SurroundPairDirectRule.png
diff --git a/.../resources/edu/rpi/legup/images/binary/rules/ThreeAdjacentContradictionRule.png b/.../resources/edu/rpi/legup/images/binary/rules/ThreeAdjacentContradictionRule.png
diff --git a/...ources/edu/rpi/legup/images/binary/rules/ThreeAdjacentOnesContradictionRule.png b/...ources/edu/rpi/legup/images/binary/rules/ThreeAdjacentOnesContradictionRule.png
diff --git a/...urces/edu/rpi/legup/images/binary/rules/ThreeAdjacentZerosContradictionRule.png b/...urces/edu/rpi/legup/images/binary/rules/ThreeAdjacentZerosContradictionRule.png
diff --git a/...sources/edu/rpi/legup/images/binary/rules/UnbalancedColumnContradictionRule.png b/...sources/edu/rpi/legup/images/binary/rules/UnbalancedColumnContradictionRule.png
diff --git a/...rces/edu/rpi/legup/images/binary/rules/UnbalancedRowColumnContradictionRule.png b/...rces/edu/rpi/legup/images/binary/rules/UnbalancedRowColumnContradictionRule.png
diff --git a/.../resources/edu/rpi/legup/images/binary/rules/UnbalancedRowContradictionRule.png b/.../resources/edu/rpi/legup/images/binary/rules/UnbalancedRowContradictionRule.png