Merge branch 'dev' into some_ux_fix

Bram-Hub · Oct 2, 2023 · 8bdf07a · 8bdf07a
2 parents 0ce1c1c + bcb8629
commit 8bdf07a
Show file tree

Hide file tree

Showing 297 changed files with 1,374 additions and 646 deletions.
diff --git a/bin/main/edu/rpi/legup/legup/config b/bin/main/edu/rpi/legup/legup/config
@@ -27,7 +27,7 @@
         <puzzle name="ShortTruthTable"
             qualifiedClassName="edu.rpi.legup.puzzle.shorttruthtable.ShortTruthTable"
             fileType=".xml"
-            fileCreationDisabled="true"/>
+            fileCreationDisabled="false"/>
         <puzzle name="Sudoku" qualifiedClassName="edu.rpi.legup.puzzle.sudoku.Sudoku"
             fileType=".xml"
             fileCreationDisabled="true"/>

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/bin/main/edu/rpi/legup/puzzle/skyscrapers/rules/TODO.md b/bin/main/edu/rpi/legup/puzzle/skyscrapers/rules/TODO.md
@@ -2,21 +2,21 @@
 
 spreadsheet : https://docs.google.com/spreadsheets/d/1l7aUZtavtysM8dtGnaEIXhBKMRGxekhnLIVoYIHYZi8/edit#gid=0
 
- 1. Basic Rules:
+1. Basic Rules:
     - Come up with better names for 1Edge and FixedMax, they are now more general
