multi-puzzle-solver 0.9.1__py3-none-any.whl → 0.9.3__py3-none-any.whl

{multi_puzzle_solver-0.9.1.dist-info → multi_puzzle_solver-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-puzzle-solver
-Version: 0.9.1
+Version: 0.9.3
 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,135 +89,147 @@ 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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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" height="120">
+      <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_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>
 </tr>
@@ -260,6 +272,8 @@ These are all the puzzles that are implemented in this repo. <br> Click on any o
   - [Chess Range (Puzzle Type #23)](#chess-range-puzzle-type-23)
   - [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)
   - [Why SAT / CP-SAT?](#why-sat--cp-sat)
   - [Testing](#testing)
   - [Contributing](#contributing)
@@ -2023,6 +2037,7 @@ 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 chess_solo_solver as solver
 # algebraic notation
 board = ['Kc6', 'Rc5', 'Rc4', 'Pb3', 'Bd3', 'Pd2', 'Pe3', 'Nf2', 'Ng2', 'Qg3', 'Pg6']
 binst = solver.Board(board)
@@ -2073,6 +2088,7 @@ 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 chess_melee_solver as solver
 # algebraic notation
 board = ['Pb7', 'Nc7', 'Bc6', 'Ne6', 'Pb5', 'Rc4', 'Qb3', 'Rf7', 'Rb6', 'Pe5', 'Nc3', 'Pd3', 'Nf3']
 colors = ['B', 'B', 'B', 'B', 'B', 'B', 'B', 'W', 'W', 'W', 'W', 'W', 'W']
@@ -2097,6 +2113,158 @@ Time taken: 6.24 seconds
 
 ---
 
+## Thermometers (Puzzle Type #26)
+
+* [**Play online**](https://www.puzzle-thermometers.com/)
+
+* [**Solver Code**][26]
+
+<details>
+  <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>
+
+**Unsolved puzzle**
+
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/thermometers_unsolved.png" alt="Thermometers unsolved" width="500">
+
+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([
+  ['R', 'R', 'D', 'R', 'D', 'R', 'X', 'D', 'L', 'X', 'L', 'L', 'L', 'L', 'L'],
+  ['D', 'D', 'D', 'U', 'X', 'U', 'X', 'R', 'R', 'R', 'R', 'D', 'D', 'R', 'U'],
+  ['D', 'D', 'D', 'U', 'X', 'U', 'U', 'R', 'R', 'R', 'X', 'D', 'D', 'D', 'D'],
+  ['X', 'D', 'D', 'U', 'U', 'U', 'L', 'U', 'R', 'R', 'D', 'X', 'D', 'X', 'X'],
+  ['X', 'D', 'D', 'U', 'U', 'R', 'R', 'R', 'R', 'X', 'R', 'X', 'D', 'R', 'X'],
+  ['U', 'D', 'D', 'U', 'U', 'R', 'X', 'R', 'R', 'R', 'R', 'D', 'D', 'R', 'D'],
+  ['U', 'D', 'D', 'R', 'R', 'X', 'R', 'R', 'R', 'R', 'D', 'D', 'R', 'X', 'D'],
+  ['U', 'D', 'D', 'U', 'X', 'L', 'X', 'L', 'R', 'X', 'X', 'R', 'X', 'X', 'L'],
+  ['U', 'D', 'D', 'R', 'X', 'U', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L'],
+  ['X', 'D', 'X', 'U', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'D', 'U'],
+  ['U', 'D', 'X', 'U', 'R', 'R', 'X', 'R', 'R', 'R', 'R', 'X', 'X', 'L', 'U'],
+  ['U', 'R', 'U', 'U', 'R', 'X', 'R', 'X', 'R', 'X', 'R', 'R', 'R', 'R', 'U'],
+  ['U', 'R', 'X', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'R', 'X', 'X', 'L'],
+  ['U', 'U', 'R', 'R', 'X', 'D', 'R', 'R', 'D', 'R', 'X', 'X', 'L', 'L', 'U'],
+  ['U', 'U', 'U', 'L', 'L', 'R', 'X', 'X', 'L', 'U', 'R', 'R', 'R', 'U', 'U'],
+])
+top = np.array([7, 4, 12, 8, 4, 6, 5, 7, 5, 4, 8, 9, 13, 8, 12])
+side = np.array([8, 10, 9, 10, 6, 10, 4, 6, 6, 10, 5, 7, 6, 6, 9])
+binst = solver.Board(board=board, top=top, side=side)
+solutions = binst.solve_and_print()
+```
+**Script Output**
+
+```python
+Solution found
+[['X' 'X' 'X' ' ' ' ' ' ' ' ' 'X' 'X' ' ' ' ' ' ' 'X' 'X' 'X']
+ ['X' ' ' 'X' ' ' ' ' ' ' ' ' 'X' 'X' 'X' 'X' 'X' 'X' 'X' 'X']
+ ['X' ' ' 'X' 'X' ' ' 'X' 'X' 'X' ' ' ' ' ' ' 'X' 'X' ' ' 'X']
+ [' ' ' ' 'X' 'X' ' ' 'X' 'X' 'X' 'X' 'X' 'X' ' ' 'X' ' ' 'X']
+ [' ' ' ' 'X' 'X' ' ' ' ' ' ' ' ' ' ' ' ' 'X' ' ' 'X' 'X' 'X']
+ [' ' ' ' 'X' 'X' ' ' ' ' ' ' 'X' 'X' 'X' 'X' 'X' 'X' 'X' 'X']
+ [' ' ' ' 'X' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'X' 'X' ' ' 'X']
+ [' ' ' ' 'X' ' ' ' ' ' ' 'X' 'X' ' ' ' ' ' ' 'X' 'X' ' ' 'X']
+ [' ' ' ' 'X' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'X' 'X' 'X' 'X' 'X']
+ [' ' ' ' ' ' ' ' 'X' 'X' 'X' 'X' 'X' 'X' 'X' 'X' 'X' ' ' 'X']
+ [' ' ' ' ' ' 'X' 'X' 'X' 'X' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'X']
+ ['X' ' ' ' ' 'X' ' ' ' ' ' ' ' ' ' ' ' ' 'X' 'X' 'X' 'X' 'X']
+ ['X' 'X' 'X' 'X' 'X' 'X' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ ['X' 'X' 'X' ' ' ' ' 'X' ' ' ' ' ' ' ' ' ' ' ' ' 'X' 'X' ' ']
+ ['X' 'X' 'X' 'X' 'X' ' ' ' ' ' ' ' ' ' ' 'X' 'X' 'X' 'X' ' ']]
+Solutions found: 1
+status: OPTIMAL
+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:
+
+(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 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">
+
+---
+
 ---
 
 ## Why SAT / CP-SAT?
@@ -2173,3 +2341,5 @@ Issues and PRs welcome!
 [23]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/chess_range "puzzle_solver/src/puzzle_solver/puzzles/chess_range at master · Ar-Kareem/puzzle_solver · GitHub"
 [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"

{multi_puzzle_solver-0.9.1.dist-info → multi_puzzle_solver-0.9.3.dist-info}/RECORD

@@ -1,6 +1,7 @@
-puzzle_solver/__init__.py,sha256=SnID9DFBEgsMeeEJlk9ielo5xbMxM55Ce_4ZGQnA55s,1813
+puzzle_solver/__init__.py,sha256=sOawTTp0FlKJI45RevxucH2ktl_9MbY5xem8txM8vSk,1967
 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
@@ -25,11 +26,13 @@ puzzle_solver/puzzles/signpost/signpost.py,sha256=D19ua8rVwO6sgXq4nVLkZfEyz8hqc6
 puzzle_solver/puzzles/singles/singles.py,sha256=kwMENfqQ-OP3YIz5baY6LRcvYCsNfhImEXN00lwazKM,5658
 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
 puzzle_solver/puzzles/towers/towers.py,sha256=QvL0Pp-Z2ewCeq9ZkNrh8MShKOh-Y52sFBSudve68wk,6496
 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.1.dist-info/METADATA,sha256=LmgK-1usuWuTNzO1ffTSVqtZQbeiD8ZKwg6zD81KEtw,104983
-multi_puzzle_solver-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-multi_puzzle_solver-0.9.1.dist-info/top_level.txt,sha256=exwVUQa-anK9vYrpKzBPvH8bX43iElWI4VeNiAyBGJY,14
-multi_puzzle_solver-0.9.1.dist-info/RECORD,,
+puzzle_solver/utils/visualizer.py,sha256=ImerGaFuWpuQqtb3infQ9__mFAHdf7ibEMYYxmIOLA0,4958
+multi_puzzle_solver-0.9.3.dist-info/METADATA,sha256=KNUafonxjZw4KLdoe2kwtVn1asnbQmu1nS1JnX22zfM,113408
+multi_puzzle_solver-0.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+multi_puzzle_solver-0.9.3.dist-info/top_level.txt,sha256=exwVUQa-anK9vYrpKzBPvH8bX43iElWI4VeNiAyBGJY,14
+multi_puzzle_solver-0.9.3.dist-info/RECORD,,

puzzle_solver/__init__.py

@@ -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
@@ -19,6 +20,7 @@ from puzzle_solver.puzzles.signpost import signpost as signpost_solver
 from puzzle_solver.puzzles.singles import singles as singles_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
 from puzzle_solver.puzzles.towers import towers as towers_solver
 from puzzle_solver.puzzles.tracks import tracks as tracks_solver
 from puzzle_solver.puzzles.undead import undead as undead_solver
@@ -26,4 +28,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.1'
+__version__ = '0.9.3'

puzzle_solver/puzzles/aquarium/aquarium.py

@@ -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/thermometers/thermometers.py

@@ -0,0 +1,82 @@
+from typing import Optional
+
+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, Direction, get_opposite_direction, get_next_pos, in_bounds, get_row_pos, get_col_pos
+from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
+
+def get_direction(pos: Pos, board: np.array) -> Optional[Direction]:
+    if get_char(board, pos) == 'R':
+        return Direction.RIGHT
+    elif get_char(board, pos) == 'D':
+        return Direction.DOWN
+    elif get_char(board, pos) == 'U':
+        return Direction.UP
+    elif get_char(board, pos) == 'L':
+        return Direction.LEFT
+    return None
+
+def move_backward(pos: Pos, board: np.array) -> Pos:
+    for direction in Direction:
+        opposite_direction = get_opposite_direction(direction)
+        neighbor = get_next_pos(pos, direction)
+        if in_bounds(neighbor, board.shape[0], board.shape[1]) and get_direction(neighbor, board) == opposite_direction:  # the neighbor is pointing to me
+            return neighbor
+    return None
+
+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}'
+        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((c in ['R', 'D', 'U', 'X', 'L']) for c in np.nditer(board)), 'board must contain only valid characters: R, D, U, X, L'
+        self.board = board
+        self.top = top
+        self.side = side
+        self.tip: set[Pos] = {pos for pos in get_all_pos(self.V, self.H) if get_char(self.board, pos) == 'X'}
+
+        self.model = cp_model.CpModel()
+        self.model_vars: dict[Pos, cp_model.IntVar] = {}
+
+        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}')
+    
+    def add_all_constraints(self):
+        visited: set[Pos] = set()
+        for cur_pos in self.tip:
+            visited.add(cur_pos)
+            while cur_pos is not None:
+                backward_pos = move_backward(cur_pos, self.board)
+                if backward_pos is None:
+                    break
+                self.model.Add(self.model_vars[backward_pos] == 1).OnlyEnforceIf(self.model_vars[cur_pos])
+                cur_pos = backward_pos
+                visited.add(cur_pos)
+        assert len(visited) == self.V * self.H, f'all positions must be visited, got {len(visited)}. missing {set(get_all_pos(self.V, self.H)) - visited}'
+        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])
+        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])
+
+    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=object)
+            for pos in get_all_pos(self.V, self.H):
+                c = get_char(self.board, pos)
+                c = 'X' if single_res.assignment[pos] == 1 else ' '
+                set_char(res, pos, c)
+            print(res)
+        return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose)

puzzle_solver/utils/visualizer.py

@@ -0,0 +1,108 @@
+from __future__ import annotations
+from typing import Any, Mapping, Tuple
+
+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],
+    output_filename: str,
+    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).
+        output_filename: Where to save the image (e.g., 'board.png').
+        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.save(output_filename)
+
+
+if __name__ == '__main__':
+    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'],
+        ['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'],
+    ])
+    # 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, 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 = {i: rcolors[int(i) % len(rcolors)] for i in 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, 'board.png')