PyPI - multi-puzzle-solver - Versions diffs - 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl - Mend

multi-puzzle-solver 0.9.2py3-none-any.whl → 0.9.4py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

{multi_puzzle_solver-0.9.2.dist-info → multi_puzzle_solver-0.9.4.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-puzzle-solver
-Version: 0.9.2
+Version: 0.9.4
 Summary: Efficient solvers for numerous popular and esoteric logic puzzles using CP-SAT
 Author: Ar-Kareem
 Project-URL: Homepage, https://github.com/Ar-Kareem/puzzle_solver
@@ -89,142 +89,152 @@ These are all the puzzles that are implemented in this repo. <br> Click on any o
 <tr>
   <td align="center">
     <a href="#nonograms-puzzle-type-1"><b>Nonograms</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/nonogram_solved.png" alt="Nonograms" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/nonogram_solved.png" alt="Nonograms" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#sudoku-puzzle-type-2"><b>Sudoku</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/sudoku_solved.png" alt="Sudoku" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/sudoku_solved.png" alt="Sudoku" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#minesweeper-puzzle-type-3"><b>Minesweeper</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/minesweeper_pre.png" alt="Minesweeper" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/minesweeper_pre.png" alt="Minesweeper" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#dominosa-puzzle-type-4"><b>Dominosa</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/dominosa_solved.png" alt="Dominosa" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/dominosa_solved.png" alt="Dominosa" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#light-up-puzzle-type-5"><b>Light Up</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/lightup_solved.png" alt="Light Up" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/lightup_solved.png" alt="Light Up" width="140">
     </a>
   </td>
 </tr>
 <tr>
   <td align="center">
     <a href="#tents-puzzle-type-6"><b>Tents</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/tents_solved.png" alt="Tents" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/tents_solved.png" alt="Tents" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#filling-puzzle-type-7"><b>Filling</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/filling_solved.png" alt="Filling" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/filling_solved.png" alt="Filling" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#keen-puzzle-type-8"><b>Keen</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/keen_solved.png" alt="Keen" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/keen_solved.png" alt="Keen" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#towers-puzzle-type-9"><b>Towers</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/towers_solved.png" alt="Towers" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/towers_solved.png" alt="Towers" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#singles-puzzle-type-10"><b>Singles</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/singles_solved.png" alt="Singles" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/singles_solved.png" alt="Singles" width="140">
     </a>
   </td>
 </tr>
 <tr>
   <td align="center">
     <a href="#magnets-puzzle-type-11"><b>Magnets</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/magnets_solved.png" alt="Magnets" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/magnets_solved.png" alt="Magnets" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#signpost-puzzle-type-12"><b>Signpost</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/signpost_solved.png" alt="Signpost" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/signpost_solved.png" alt="Signpost" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#range-puzzle-type-13"><b>Range</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/range_solved.png" alt="Range" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/range_solved.png" alt="Range" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#undead-puzzle-type-14"><b>Undead</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/undead_solved.png" alt="Undead" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/undead_solved.png" alt="Undead" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#unruly-puzzle-type-15"><b>Unruly</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/unruly_solved.png" alt="Unruly" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/unruly_solved.png" alt="Unruly" width="140">
     </a>
   </td>
 </tr>
 <tr>
   <td align="center">
     <a href="#tracks-puzzle-type-16"><b>Tracks</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/tracks_solved.png" alt="Tracks" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/tracks_solved.png" alt="Tracks" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#mosaic-puzzle-type-17"><b>Mosaic</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/mosaic_solved.png" alt="Mosaic" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/mosaic_solved.png" alt="Mosaic" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#map-puzzle-type-18"><b>Map</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/map_solved.png" alt="Map" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/map_solved.png" alt="Map" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#pearl-puzzle-type-19"><b>Pearl</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/pearl_solved.png" alt="Pearl" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/pearl_solved.png" alt="Pearl" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#bridges-puzzle-type-20"><b>Bridges</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/bridges_solved.png" alt="Bridges" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/bridges_solved.png" alt="Bridges" width="140">
     </a>
   </td>
 </tr>
 <tr>
   <td align="center">
     <a href="#inertia-puzzle-type-21"><b>Inertia</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/inertia_unsolved.png" alt="Inertia" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/inertia_unsolved.png" alt="Inertia" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#guess-puzzle-type-22"><b>Guess</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/guess_3.png" alt="Guess" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/guess_3.png" alt="Guess" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#chess-range-puzzle-type-23"><b>Chess Range</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/chess_range_unsolved.png" alt="Chess range" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/chess_range_unsolved.png" alt="Chess range" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#chess-solo-puzzle-type-24"><b>Chess Solo</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/chess_solo_unsolved.png" alt="Chess solo" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/chess_solo_unsolved.png" alt="Chess solo" width="140">
     </a>
   </td>
   <td align="center">
     <a href="#chess-melee-puzzle-type-25"><b>Chess Melee</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/chess_melee_unsolved.png" alt="Chess melee" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/chess_melee_unsolved.png" alt="Chess melee" width="140">
     </a>
   </td>
 </tr>
 <tr>
   <td align="center">
     <a href="#thermometers-puzzle-type-26"><b>Thermometers</b><br><br>
-      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/thermometers_unsolved.png" alt="Thermometers" width="200">
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/thermometers_solved.png" alt="Thermometers" width="140">
+    </a>
+  </td>
+  <td align="center">
+    <a href="#aquarium-puzzle-type-27"><b>Aquarium</b><br><br>
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/aquarium_solved.png" alt="Aquarium" width="140">
+    </a>
+  </td>
+  <td align="center">
+    <a href="#stitches-puzzle-type-28"><b>Stitches</b><br><br>
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/stitches_solved.png" alt="Stitches" width="140">
     </a>
   </td>
 </tr>
@@ -268,6 +278,8 @@ These are all the puzzles that are implemented in this repo. <br> Click on any o
   - [Chess Solo (Puzzle Type #24)](#chess-solo-puzzle-type-24)
   - [Chess Melee (Puzzle Type #25)](#chess-melee-puzzle-type-25)
   - [Thermometers (Puzzle Type #26)](#thermometers-puzzle-type-26)
+  - [Aquarium (Puzzle Type #27)](#aquarium-puzzle-type-27)
+  - [Stitches (Puzzle Type #28)](#stitches-puzzle-type-28)
   - [Why SAT / CP-SAT?](#why-sat--cp-sat)
   - [Testing](#testing)
   - [Contributing](#contributing)
@@ -2117,6 +2129,7 @@ Time taken: 6.24 seconds
   <summary><strong>Rules</strong></summary>
 You have to fill some thermometers with mercury starting from the bulb and going toward the end without gaps.
 The numbers outside the grid show the number of filled cells horizontally and vertically.
 </details>
@@ -2127,8 +2140,6 @@ The numbers outside the grid show the number of filled cells horizontally and ve
 Code to utilize this package and solve the puzzle:
-(Note that this puzzle does not typically have a unique solution. Thus, we specify here that we only want the first valid solution that the solver finds.)
 ```python
 from puzzle_solver import thermometers_solver as solver
 board = np.array([
@@ -2183,6 +2194,162 @@ Time taken: 0.01 seconds
 ---
+## Aquarium (Puzzle Type #27)
+* [**Play online**](https://www.puzzle-aquarium.com/)
+* [**Solver Code**][27]
+<details>
+  <summary><strong>Rules</strong></summary>
+The puzzle is played on a rectangular grid divided into blocks called "aquariums"
+You have to "fill" the aquariums with water up to a certain level or leave it empty.
+The water level in each aquarium is one and the same across its full width
+The numbers outside the grid show the number of filled cells horizontally and vertically.
+</details>
+**Unsolved puzzle**
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/aquarium_unsolved.png" alt="Aquarium unsolved" width="500">
+Code to utilize this package and solve the puzzle:
+```python
+from puzzle_solver import aquarium_solver as solver
+board = np.array([
+  ['01', '01', '01', '01', '02', '02', '02', '03', '03', '03', '03', '04', '05', '05', '05'],
+  ['01', '02', '02', '02', '02', '06', '07', '07', '03', '08', '03', '04', '04', '05', '09'],
+  ['01', '01', '02', '11', '06', '06', '06', '12', '12', '08', '13', '13', '13', '09', '09'],
+  ['01', '11', '11', '11', '14', '06', '06', '12', '12', '15', '15', '13', '09', '09', '09'],
+  ['01', '01', '11', '11', '14', '12', '12', '12', '16', '16', '15', '13', '13', '17', '09'],
+  ['45', '11', '11', '14', '14', '12', '42', '42', '42', '15', '15', '13', '13', '17', '18'],
+  ['45', '11', '11', '14', '14', '12', '12', '43', '15', '15', '20', '13', '13', '17', '18'],
+  ['46', '46', '11', '19', '19', '19', '43', '43', '44', '20', '20', '20', '13', '17', '18'],
+  ['46', '22', '23', '23', '23', '19', '43', '21', '21', '24', '24', '24', '25', '17', '17'],
+  ['22', '22', '22', '23', '19', '19', '26', '24', '24', '24', '28', '28', '25', '17', '33'],
+  ['22', '22', '23', '23', '27', '27', '26', '26', '24', '24', '29', '29', '25', '25', '33'],
+  ['22', '22', '35', '27', '27', '26', '26', '26', '26', '30', '30', '30', '25', '34', '34'],
+  ['37', '22', '35', '35', '35', '35', '35', '26', '26', '30', '31', '31', '32', '32', '40'],
+  ['37', '37', '37', '36', '36', '35', '26', '26', '26', '40', '40', '40', '40', '40', '40'],
+  ['37', '37', '37', '37', '35', '35', '38', '38', '39', '39', '40', '40', '40', '41', '41'],
+])
+top = np.array([6, 6, 5, 3, 3, 4, 7, 6, 9, 6, 3, 4, 9, 6, 7])
+side = np.array([3, 5, 1, 2, 5, 3, 10, 10, 5, 3, 7, 3, 7, 8, 12])
+binst = solver.Board(board=board, top=top, side=side)
+solutions = binst.solve_and_print()
+```
+**Script Output**
+```python
+Solution found
+[['0' '0' '0' '0' '0' '0' '0' '0' '0' '0' '0' '0' '1' '1' '1']
+ ['0' '0' '0' '0' '0' '0' '0' '0' '1' '0' '1' '1' '1' '1' '0']
+ ['0' '0' '0' '0' '0' '0' '0' '0' '0' '1' '0' '0' '0' '0' '0']
+ ['0' '0' '0' '0' '0' '1' '1' '0' '0' '0' '0' '0' '0' '0' '0']
+ ['1' '1' '0' '0' '0' '0' '0' '0' '1' '1' '0' '0' '0' '0' '1']
+ ['0' '0' '0' '0' '0' '0' '1' '1' '1' '0' '0' '0' '0' '0' '0']
+ ['1' '1' '1' '0' '0' '1' '1' '0' '1' '1' '0' '1' '1' '0' '1']
+ ['1' '1' '1' '0' '0' '0' '1' '1' '0' '1' '1' '1' '1' '0' '1']
+ ['1' '0' '0' '0' '0' '0' '1' '1' '1' '0' '0' '0' '1' '0' '0']
+ ['0' '0' '0' '0' '1' '1' '0' '0' '0' '0' '0' '0' '1' '0' '0']
+ ['0' '0' '1' '1' '0' '0' '0' '0' '1' '1' '0' '0' '1' '1' '1']
+ ['0' '0' '0' '0' '0' '0' '0' '0' '0' '0' '0' '0' '1' '1' '1']
+ ['0' '1' '0' '0' '0' '0' '0' '1' '1' '0' '1' '1' '1' '1' '0']
+ ['1' '1' '1' '1' '1' '0' '1' '1' '1' '0' '0' '0' '0' '0' '0']
+ ['1' '1' '1' '1' '1' '1' '1' '1' '1' '1' '0' '0' '0' '1' '1']]
+Solutions found: 1
+status: OPTIMAL
+Time taken: 0.02 seconds
+```
+**Solved puzzle**
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/aquarium_solved.png" alt="Aquarium solved" width="500">
+---
+## Stitches (Puzzle Type #28)
+* [**Play online**](https://www.puzzle-stitches.com/)
+* [**Solver Code**][28]
+<details>
+  <summary><strong>Rules</strong></summary>
+- Connect each block with ALL its neighbor blocks with exactly 1 "stitch" each.
+- A "stitch" connects 2 orthogonally adjacent cells from different blocks.
+- 2 stitches cannot share a hole.
+- The clues outside the grid indicate the number of holes on that row/column
+- For 2÷ puzzles, you have to use 2 stitches to connect neighbor blocks, for 3÷ puzzles - 3 stitches etc.
+</details>
+**Unsolved puzzle**
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/stitches_unsolved.png" alt="Stitches unsolved" width="500">
+Code to utilize this package and solve the puzzle:
+```python
+from puzzle_solver import stitches_solver as solver
+board = np.array([
+  ["00", "00", "00", "00", "00", "01", "01", "01", "01", "01", "01", "01", "01", "02", "02"],
+  ["00", "03", "03", "04", "00", "00", "01", "05", "05", "05", "05", "05", "01", "01", "02"],
+  ["00", "03", "04", "04", "04", "00", "05", "05", "05", "05", "05", "05", "05", "05", "02"],
+  ["00", "03", "04", "04", "04", "04", "05", "05", "06", "05", "02", "02", "02", "02", "02"],
+  ["07", "03", "03", "03", "03", "04", "06", "06", "06", "06", "06", "06", "06", "02", "02"],
+  ["07", "07", "07", "03", "03", "04", "04", "06", "08", "08", "08", "06", "02", "02", "02"],
+  ["07", "07", "03", "03", "03", "04", "04", "08", "08", "08", "08", "06", "06", "06", "02"],
+  ["07", "07", "07", "07", "07", "08", "08", "08", "09", "09", "08", "06", "08", "06", "02"],
+  ["10", "10", "07", "07", "09", "09", "09", "09", "09", "09", "08", "08", "08", "11", "02"],
+  ["10", "10", "07", "09", "09", "09", "09", "09", "09", "09", "09", "08", "08", "11", "02"],
+  ["10", "09", "09", "09", "12", "12", "12", "13", "09", "09", "11", "11", "11", "11", "11"],
+  ["10", "10", "10", "09", "12", "12", "12", "13", "09", "11", "11", "11", "13", "13", "11"],
+  ["14", "15", "10", "12", "12", "16", "17", "13", "13", "11", "13", "13", "13", "13", "11"],
+  ["14", "15", "10", "12", "16", "16", "17", "17", "13", "13", "13", "13", "13", "13", "11"],
+  ["14", "15", "15", "12", "16", "16", "17", "17", "17", "17", "17", "13", "13", "13", "13"]
+])
+top = np.array([6, 6, 9, 5, 3, 8, 9, 3, 1, 4, 4, 1, 4, 8, 5])
+side = np.array([0, 10, 6, 4, 4, 1, 5, 8, 2, 6, 5, 11, 4, 3, 7])
+binst = solver.Board(board=board, top=top, side=side)
+solutions = binst.solve_and_print()
+```
+**Script Output**
+```python
+Solution found
+[[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ ['R' 'L' 'D' 'R' 'L' 'R' 'L' ' ' ' ' ' ' ' ' ' ' 'D' 'R' 'L']
+ [' ' ' ' 'U' ' ' ' ' 'R' 'L' ' ' ' ' ' ' ' ' ' ' 'U' 'R' 'L']
+ ['D' ' ' ' ' ' ' ' ' 'R' 'L' ' ' ' ' 'D' ' ' ' ' ' ' ' ' ' ']
+ ['U' ' ' ' ' ' ' ' ' 'R' 'L' ' ' ' ' 'U' ' ' ' ' ' ' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'D' ' ']
+ [' ' ' ' 'D' ' ' ' ' ' ' 'R' 'L' ' ' 'D' ' ' ' ' ' ' 'U' ' ']
+ [' ' 'D' 'U' ' ' 'R' 'L' ' ' ' ' ' ' 'U' ' ' 'R' 'L' 'D' ' ']
+ [' ' 'U' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'U' ' ']
+ [' ' ' ' 'R' 'L' ' ' ' ' ' ' ' ' ' ' ' ' 'D' ' ' 'R' 'L' 'D']
+ [' ' ' ' 'D' ' ' ' ' ' ' 'R' 'L' ' ' ' ' 'U' ' ' ' ' ' ' 'U']
+ ['D' 'D' 'U' 'R' 'L' 'D' 'D' 'R' 'L' ' ' ' ' ' ' ' ' 'R' 'L']
+ ['U' 'U' ' ' ' ' ' ' 'U' 'U' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ [' ' ' ' 'R' 'L' ' ' ' ' ' ' ' ' ' ' ' ' 'D' ' ' ' ' ' ' ' ']
+ ['R' 'L' 'R' 'L' ' ' 'R' 'L' ' ' ' ' ' ' 'U' ' ' ' ' ' ' ' ']]
+Solutions found: 1
+status: OPTIMAL
+Time taken: 0.01 seconds
+```
+**Solved puzzle**
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/stitches_solved.png" alt="Stitches solved" width="500">
+---
 ---
 ## Why SAT / CP-SAT?
@@ -2260,3 +2427,5 @@ Issues and PRs welcome!
 [24]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/chess_range#chess-solo-puzzle-type-24 "puzzle_solver/src/puzzle_solver/puzzles/chess_range at master · Ar-Kareem/puzzle_solver · GitHub"
 [25]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/chess_range#chess-melee-puzzle-type-25 "puzzle_solver/src/puzzle_solver/puzzles/chess_range at master · Ar-Kareem/puzzle_solver · GitHub"
 [26]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/thermometers "puzzle_solver/src/puzzle_solver/puzzles/thermometers at master · Ar-Kareem/puzzle_solver · GitHub"
+[27]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/aquarium "puzzle_solver/src/puzzle_solver/puzzles/aquarium at master · Ar-Kareem/puzzle_solver · GitHub"
+[28]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/stitches "puzzle_solver/src/puzzle_solver/puzzles/stitches at master · Ar-Kareem/puzzle_solver · GitHub"

{multi_puzzle_solver-0.9.2.dist-info → multi_puzzle_solver-0.9.4.dist-info}/RECORD RENAMED Viewed

@@ -1,6 +1,7 @@
-puzzle_solver/__init__.py,sha256=5mfy5LbHdS064RgwFi88S3-ccHJSuSIOw8ONWwW9n5E,1896
+puzzle_solver/__init__.py,sha256=J4CxLjjSv2Lbfk5spsG42NR1JcQNrspGpt7Yz3EIx9o,2038
 puzzle_solver/core/utils.py,sha256=3LlBDuie_G0uSlzibpQS2ULmEYSZmpJXh1kawj7rjkg,3396
 puzzle_solver/core/utils_ortools.py,sha256=qLTIzmITqmgGZvg8XpYAZ4c-lhD5sEDQfS8ECdQ_dkM,3005
+puzzle_solver/puzzles/aquarium/aquarium.py,sha256=BUfkAS2d9eG3TdMoe1cOGGeNYgKUebRvn-z9nsC9gvE,5708
 puzzle_solver/puzzles/bridges/bridges.py,sha256=zUT0TMIu8l982fqDMJfsTnTgqm48nG0iH8flsGT45_E,5489
 puzzle_solver/puzzles/chess_range/chess_melee.py,sha256=KnfD_Sxd8bso46eQYpIemp4MIqOUNoonyRVe6soK8kc,231
 puzzle_solver/puzzles/chess_range/chess_range.py,sha256=IaldwJR4d0VAUxME2QyvtJdUNzGzDV0FGs1iq9KqsRU,21072
@@ -23,6 +24,8 @@ puzzle_solver/puzzles/pearl/pearl.py,sha256=AP0whWwwZ-1zKingW14OwseYylNAr6NkXSrv
 puzzle_solver/puzzles/range/range.py,sha256=g6ZuHuulYLpNFsqbnPoIB5KoGPllYppU10-Zzqfj5f8,6993
 puzzle_solver/puzzles/signpost/signpost.py,sha256=D19ua8rVwO6sgXq4nVLkZfEyz8hqc6qMOk3j-g44soU,3931
 puzzle_solver/puzzles/singles/singles.py,sha256=kwMENfqQ-OP3YIz5baY6LRcvYCsNfhImEXN00lwazKM,5658
+puzzle_solver/puzzles/stitches/stitches.py,sha256=YvT9WXvUMPLcFGOYXWIPyifCi6caZqRqBTuCgNmcTPQ,6662
+puzzle_solver/puzzles/stitches/parse_map/parse_map.py,sha256=_BcYXtDCieKaPOpjG8BFHaFIkbYvMyuwzLL-TmjFZ2k,8786
 puzzle_solver/puzzles/sudoku/sudoku.py,sha256=M_pry7XyKKzlfCF5rFi02lyOrj5GWZzXnDAxmD3NXvI,3588
 puzzle_solver/puzzles/tents/tents.py,sha256=iyVK2WXfIT5j_9qqlQg0WmwvixwXlZSsHGK3XA-KpII,6283
 puzzle_solver/puzzles/thermometers/thermometers.py,sha256=nsvJZkm7G8FALT27bpaB0lv5E_AWawqmvapQI8QcYXw,4015
@@ -30,7 +33,8 @@ puzzle_solver/puzzles/towers/towers.py,sha256=QvL0Pp-Z2ewCeq9ZkNrh8MShKOh-Y52sFB
 puzzle_solver/puzzles/tracks/tracks.py,sha256=VnAtxBkuUTHJYNXr1JGg0yYzJj3kRMBi8Nz7NHKS94A,9089
 puzzle_solver/puzzles/undead/undead.py,sha256=ygNugW5SOlYLy6d740gZ2IW9UJQ3SAr9vuMm0ZFr2nY,6630
 puzzle_solver/puzzles/unruly/unruly.py,sha256=sDF0oKT50G-NshyW2DYrvAgD9q9Ku9ANUyNhGSAu7cQ,3827
-multi_puzzle_solver-0.9.2.dist-info/METADATA,sha256=0yrFGQEnj6iuXxSuR9BA8aGHT8WTcaW6xcQeElkZK0E,109184
-multi_puzzle_solver-0.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-multi_puzzle_solver-0.9.2.dist-info/top_level.txt,sha256=exwVUQa-anK9vYrpKzBPvH8bX43iElWI4VeNiAyBGJY,14
-multi_puzzle_solver-0.9.2.dist-info/RECORD,,
+puzzle_solver/utils/visualizer.py,sha256=0DP3qs4RC0FDxHNBwPFjk6Y1RDvmLdI1jVFpYweCC00,5878
+multi_puzzle_solver-0.9.4.dist-info/METADATA,sha256=4eFPtWAt3CIxMTbbJVZDxU5NCQie7QlXqfAlkNWR3lc,117546
+multi_puzzle_solver-0.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+multi_puzzle_solver-0.9.4.dist-info/top_level.txt,sha256=exwVUQa-anK9vYrpKzBPvH8bX43iElWI4VeNiAyBGJY,14
+multi_puzzle_solver-0.9.4.dist-info/RECORD,,

puzzle_solver/__init__.py CHANGED Viewed

@@ -1,3 +1,4 @@
+from puzzle_solver.puzzles.aquarium import aquarium as aquarium_solver
 from puzzle_solver.puzzles.bridges import bridges as bridges_solver
 from puzzle_solver.puzzles.chess_range import chess_range as chess_range_solver
 from puzzle_solver.puzzles.chess_range import chess_solo as chess_solo_solver
@@ -17,6 +18,7 @@ from puzzle_solver.puzzles.pearl import pearl as pearl_solver
 from puzzle_solver.puzzles.range import range as range_solver
 from puzzle_solver.puzzles.signpost import signpost as signpost_solver
 from puzzle_solver.puzzles.singles import singles as singles_solver
+from puzzle_solver.puzzles.stitches import stitches as stitches_solver
 from puzzle_solver.puzzles.sudoku import sudoku as sudoku_solver
 from puzzle_solver.puzzles.tents import tents as tents_solver
 from puzzle_solver.puzzles.thermometers import thermometers as thermometers_solver
@@ -27,4 +29,4 @@ from puzzle_solver.puzzles.unruly import unruly as unruly_solver
 from puzzle_solver.puzzles.inertia.parse_map.parse_map import main as inertia_image_parser
-__version__ = '0.9.2'
+__version__ = '0.9.4'

puzzle_solver/puzzles/aquarium/aquarium.py ADDED Viewed

@@ -0,0 +1,112 @@
+import numpy as np
+from ortools.sat.python import cp_model
+from puzzle_solver.core.utils import Pos, get_all_pos, get_char, set_char, get_neighbors4, get_row_pos, get_col_pos
+from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
+def _sanity_check(board: np.array):
+    # percolation check
+    V = board.shape[0]
+    H = board.shape[1]
+    visited: set[Pos] = set()
+    finished_islands: set[int] = set()
+    def dfs(pos: Pos, target_i: int):
+        if pos in visited:
+            return
+        visited.add(pos)
+        for neighbor in get_neighbors4(pos, V, H):
+            if neighbor in visited:
+                continue
+            neighbor_i = int(get_char(board, neighbor))
+            if neighbor_i == target_i:
+                dfs(neighbor, target_i)
+    for pos in get_all_pos(V, H):
+        if pos in visited:
+            continue
+        current_i = int(get_char(board, pos))
+        assert current_i not in finished_islands, f'island {current_i} already finished'
+        dfs(pos, current_i)
+        finished_islands.add(current_i)
+    assert len(finished_islands) == len(set(board.flatten())), 'board is not connected'
+class Board:
+    def __init__(self, board: np.array, top: np.array, side: np.array):
+        assert board.ndim == 2, f'board must be 2d, got {board.ndim}'
+        _sanity_check(board)
+        self.V = board.shape[0]
+        self.H = board.shape[1]
+        assert top.ndim == 1 and top.shape[0] == self.H, 'top must be a 1d array of length board width'
+        assert side.ndim == 1 and side.shape[0] == self.V, 'side must be a 1d array of length board height'
+        assert all((str(c.item()).isdecimal() for c in np.nditer(board))), 'board must contain only digits'
+        self.board = board
+        self.top = top
+        self.side = side
+        self.aquarium_numbers = set([int(c.item()) for c in np.nditer(board)])
+        self.aquariums = {i: [pos for pos in get_all_pos(self.V, self.H) if int(get_char(self.board, pos)) == i] for i in self.aquarium_numbers}
+        self.aquariums_exist_in_row: dict[int, set[int]] = {aq_i: set() for aq_i in self.aquarium_numbers}
+        for aq_i in self.aquarium_numbers:
+            for row in range(self.V):
+                if any(pos.y == row for pos in self.aquariums[aq_i]):
+                    self.aquariums_exist_in_row[aq_i].add(row)
+        self.model = cp_model.CpModel()
+        self.model_vars: dict[Pos, cp_model.IntVar] = {}
+        self.is_aquarium_here: dict[tuple[int, int], cp_model.IntVar] = {}  # is the aquarium here?
+        self.create_vars()
+        self.add_all_constraints()
+    def create_vars(self):
+        for pos in get_all_pos(self.V, self.H):
+            self.model_vars[pos] = self.model.NewBoolVar(f'{pos}')
+        for aq_i in self.aquarium_numbers:
+            for row in self.aquariums_exist_in_row[aq_i]:
+                self.is_aquarium_here[row, aq_i] = self.model.NewBoolVar(f'{row}:{aq_i}')
+    def add_all_constraints(self):
+        for aq_i in self.aquarium_numbers:
+            for pos in self.aquariums[aq_i]:
+                self.model.Add(self.is_aquarium_here[pos.y, aq_i] == 1).OnlyEnforceIf(self.model_vars[pos])
+        # aquarium always start from the bottom
+        for aq_i in self.aquarium_numbers:
+            for row in self.aquariums_exist_in_row[aq_i]:
+                # (row + 1) is below (row)
+                if row + 1 not in self.aquariums_exist_in_row[aq_i]:
+                    continue
+                self.model.Add(self.is_aquarium_here[row + 1, aq_i] == 1).OnlyEnforceIf(self.is_aquarium_here[row, aq_i])
+        for row in range(self.V):
+            for aq_i in self.aquarium_numbers:
+                aq_i_row_pos = [pos for pos in self.aquariums[aq_i] if pos.y == row]
+                for pos in aq_i_row_pos:
+                    # if the aquarium is here, all the squares in the row of this aquarium must be filled
+                    self.model.Add(self.model_vars[pos] == 1).OnlyEnforceIf(self.is_aquarium_here[row, aq_i])
+                # if the aquarium is here, at least one square in the row of this aquarium must be filled
+                if len(aq_i_row_pos) > 0:
+                    self.model.Add(sum([self.model_vars[pos] for pos in aq_i_row_pos]) == len(aq_i_row_pos)).OnlyEnforceIf(self.is_aquarium_here[row, aq_i])
+                    self.model.Add(sum([self.model_vars[pos] for pos in aq_i_row_pos]) == 0).OnlyEnforceIf(self.is_aquarium_here[row, aq_i].Not())
+        # force the top and side constraints
+        for col in range(self.H):
+            self.model.Add(sum([self.model_vars[pos] for pos in get_col_pos(col, self.V)]) == self.top[col])
+        for row in range(self.V):
+            self.model.Add(sum([self.model_vars[pos] for pos in get_row_pos(row, self.H)]) == self.side[row])
+    def solve_and_print(self, verbose: bool = True):
+        def board_to_solution(board: Board, solver: cp_model.CpSolverSolutionCallback) -> SingleSolution:
+            assignment: dict[Pos, int] = {}
+            for pos, var in board.model_vars.items():
+                assignment[pos] = solver.value(var)
+            return SingleSolution(assignment=assignment)
+        def callback(single_res: SingleSolution):
+            print("Solution found")
+            res = np.full((self.V, self.H), ' ', dtype=str)
+            for pos, val in single_res.assignment.items():
+                c = str(val)
+                set_char(res, pos, c)
+            print(res)
+        return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose, max_solutions=99)

puzzle_solver/puzzles/stitches/parse_map/parse_map.py ADDED Viewed

@@ -0,0 +1,209 @@
+"""
+    This file is a simple helper that parses the images from https://www.chiark.greenend.org.uk/~sgtatham/puzzles/js/inertia.html and converts them to a json file.
+    Look at the ./input_output/ directory for examples of input images and output json files.
+    The output json is used in the test_solve.py file to test the solver.
+"""
+from pathlib import Path
+import numpy as np
+import numpy as np
+import matplotlib.pyplot as plt
+cv = None
+Image = None
+def extract_lines(bw):
+    # Create the images that will use to extract the horizontal and vertical lines
+    horizontal = np.copy(bw)
+    vertical = np.copy(bw)
+    cols = horizontal.shape[1]
+    horizontal_size = cols // 5
+    # Create structure element for extracting horizontal lines through morphology operations
+    horizontalStructure = cv.getStructuringElement(cv.MORPH_RECT, (horizontal_size, 1))
+    horizontal = cv.erode(horizontal, horizontalStructure)
+    horizontal = cv.dilate(horizontal, horizontalStructure)
+    horizontal_means = np.mean(horizontal, axis=1)
+    horizontal_cutoff = np.percentile(horizontal_means, 50)
+    # location where the horizontal lines are
+    horizontal_idx = np.where(horizontal_means > horizontal_cutoff)[0]
+    # print(f"horizontal_idx: {horizontal_idx}")
+    height = len(horizontal_idx)
+    # show_wait_destroy("horizontal", horizontal)  # this has the horizontal lines
+    rows = vertical.shape[0]
+    verticalsize = rows // 5
+    # Create structure element for extracting vertical lines through morphology operations
+    verticalStructure = cv.getStructuringElement(cv.MORPH_RECT, (1, verticalsize))
+    vertical = cv.erode(vertical, verticalStructure)
+    vertical = cv.dilate(vertical, verticalStructure)
+    vertical_means = np.mean(vertical, axis=0)
+    vertical_cutoff = np.percentile(vertical_means, 50)
+    vertical_idx = np.where(vertical_means > vertical_cutoff)[0]
+    # print(f"vertical_idx: {vertical_idx}")
+    width = len(vertical_idx)
+    # print(f"height: {height}, width: {width}")
+    # print(f"vertical_means: {vertical_means}")
+    # show_wait_destroy("vertical", vertical)  # this has the vertical lines
+    vertical = cv.bitwise_not(vertical)
+    # show_wait_destroy("vertical_bit", vertical)
+    return horizontal_idx, vertical_idx
+def show_wait_destroy(winname, img):
+    cv.imshow(winname, img)
+    cv.moveWindow(winname, 500, 0)
+    cv.waitKey(0)
+    cv.destroyWindow(winname)
+def mean_consecutives(arr: np.ndarray) -> np.ndarray:
+    """if a sequence of values is consecutive, then average the values"""
+    sums = []
+    counts = []
+    for i in range(len(arr)):
+        if i == 0:
+            sums.append(arr[i])
+            counts.append(1)
+        elif arr[i] == arr[i-1] + 1:
+            sums[-1] += arr[i]
+            counts[-1] += 1
+        else:
+            sums.append(arr[i])
+            counts.append(1)
+    return np.array(sums) // np.array(counts)
+def dfs(x, y, out, output, current_num):
+    if x < 0 or x >= out.shape[1] or y < 0 or y >= out.shape[0]:
+        return
+    if out[y, x] != '  ':
+        return
+    out[y, x] = current_num
+    if output['top'][y, x] == 0:
+        dfs(x, y-1, out, output, current_num)
+    if output['left'][y, x] == 0:
+        dfs(x-1, y, out, output, current_num)
+    if output['right'][y, x] == 0:
+        dfs(x+1, y, out, output, current_num)
+    if output['bottom'][y, x] == 0:
+        dfs(x, y+1, out, output, current_num)
+def main(image):
+    global Image
+    global cv
+    from PIL import Image as Image_module
+    import cv2 as cv_module
+    Image = Image_module
+    cv = cv_module
+    image_path = Path(image)
+    output_path = image_path.parent / (image_path.stem + '.json')
+    src = cv.imread(image, cv.IMREAD_COLOR)
+    assert src is not None, f'Error opening image: {image}'
+    if len(src.shape) != 2:
+        gray = cv.cvtColor(src, cv.COLOR_BGR2GRAY)
+    else:
+        gray = src
+    # now the image is in grayscale
+    # Apply adaptiveThreshold at the bitwise_not of gray, notice the ~ symbol
+    gray = cv.bitwise_not(gray)
+    bw = cv.adaptiveThreshold(gray.copy(), 255, cv.ADAPTIVE_THRESH_MEAN_C, \
+                                cv.THRESH_BINARY, 15, -2)
+    # show_wait_destroy("binary", bw)
+    # show_wait_destroy("src", src)
+    horizontal_idx, vertical_idx = extract_lines(bw)
+    horizontal_idx = mean_consecutives(horizontal_idx)
+    vertical_idx = mean_consecutives(vertical_idx)
+    height = len(horizontal_idx)
+    width = len(vertical_idx)
+    print(f"height: {height}, width: {width}")
+    print(f"horizontal_idx: {horizontal_idx}")
+    print(f"vertical_idx: {vertical_idx}")
+    arr = np.zeros((height - 1, width - 1), dtype=object)
+    output = {'top': arr.copy(), 'left': arr.copy(), 'right': arr.copy(), 'bottom': arr.copy()}
+    target = 200_000
+    hists = {'top': {}, 'left': {}, 'right': {}, 'bottom': {}}
+    for j in range(height - 1):
+        for i in range(width - 1):
+            hidx1, hidx2 = horizontal_idx[j], horizontal_idx[j+1]
+            vidx1, vidx2 = vertical_idx[i], vertical_idx[i+1]
+            hidx1 = max(0, hidx1 - 2)
+            hidx2 = min(src.shape[0], hidx2 + 4)
+            vidx1 = max(0, vidx1 - 2)
+            vidx2 = min(src.shape[1], vidx2 + 4)
+            cell = src[hidx1:hidx2, vidx1:vidx2]
+            mid_x = cell.shape[1] // 2
+            mid_y = cell.shape[0] // 2
+            # show_wait_destroy(f"cell_{i}_{j}", cell)
+            cell = cv.bitwise_not(cell)  # invert colors
+            top = cell[0:10, mid_y-5:mid_y+5]
+            hists['top'][j, i] = np.sum(top)
+            left = cell[mid_x-5:mid_x+5, 0:10]
+            hists['left'][j, i] = np.sum(left)
+            right = cell[mid_x-5:mid_x+5, -10:]
+            hists['right'][j, i] = np.sum(right)
+            bottom = cell[-10:, mid_y-5:mid_y+5]
+            hists['bottom'][j, i] = np.sum(bottom)
+    fig, axs = plt.subplots(2, 2)
+    axs[0, 0].hist(list(hists['top'].values()), bins=100)
+    axs[0, 0].set_title('Top')
+    axs[0, 1].hist(list(hists['left'].values()), bins=100)
+    axs[0, 1].set_title('Left')
+    axs[1, 0].hist(list(hists['right'].values()), bins=100)
+    axs[1, 0].set_title('Right')
+    axs[1, 1].hist(list(hists['bottom'].values()), bins=100)
+    axs[1, 1].set_title('Bottom')
+    target_top = np.mean(list(hists['top'].values()))
+    target_left = np.mean(list(hists['left'].values()))
+    target_right = np.mean(list(hists['right'].values()))
+    target_bottom = np.mean(list(hists['bottom'].values()))
+    axs[0, 0].axvline(target_top, color='red')
+    axs[0, 1].axvline(target_left, color='red')
+    axs[1, 0].axvline(target_right, color='red')
+    axs[1, 1].axvline(target_bottom, color='red')
+    # plt.show()
+    # 1/0
+    print(f"target_top: {target_top}, target_left: {target_left}, target_right: {target_right}, target_bottom: {target_bottom}")
+    for j in range(height - 1):
+        for i in range(width - 1):
+            if hists['top'][j, i] > target_top:
+                output['top'][j, i] = 1
+            if hists['left'][j, i] > target_left:
+                output['left'][j, i] = 1
+            if hists['right'][j, i] > target_right:
+                output['right'][j, i] = 1
+            if hists['bottom'][j, i] > target_bottom:
+                output['bottom'][j, i] = 1
+            print(f"cell_{j}_{i}", end=': ')
+            print('T' if output['top'][j, i] else '', end='')
+            print('L' if output['left'][j, i] else '', end='')
+            print('R' if output['right'][j, i] else '', end='')
+            print('B' if output['bottom'][j, i] else '', end='')
+            print('   Sums: ', hists['top'][j, i], hists['left'][j, i], hists['right'][j, i], hists['bottom'][j, i])
+    current_count = 0
+    out = np.full_like(output['top'], '  ', dtype='U2')
+    for j in range(out.shape[0]):
+        for i in range(out.shape[1]):
+            if out[j, i] == '  ':
+                dfs(i, j, out, output, str(current_count).zfill(2))
+                current_count += 1
+    with open(output_path, 'w') as f:
+        f.write('[\n')
+        for i, row in enumerate(out):
+            f.write('  ' + str(row.tolist()).replace("'", '"'))
+            if i != len(out) - 1:
+                f.write(',')
+            f.write('\n')
+        f.write(']')
+    print('output json: ', output_path)
+if __name__ == '__main__':
+    # to run this script and visualize the output, in the root run:
+    #  python .\src\puzzle_solver\puzzles\stitches\parse_map\parse_map.py | python .\src\puzzle_solver\utils\visualizer.py --read_stdin
+    main(Path(__file__).parent / 'input_output' / 'MTM6OSw4MjEsNDAx.png')

puzzle_solver/puzzles/stitches/stitches.py ADDED Viewed

@@ -0,0 +1,111 @@
+from collections import defaultdict
+from typing import Union
+import numpy as np
+from ortools.sat.python import cp_model
+from ortools.sat.python.cp_model import LinearExpr as lxp
+from puzzle_solver.core.utils import Pos, get_all_pos, get_char, get_neighbors4, set_char, get_neighbors8, get_next_pos, Direction, get_row_pos, get_col_pos, in_bounds, get_opposite_direction
+from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution, and_constraint
+class Board:
+    def __init__(self, board: np.array, top: np.array, side: np.array, connection_count=1):
+        assert board.ndim == 2, f'board must be 2d, got {board.ndim}'
+        self.V = board.shape[0]
+        self.H = board.shape[1]
+        assert top.ndim == 1 and top.shape[0] == self.H, 'top must be a 1d array of length board width'
+        assert side.ndim == 1 and side.shape[0] == self.V, 'side must be a 1d array of length board height'
+        assert all((str(c.item()).isdecimal() for c in np.nditer(board))), 'board must contain only digits'
+        assert isinstance(connection_count, int) and connection_count >= 1, f'connection count must be int and >= 1, got {connection_count}'
+        self.board = board
+        self.top = top
+        self.side = side
+        self.connection_count = connection_count
+        self.top_empties = [self.H - i for i in self.top]
+        self.side_empties = [self.V - i for i in self.side]
+        self.block_numbers = set([int(c.item()) for c in np.nditer(board)])
+        self.blocks = {i: [pos for pos in get_all_pos(self.V, self.H) if int(get_char(self.board, pos)) == i] for i in self.block_numbers}
+        # keys are (block_i, block_j) where block_i < block_j to avoid double counting
+        # values are sets of (pos_a, direction_a, pos_b, direction_b) where the two blocks meet
+        self.block_neighbors: dict[tuple[int, int], set[tuple[Pos, Direction, Pos, Direction]]] = {}
+        self.valid_stitches: set[tuple[Pos, Pos]] = set()  # records all pairs of positions that can have a stitch
+        for pos in get_all_pos(self.V, self.H):
+            block_i = int(get_char(self.board, pos))
+            for direction in Direction:
+                neighbor = get_next_pos(pos, direction)
+                if not in_bounds(neighbor, self.V, self.H):
+                    continue
+                block_j = int(get_char(self.board, neighbor))
+                if block_i < block_j:  # avoid double counting
+                    opposite_direction = get_opposite_direction(direction)
+                    self.block_neighbors.setdefault((block_i, block_j), set()).add((pos, direction, neighbor, opposite_direction))
+                    self.valid_stitches.add((pos, neighbor))
+                    self.valid_stitches.add((neighbor, pos))
+        # for pair in self.block_neighbors.keys():
+        #     print(pair, self.block_neighbors[pair])
+        # print('top empties', self.top_empties)
+        # print('side empties', self.side_empties)
+        self.model = cp_model.CpModel()
+        self.model_vars: dict[tuple[Pos, Union[Direction, None]], cp_model.IntVar] = {}
+        self.create_vars()
+        self.add_all_constraints()
+    def create_vars(self):
+        for pos in get_all_pos(self.V, self.H):
+            for direction in Direction:
+                self.model_vars[(pos, direction)] = self.model.NewBoolVar(f'{pos}:{direction}')
+            self.model_vars[(pos, None)] = self.model.NewBoolVar(f'{pos}:empty')
+    def add_all_constraints(self):
+        # every position has exactly 1 state
+        for pos in get_all_pos(self.V, self.H):
+            state = [self.model_vars[(pos, direction)] for direction in Direction]
+            state.append(self.model_vars[(pos, None)])
+            self.model.AddExactlyOne(state)
+            # print('ONLY 1 DIRECTION. only one', state)
+        # If a position points at X (and this is a valid pair) then X has to point at me
+        for pos in get_all_pos(self.V, self.H):
+            for direction in Direction:
+                neighbor = get_next_pos(pos, direction)
+                if not in_bounds(neighbor, self.V, self.H) or (pos, neighbor) not in self.valid_stitches:
+                    # this is not a valid stitch
+                    self.model.Add(self.model_vars[(pos, direction)] == 0)
+                    # print(f'Pos {pos} cant be {direction}')
+                    continue
+                opposite_direction = get_opposite_direction(direction)
+                self.model.Add(self.model_vars[(pos, direction)] == self.model_vars[(neighbor, opposite_direction)])
+                # print(f'{pos}:{direction} must == {neighbor}:{opposite_direction}')
+        # all blocks connected exactly N times (N usually 1 but can be 2 or 3)
+        for (block_i, block_j), connections in self.block_neighbors.items():
+            is_connected_list = []
+            for pos_a, direction_a, pos_b, direction_b in connections:
+                v = self.model.NewBoolVar(f'{pos_a}:{direction_a}->{pos_b}:{direction_b}')
+                and_constraint(self.model, v, [self.model_vars[pos_a, direction_a], self.model_vars[pos_b, direction_b]])
+                is_connected_list.append(v)
+            self.model.Add(sum(is_connected_list) == self.connection_count)
+        # sums of top and side must match
+        for col in range(self.H):
+            self.model.Add(sum([self.model_vars[pos, None] for pos in get_col_pos(col, self.V)]) == self.top_empties[col])
+        for row in range(self.V):
+            self.model.Add(sum([self.model_vars[pos, None] for pos in get_row_pos(row, self.H)]) == self.side_empties[row])
+    def solve_and_print(self, verbose: bool = True):
+        def board_to_solution(board: Board, solver: cp_model.CpSolverSolutionCallback) -> SingleSolution:
+            assignment: dict[Pos, str] = {}
+            for (pos, direction), var in board.model_vars.items():
+                if solver.value(var) == 1:
+                    assignment[pos] = direction.name[0] if direction is not None else ' '
+            return SingleSolution(assignment=assignment)
+        def callback(single_res: SingleSolution):
+            print("Solution found")
+            res = np.full((self.V, self.H), ' ', dtype=object)
+            for pos in get_all_pos(self.V, self.H):
+                c = get_char(self.board, pos)
+                c = single_res.assignment[pos]
+                set_char(res, pos, c)
+            print(res)
+        return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose, max_solutions=9)

puzzle_solver/utils/visualizer.py ADDED Viewed

@@ -0,0 +1,134 @@
+from __future__ import annotations
+import argparse
+from typing import Any, Mapping, Tuple
+import json
+import sys
+import numpy as np
+from PIL import Image, ImageDraw, ImageFont
+RGB = Tuple[int, int, int]
+def render_board_image(
+    board: np.ndarray,
+    colors: Mapping[Any, RGB],
+    cell_size: int = 64,
+    grid: bool = True,
+    bg_default: RGB = (240, 240, 240),
+    text_color: RGB = (0, 0, 0),
+    padding: int = 20,
+    ) -> None:
+    """
+    Render a 2D numpy array as a colored grid image with centered text labels.
+    Args:
+        board: 2D numpy array (dtype can be object/str/int/etc.). Each cell's value
+               is looked up in `colors` for its fill color.
+        colors: Dict-like mapping from cell values to RGB tuples (0-255).
+        cell_size: Square side length (pixels) for each cell.
+        grid: Whether to draw grid lines around cells.
+        bg_default: Fill color when a cell's value is not in `colors`.
+        text_color: Color for text labels.
+        padding: Extra pixels around the entire grid on each side.
+    """
+    if board.ndim != 2:
+        raise ValueError("`board` must be a 2D numpy array.")
+    rows, cols = board.shape
+    width  = cols * cell_size + padding * 2
+    height = rows * cell_size + padding * 2
+    img = Image.new("RGB", (width, height), color=bg_default)
+    draw = ImageDraw.Draw(img)
+    # font size
+    desired_pt = max(10, int(cell_size * 0.4))
+    font = ImageFont.truetype("DejaVuSans.ttf", desired_pt)
+    missing_values = set()
+    for r in range(rows):
+        for c in range(cols):
+            val = board[r, c]
+            if isinstance(val, np.generic):
+                val = val.item()
+            if val not in colors:
+                print(f'missing value: {val} of type {type(val)} at position {r}, {c}')
+                missing_values.add(val)
+            fill = colors.get(val, bg_default)
+            x0 = padding + c * cell_size
+            y0 = padding + r * cell_size
+            x1 = x0 + cell_size
+            y1 = y0 + cell_size
+            draw.rectangle([x0, y0, x1, y1], fill=fill)
+            if grid:
+                draw.rectangle([x0, y0, x1, y1], outline=(0, 0, 0), width=1)
+            # Center the text
+            text = "" if val is None else str(val)
+            if text:
+                # textbbox gives more accurate sizing than textsize
+                bbox = draw.textbbox((0, 0), text, font=font)
+                tw = bbox[2] - bbox[0]
+                th = bbox[3] - bbox[1]
+                tx = x0 + (cell_size - tw) / 2
+                ty = y0 + (cell_size - th) / 2
+                draw.text((tx, ty), text, fill=text_color, font=font)
+    img.show()
+def get_input():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--read_stdin', action='store_true')
+    args = parser.parse_args()
+    if args.read_stdin:
+        # read from stdin until the line starts with "output json: "
+        print('reading board from stdin until the line starts with "output json: "')
+        json_path = None
+        while True:
+            line = sys.stdin.readline()
+            if line.startswith('output json: '):
+                json_path = line.split('output json: ')[1].strip()
+                break
+        with open(json_path, 'r') as f:
+            board = np.array(json.load(f))
+        print(f'read board from {json_path}')
+    else:
+        # with open('src/puzzle_solver/puzzles/stitches/parse_map/input_output/MTM6OSw4MjEsNDAx.json', 'r') as f:
+        #     board = np.array(json.load(f))
+        board = np.array([
+            ['01', '123', '01', '01', '02', '02', '02', '03', '03', '03', '03', '04', '05', '05', '05'],
+            ['01', '02', '02', '02', '02', '06', '07', '07', '03', '08', '03', '04', '04', '05', '09'],
+            ['01', '01', '02', '11', '06', '06', '06', '12', '12', '08', '13', '13', '13', '09', '09'],
+            ['01', '11', '11', '11', '14', '06', '06', '12', '12', '15', '15', '13', '09', '09', '09'],
+            ['01', '01', '11', '11', '14', '12', '12', '12', '16', '16', '15', '13', '13', '17', '09'],
+            ['01', '11', '11', '14', '14', '12', '42', '42', '42', '15', '15', '13', '13', '17', '18'],
+            ['01', '11', '11', '14', '14', '12', '12', '43', '15', '15', '20', '13', '13', '17', '18'],
+            ['01', '01', '11', '19', '19', '19', '43', '43', '44', '20', '20', '20', '13', '17', '18'],
+            ['01', '22', '23', '23', '23', '19', '43', '21', '21', '24', '24', '24', '25', '17', '17'],
+            ['22', '22', '22', '23', '19', '19', '26', '24', '24', '24', '28', '28', '25', '17', '33'],
+            ['22', '22', '23', '23', '27', '27', '26', '26', '24', '24', '29', '29', '25', '25', '33'],
+            ['22', '22', '35', '27', '27', '26', '26', '26', '26', '30', '30', '30', '25', '34', '34'],
+            ['37', '22', '35', '35', '35', '35', '35', '26', '26', '30', '31', '31', '32', '32', '40'],
+            ['37', '37', '37', '36', '36', '35', '26', '26', '26', '40', '40', '40', '40', '40', '40'],
+            ['37', '37', '37', '37', '35', '35', '38', '38', '39', '39', '40', '40', '40', '41', '41'],
+        ])
+    return board
+if __name__ == '__main__':
+    board = get_input()
+    # rcolors = [(255, 0, 0), (0, 255, 0), (0, 0, 255), (255, 255, 0), (0, 255, 255), (255, 0, 255), (255, 255, 255), (128, 128, 128)]
+    vs =[0, 128, 255]
+    rcolors = [(v1, v2, v3) for v1 in vs for v2 in vs for v3 in vs if (v1, v2, v3) != (0, 0, 0)]
+    nums = set([c.item() for c in np.nditer(board)])
+    colors = {c: rcolors[i % len(rcolors)] for i, c in enumerate(nums)}
+    print(nums)
+    print('max i:', max(nums))
+    print('skipped:', set(range(int(max(nums)) + 1)) - set(int(i) for i in nums))
+    render_board_image(board, colors)

{multi_puzzle_solver-0.9.2.dist-info → multi_puzzle_solver-0.9.4.dist-info}/WHEEL RENAMED Viewed

File without changes

{multi_puzzle_solver-0.9.2.dist-info → multi_puzzle_solver-0.9.4.dist-info}/top_level.txt RENAMED Viewed

File without changes

multi-puzzle-solver 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

multi-puzzle-solver 0.9.2py3-none-any.whl → 0.9.4py3-none-any.whl