- 2. Contradiction Rules:
- 3. Case Rules:
-    - Don't highlight cells when selecting a row/col? 
-      - (override draw() in SkyscrapersElementView)
- 4. Refactoring:
+2. Contradiction Rules:
+3. Case Rules:
+    - Don't highlight cells when selecting a row/col?
+        - (override draw() in SkyscrapersElementView)
+4. Refactoring:
     - document utility functions in the reference sheet, COMMENTS!
     - review and identify dead code
     - remove all these damn print statements (commented ones too if they aren't useful)
     - Edit to allow blank clues
     - Display flags somewhere
- 5. Flags
+5. Flags
     - edit exporter to include flags in xml file format (if needed)
- 6. Documentation
+6. Documentation
     - UML diagram(s)
- 7. Merge Skyscrapers to dev
- 8. Add 5 more easy/med puzzles to skyscrapers
+7. Merge Skyscrapers to dev
+8. Add 5 more easy/med puzzles to skyscrapers
diff --git a/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath b/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath
@@ -1,10 +1,10 @@
-<Legup>
-    <puzzle name="LightUp">
-        <board width="3" height="3">
-            <cells>
-                <cell value="-4" x="0" y="0"/>
-                <cell value="-4" x="2" y="0"/>
-            </cells>
-        </board>
-    </puzzle>
+<Legup>
+    <puzzle name="LightUp">
+        <board width="3" height="3">
+            <cells>
+                <cell value="-4" x="0" y="0"/>
+                <cell value="-4" x="2" y="0"/>
+            </cells>
+        </board>
+    </puzzle>
 </Legup>
diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath
@@ -1,10 +1,10 @@
-<Legup>
-    <puzzle name="LightUp">
-        <board width="3" height="3">
-            <cells>
-                <cell value="-4" x="0" y="0"/>
-                <cell value="-4" x="0" y="2"/>
-            </cells>
-        </board>
-    </puzzle>
+<Legup>
+    <puzzle name="LightUp">
+        <board width="3" height="3">
+            <cells>
+                <cell value="-4" x="0" y="0"/>
+                <cell value="-4" x="0" y="2"/>
+            </cells>
+        </board>
+    </puzzle>
 </Legup>
diff --git a/puzzles files/fillapix/10x10 Fillapix Very Easy/03010000074 b/puzzles files/fillapix/10x10 Fillapix Very Easy/03010000074
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Legup version="2.0.0">
+<Legup version="3.0.0">
     <puzzle name="Fillapix">
-        <board width="10" height="10">
+        <board height="10" width="10">
             <cells>
                 <cell value="2" x="1" y="0"/>
                 <cell value="3" x="2" y="0"/>
@@ -42,5 +42,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Easy/1514228 b/puzzles files/lightup/10x10 Easy/1514228
@@ -30,5 +30,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Easy/1721067 b/puzzles files/lightup/10x10 Easy/1721067
@@ -30,5 +30,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Easy/5403393 b/puzzles files/lightup/10x10 Easy/5403393
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Easy/5774519 b/puzzles files/lightup/10x10 Easy/5774519
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Easy/954498 b/puzzles files/lightup/10x10 Easy/954498
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Hard/5373598 b/puzzles files/lightup/10x10 Hard/5373598
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Hard/573404 b/puzzles files/lightup/10x10 Hard/573404
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Hard/5787104 b/puzzles files/lightup/10x10 Hard/5787104
@@ -30,5 +30,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Hard/8003166 b/puzzles files/lightup/10x10 Hard/8003166
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Hard/8918995 b/puzzles files/lightup/10x10 Hard/8918995
@@ -34,5 +34,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Normal/2761230 b/puzzles files/lightup/10x10 Normal/2761230
@@ -30,5 +30,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Normal/343176 b/puzzles files/lightup/10x10 Normal/343176
@@ -30,5 +30,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Normal/632466 b/puzzles files/lightup/10x10 Normal/632466
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Normal/7752941 b/puzzles files/lightup/10x10 Normal/7752941
@@ -26,5 +26,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/10x10 Normal/8090631 b/puzzles files/lightup/10x10 Normal/8090631
@@ -30,5 +30,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Easy/1412335 b/puzzles files/lightup/14x14 Easy/1412335
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Easy/1949915 b/puzzles files/lightup/14x14 Easy/1949915
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Easy/6778348 b/puzzles files/lightup/14x14 Easy/6778348
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Easy/976495 b/puzzles files/lightup/14x14 Easy/976495
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Easy/9949966 b/puzzles files/lightup/14x14 Easy/9949966
@@ -42,5 +42,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Hard/1974912 b/puzzles files/lightup/14x14 Hard/1974912
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Hard/3618696 b/puzzles files/lightup/14x14 Hard/3618696
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Hard/578987 b/puzzles files/lightup/14x14 Hard/578987
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Hard/8087653 b/puzzles files/lightup/14x14 Hard/8087653
@@ -62,5 +62,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Hard/9554192 b/puzzles files/lightup/14x14 Hard/9554192
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Normal/2659779 b/puzzles files/lightup/14x14 Normal/2659779
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Normal/448333 b/puzzles files/lightup/14x14 Normal/448333
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Normal/5063453 b/puzzles files/lightup/14x14 Normal/5063453
@@ -42,5 +42,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Normal/606275 b/puzzles files/lightup/14x14 Normal/606275
@@ -54,5 +54,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/14x14 Normal/830231 b/puzzles files/lightup/14x14 Normal/830231
@@ -61,5 +61,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/2408448 b/puzzles files/lightup/7x7 Easy/2408448
@@ -18,5 +18,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/2736784 b/puzzles files/lightup/7x7 Easy/2736784
@@ -15,5 +15,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/2855683 b/puzzles files/lightup/7x7 Easy/2855683
@@ -14,5 +14,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/3535701 b/puzzles files/lightup/7x7 Easy/3535701
@@ -18,5 +18,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/393454 b/puzzles files/lightup/7x7 Easy/393454
@@ -15,5 +15,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/4238934 b/puzzles files/lightup/7x7 Easy/4238934
@@ -15,5 +15,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/4604288 b/puzzles files/lightup/7x7 Easy/4604288
@@ -14,5 +14,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>
diff --git a/puzzles files/lightup/7x7 Easy/4608986 b/puzzles files/lightup/7x7 Easy/4608986
@@ -18,5 +18,5 @@
             </cells>
         </board>
     </puzzle>
-    <Solved isSolved="false"/>
+    <solved isSolved="false" lastSaved="--"/>
 </Legup>