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

{multi_puzzle_solver-0.9.4.dist-info → multi_puzzle_solver-0.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-puzzle-solver
-Version: 0.9.4
+Version: 0.9.6
 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
@@ -237,6 +237,16 @@ These are all the puzzles that are implemented in this repo. <br> Click on any o
       <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/stitches_solved.png" alt="Stitches" width="140">
     </a>
   </td>
+  <td align="center">
+    <a href="#battleships-puzzle-type-29"><b>Battleships</b><br><br>
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/battleships_solved.png" alt="Battleships" width="140">
+    </a>
+  </td>
+  <td align="center">
+    <a href="#kakurasu-puzzle-type-30"><b>Kakurasu</b><br><br>
+      <img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/kakurasu_solved.png" alt="Kakurasu" width="140">
+    </a>
+  </td>
 </tr>
 </table>
 
@@ -280,6 +290,8 @@ These are all the puzzles that are implemented in this repo. <br> Click on any o
   - [Thermometers (Puzzle Type #26)](#thermometers-puzzle-type-26)
   - [Aquarium (Puzzle Type #27)](#aquarium-puzzle-type-27)
   - [Stitches (Puzzle Type #28)](#stitches-puzzle-type-28)
+  - [Battleships (Puzzle Type #29)](#battleships-puzzle-type-29)
+  - [Kakurasu (Puzzle Type #30)](#kakurasu-puzzle-type-30)
   - [Why SAT / CP-SAT?](#why-sat--cp-sat)
   - [Testing](#testing)
   - [Contributing](#contributing)
@@ -2320,6 +2332,9 @@ 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()
 ```
+
+Note: `solver.Board` accepts an optional `connection_count=N` parameter to specify the (÷N) stitches puzzle (by default, 1 stitch).
+
 **Script Output**
 
 ```python
@@ -2350,6 +2365,147 @@ Time taken: 0.01 seconds
 
 ---
 
+## Battleships (Puzzle Type #29)
+
+* [**Play online**](https://www.puzzle-battleships.com/)
+
+* [**Solver Code**][29]
+
+<details>
+  <summary><strong>Rules</strong></summary>
+
+- You have to find the location of the battleships hidden in the grid. Some battleships may be partially revealed.
+- A battleship is a straight line of consecutive black cells.
+- The number of the battleships from each size is shown in the legend.
+- 2 battleships cannot touch each other (even diagonally)
+- The numbers outside the grid show the number of cells occupied by battleships on that row/column.
+
+</details>
+
+**Unsolved puzzle**
+
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/battleships_unsolved.png" alt="Battleships unsolved" width="500">
+
+Code to utilize this package and solve the puzzle:
+
+```python
+from puzzle_solver import battleships_solver as solver
+board = np.array([
+  [' ', ' ', ' ', ' ', ' ', 'S', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'S', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'O', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  ['W', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', 'O', ' ', ' ', ' ', ' ', 'W', ' ', ' ', 'R'],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'U', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', 'L', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
+  [' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'S'],
+])
+top = np.array([2, 2, 4, 2, 1, 2, 1, 2, 4, 1, 3, 2, 5, 2, 2])
+side = np.array([1, 2, 1, 1, 0, 7, 0, 9, 2, 2, 5, 1, 3, 0, 1])
+ship_counts = {1: 5, 2: 4, 3: 3, 4: 2, 5: 1}
+binst = solver.Board(board=board, top=top, side=side, ship_counts=ship_counts)
+solutions = binst.solve_and_print()
+```
+
+
+**Script Output**
+
+```python
+Solution found
+[[' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' 'S' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ [' ' 'S' 'S' 'S' 'S' ' ' ' ' ' ' ' ' ' ' ' ' 'S' 'S' 'S' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ [' ' ' ' 'S' ' ' ' ' 'S' 'S' 'S' 'S' 'S' ' ' ' ' 'S' 'S' 'S']
+ ['S' ' ' 'S' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ' 'S' ' ' ' ' ' ']
+ ['S' 'S' 'S' 'S' ' ' ' ' ' ' ' ' 'S' ' ' ' ' ' ' ' ' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' 'S' ' ' 'S' ' ' ' ' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
+ [' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S']]
+Solutions found: 1
+status: OPTIMAL
+Time taken: 0.12 seconds
+```
+
+**Solved puzzle**
+
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/battleships_solved.png" alt="Battleships solved" width="500">
+
+---
+
+## Kakurasu (Puzzle Type #30)
+
+* [**Play online**](https://www.puzzle-kakurasu.com/)
+
+* [**Solver Code**][30]
+
+<details>
+  <summary><strong>Rules</strong></summary>
+
+The goal is to make some of the cells black in such a way that:
+
+1. The black cells on each row sum up to the number on the right.
+
+2. The black cells on each column sum up to the number on the bottom.
+
+3. If a black cell is first on its row/column its value is 1. If it is second its value is 2 etc. 
+
+</details>
+
+**Unsolved puzzle**
+
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/kakurasu_unsolved.png" alt="Kakurasu unsolved" width="500">
+
+Code to utilize this package and solve the puzzle:
+
+```python
+from puzzle_solver import kakurasu_solver as solver
+side = np.array([27, 6, 1, 12, 37, 37, 11, 4, 29, 23, 66, 55])
+bottom = np.array([22, 1, 25, 36, 10, 22, 25, 35, 32, 28, 45, 45])
+binst = solver.Board(side=side, bottom=bottom)
+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']]
+Solutions found: 1
+status: OPTIMAL
+Time taken: 0.00 seconds
+```
+
+**Solved puzzle**
+
+<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/kakurasu_solved.png" alt="Kakurasu solved" width="500">
+
+---
+
 ---
 
 ## Why SAT / CP-SAT?
@@ -2429,3 +2585,5 @@ Issues and PRs welcome!
 [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"
+[29]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/battleships "puzzle_solver/src/puzzle_solver/puzzles/battleships at master · Ar-Kareem/puzzle_solver · GitHub"
+[30]: https://github.com/Ar-Kareem/puzzle_solver/tree/master/src/puzzle_solver/puzzles/kakurasu "puzzle_solver/src/puzzle_solver/puzzles/kakurasu at master · Ar-Kareem/puzzle_solver · GitHub"

{multi_puzzle_solver-0.9.4.dist-info → multi_puzzle_solver-0.9.6.dist-info}/RECORD

@@ -1,18 +1,20 @@
-puzzle_solver/__init__.py,sha256=J4CxLjjSv2Lbfk5spsG42NR1JcQNrspGpt7Yz3EIx9o,2038
+puzzle_solver/__init__.py,sha256=rqNCaaPZIpdL2Y_Ib96zY8u9Qs_MJaRI3CpJz_vV4_I,2189
 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
+puzzle_solver/puzzles/battleships/battleships.py,sha256=J1Y-zG2TOmJePCwQnUF8uE9cXL5v8GDVEGv30bQls6k,7467
+puzzle_solver/puzzles/bridges/bridges.py,sha256=15A9uV4xjoqPRo_9CTnoKeGRxS3z2aMF619T1n0dTOQ,5402
+puzzle_solver/puzzles/chess_range/chess_melee.py,sha256=D-_Oi8OyxsVe1j3dIKYwRlxgeb3NWLmDWGcv-oclY0c,195
+puzzle_solver/puzzles/chess_range/chess_range.py,sha256=uMQGTIwzGskHIhI-tPYjT9a3wHUBIkZ18eXjV9IpUE4,21071
 puzzle_solver/puzzles/chess_range/chess_solo.py,sha256=U3v766UsZHx_dC3gxqU90VbjAXn-OlYhtrnnvJYFvrQ,401
 puzzle_solver/puzzles/chess_sequence/chess_sequence.py,sha256=6ap3Wouf2PxHV4P56B9ol1QT98Ym6VHaxorQZWl6LnY,13692
-puzzle_solver/puzzles/dominosa/dominosa.py,sha256=uh2vsba9HdSHGnYiYE8R_TZzQh5kge51Y1TMRyQlwek,7246
+puzzle_solver/puzzles/dominosa/dominosa.py,sha256=Nmb7pn8U27QJwGy9F3wo8ylqo2_U51OAo3GN2soaNpc,7195
 puzzle_solver/puzzles/filling/filling.py,sha256=UAkNYjlfxOrYGrRVmuElhWPeW10xD6kiWuB8oELzy3w,9141
-puzzle_solver/puzzles/guess/guess.py,sha256=w8ZE-0MswR1_e7_MX622OiCJ8fGTloRHblYFvSA4yHc,10812
-puzzle_solver/puzzles/inertia/inertia.py,sha256=xHtQ09sI7hqPcs20foz6YVMuYCsw59TZQxTumAKJuBs,5658
-puzzle_solver/puzzles/inertia/tsp.py,sha256=qMyT_W5vBmmaFUB7Cl9rC5xJNdAdQvIJEx6yxlbG9hw,15240
+puzzle_solver/puzzles/guess/guess.py,sha256=sH-NlYhxM3DNbhk4eGde09kgM0KaDvSbLrpHQiwcFGo,10791
+puzzle_solver/puzzles/inertia/inertia.py,sha256=gJBahkh69CrSWNscalKEoP1j4X-Q3XpbIBMiG9PUpU0,5657
+puzzle_solver/puzzles/inertia/tsp.py,sha256=6ZDxdg2f7GDsZeQpnSR2ay0-T4ZhTESJtkKMcm49OS0,15204
 puzzle_solver/puzzles/inertia/parse_map/parse_map.py,sha256=A9JQTNqamUdzlwqks0XQp3Hge3mzyTIVK6YtDJvqpL4,8422
+puzzle_solver/puzzles/kakurasu/kakurasu.py,sha256=VNGMJnBHDi6WkghLObRLhUvkmrPaGphTTUDMC0TkQvQ,2064
 puzzle_solver/puzzles/keen/keen.py,sha256=tDb6C5S3Q0JAKPsdw-84WQ6PxRADELZHr_BK8FDH-NA,5039
 puzzle_solver/puzzles/light_up/light_up.py,sha256=iSA1rjZMFsnI0V0Nxivxox4qZkB7PvUrROSHXcoUXds,4541
 puzzle_solver/puzzles/magnets/magnets.py,sha256=-Wl49JD_PKeq735zQVMQ3XSQX6gdHiY-7PKw-Sh16jw,6474
@@ -22,19 +24,19 @@ puzzle_solver/puzzles/mosaic/mosaic.py,sha256=QX_nVpVKQg8OfaUcqFk9tKqsDyVqvZc6-X
 puzzle_solver/puzzles/nonograms/nonograms.py,sha256=1jmDTOCnmivmBlwtMDyyk3TVqH5IjapzLn7zLQ4qubk,6056
 puzzle_solver/puzzles/pearl/pearl.py,sha256=AP0whWwwZ-1zKingW14OwseYylNAr6NkXSrvdnPU6Rw,8566
 puzzle_solver/puzzles/range/range.py,sha256=g6ZuHuulYLpNFsqbnPoIB5KoGPllYppU10-Zzqfj5f8,6993
-puzzle_solver/puzzles/signpost/signpost.py,sha256=D19ua8rVwO6sgXq4nVLkZfEyz8hqc6qMOk3j-g44soU,3931
+puzzle_solver/puzzles/signpost/signpost.py,sha256=-0_S6ycwzwlUf9-ZhP127Rgo5gMBOHiTM6t08dLLDac,3869
 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/stitches/stitches.py,sha256=iK8t02q43gH3FPbuIDn4dK0sbaOgZOnw8yHNRNvNuIU,6534
+puzzle_solver/puzzles/stitches/parse_map/parse_map.py,sha256=pUB9tG__u4Fq_RCFG_4NNq3LRKAa6FRrvuuL64cUIRM,8866
 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/tracks/tracks.py,sha256=0K1YZMHiRIMmFwoD_JxB2c_xB6GYV8spgNUCL-JwDJM,9073
+puzzle_solver/puzzles/undead/undead.py,sha256=IrCUfzQFBem658P5KKqldG7vd2TugTHehcwseCarerM,6604
 puzzle_solver/puzzles/unruly/unruly.py,sha256=sDF0oKT50G-NshyW2DYrvAgD9q9Ku9ANUyNhGSAu7cQ,3827
-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/utils/visualizer.py,sha256=2LmNoxEqb9PGWmBmHW6jh6OqFgNYguavhHB-9Dv5EUw,6113
+multi_puzzle_solver-0.9.6.dist-info/METADATA,sha256=tyAlmP1wgR8sOPLM89MHtUBv_99kGGU7_McS9m9mfRY,124310
+multi_puzzle_solver-0.9.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+multi_puzzle_solver-0.9.6.dist-info/top_level.txt,sha256=exwVUQa-anK9vYrpKzBPvH8bX43iElWI4VeNiAyBGJY,14
+multi_puzzle_solver-0.9.6.dist-info/RECORD,,

puzzle_solver/__init__.py

@@ -1,4 +1,5 @@
 from puzzle_solver.puzzles.aquarium import aquarium as aquarium_solver
+from puzzle_solver.puzzles.battleships import battleships as battleships_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
@@ -7,6 +8,7 @@ from puzzle_solver.puzzles.dominosa import dominosa as dominosa_solver
 from puzzle_solver.puzzles.filling import filling as filling_solver
 from puzzle_solver.puzzles.guess import guess as guess_solver
 from puzzle_solver.puzzles.inertia import inertia as inertia_solver
+from puzzle_solver.puzzles.kakurasu import kakurasu as kakurasu_solver
 from puzzle_solver.puzzles.keen import keen as keen_solver
 from puzzle_solver.puzzles.light_up import light_up as light_up_solver
 from puzzle_solver.puzzles.magnets import magnets as magnets_solver
@@ -29,4 +31,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.4'
+__version__ = '0.9.6'

puzzle_solver/puzzles/battleships/battleships.py

@@ -0,0 +1,153 @@
+from enum import Enum
+from dataclasses import dataclass, field
+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, get_neighbors8, set_char, get_row_pos, get_col_pos, get_pos, in_bounds
+from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution, or_constraint
+
+@dataclass
+class Ship:
+    is_active: cp_model.IntVar
+    length: int
+    top_left_pos: Pos
+    body: set[Pos]
+    water: set[Pos]
+    mid_body: set[Pos] = field(default_factory=set)
+    top_tip: Optional[Pos] = field(default=None)
+    bottom_tip: Optional[Pos] = field(default=None)
+    left_tip: Optional[Pos] = field(default=None)
+    right_tip: Optional[Pos] = field(default=None)
+
+class Board:
+    def __init__(self, board: np.array, top: np.array, side: np.array, ship_counts: dict[int, int]):
+        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()) in [' ', 'W', 'O', 'S', 'U', 'D', 'L', 'R'] for c in np.nditer(board))), 'board must contain only spaces, W, O, S, U, D, L, R'
+        self.board = board
+        self.top = top
+        self.side = side
+        self.ship_counts = ship_counts
+
+        self.model = cp_model.CpModel()
+        self.model_vars: dict[Pos, cp_model.IntVar] = {}
+        self.shipyard: list[Ship] = []  # will contain every possible ship based on ship counts
+
+        self.create_vars()
+        self.init_shipyard()
+        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}:is_ship')
+
+    def get_ship(self, pos: Pos, length: int, orientation: str) -> Optional[Ship]:
+        assert orientation in ['horizontal', 'vertical'], 'orientation must be horizontal or vertical'
+        if length == 1:
+            body = {pos}
+            top_tip = None
+            bottom_tip = None
+            left_tip = None
+            right_tip = None
+        elif orientation == 'horizontal':
+            body = set(get_pos(x=x, y=pos.y) for x in range(pos.x, pos.x + length))
+            top_tip = None
+            bottom_tip = None
+            left_tip = pos
+            right_tip = get_pos(x=pos.x + length - 1, y=pos.y)
+        else:
+            body = set(get_pos(x=pos.x, y=y) for y in range(pos.y, pos.y + length))
+            left_tip = None
+            right_tip = None
+            top_tip = pos
+            bottom_tip = get_pos(x=pos.x, y=pos.y + length - 1)
+        if any(not in_bounds(p, self.V, self.H) for p in body):
+            return None
+        water = set(p for pos in body for p in get_neighbors8(pos, self.V, self.H))
+        water -= body
+        mid_body = body - {top_tip, bottom_tip, left_tip, right_tip} if length > 1 else set()
+        return Ship(
+            is_active=self.model.NewBoolVar(f'{pos}:is_active'),
+            length=length,
+            top_left_pos=pos,
+            body=body,
+            water=water,
+            mid_body=mid_body,
+            top_tip=top_tip,
+            bottom_tip=bottom_tip,
+            left_tip=left_tip,
+            right_tip=right_tip,
+        )
+
+    def init_shipyard(self):
+        for length in self.ship_counts.keys():
+            for pos in get_all_pos(self.V, self.H):
+                for orientation in ['horizontal', 'vertical']:
+                    if length == 1 and orientation == 'vertical':  # prevent double counting 1-length ships
+                        continue
+                    ship = self.get_ship(pos, length, orientation)
+                    if ship is not None:
+                        self.shipyard.append(ship)
+
+    def add_all_constraints(self):
+        # ship and cells linked
+        for ship in self.shipyard:
+            for pos in ship.body:
+                self.model.Add(self.model_vars[pos] == 1).OnlyEnforceIf(ship.is_active)
+            for pos in ship.water:
+                self.model.Add(self.model_vars[pos] == 0).OnlyEnforceIf(ship.is_active)
+        # constrain the cell to be an OR of all the ships that can be placed at that position
+        for pos in get_all_pos(self.V, self.H):
+            or_constraint(self.model, self.model_vars[pos], [ship.is_active for ship in self.shipyard if pos in ship.body])
+        # force ship counts
+        for length, count in self.ship_counts.items():
+            self.constrain_ship_counts([ship for ship in self.shipyard if ship.length == length], count)
+        # force initial board placement
+        for pos in get_all_pos(self.V, self.H):
+            c = get_char(self.board, pos)
+            if c == 'S':  # single-length ship
+                self.constrain_ship_counts([ship for ship in self.shipyard if ship.length == 1 and ship.top_left_pos == pos], 1)
+            elif c == 'W':  # water
+                self.model.Add(self.model_vars[pos] == 0)
+            elif c == 'O':  # mid-body of a ship
+                self.constrain_ship_counts([ship for ship in self.shipyard if pos in ship.mid_body], 1)
+            elif c == 'U':  # top tip of a ship
+                self.constrain_ship_counts([ship for ship in self.shipyard if ship.top_tip == pos], 1)
+            elif c == 'D':  # bottom tip of a ship
+                self.constrain_ship_counts([ship for ship in self.shipyard if ship.bottom_tip == pos], 1)
+            elif c == 'L':  # left tip of a ship
+                self.constrain_ship_counts([ship for ship in self.shipyard if ship.left_tip == pos], 1)
+            elif c == 'R':  # right tip of a ship
+                self.constrain_ship_counts([ship for ship in self.shipyard if ship.right_tip == pos], 1)
+            elif c == ' ':  # empty cell
+                pass
+            else:
+                raise ValueError(f'invalid character: {c}')
+        # force the top and side counts
+        for row in range(self.V):
+            self.model.Add(sum([self.model_vars[p] for p in get_row_pos(row, self.H)]) == self.side[row])
+        for col in range(self.H):
+            self.model.Add(sum([self.model_vars[p] for p in get_col_pos(col, self.V)]) == self.top[col])
+
+    def constrain_ship_counts(self, ships: list[Ship], count: int):
+        self.model.Add(sum([ship.is_active for ship in ships]) == count)
+
+    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 = 'S' if val == 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/puzzles/bridges/bridges.py

@@ -1,12 +1,10 @@
-import json
 from collections import defaultdict
-from dataclasses import dataclass
 
 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, set_char, get_neighbors8, get_next_pos, Direction, get_row_pos, get_col_pos
+from puzzle_solver.core.utils import Pos, get_all_pos, get_char, set_char, get_row_pos, get_col_pos
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
 
 

puzzle_solver/puzzles/chess_range/chess_melee.py

@@ -1,5 +1,4 @@
 from .chess_range import Board as RangeBoard
-from .chess_range import PieceType
 
 class Board(RangeBoard):
     def __init__(self, pieces: list[str], colors: list[str]):

puzzle_solver/puzzles/chess_range/chess_range.py

@@ -9,7 +9,6 @@ from puzzle_solver.core.utils import Pos, get_pos
 from puzzle_solver.core.utils_ortools import and_constraint, generic_solve_all, or_constraint
 
 
-
 class PieceType(Enum):
     KING   = 1
     QUEEN  = 2

puzzle_solver/puzzles/dominosa/dominosa.py

@@ -3,8 +3,8 @@ from collections import defaultdict
 import numpy as np
 from ortools.sat.python import cp_model
 
-from puzzle_solver.core.utils import Pos, get_pos, get_all_pos, get_char, set_char, get_row_pos, get_col_pos, Direction, get_next_pos, in_bounds
-from puzzle_solver.core.utils_ortools import and_constraint, generic_solve_all, SingleSolution, or_constraint
+from puzzle_solver.core.utils import Pos, get_all_pos, get_char, set_char, Direction, get_next_pos, in_bounds
+from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution, or_constraint
 
 
 def get_bool_var(model: cp_model.CpModel, var: cp_model.IntVar, eq_val: int, name: str) -> cp_model.IntVar:

puzzle_solver/puzzles/guess/guess.py

@@ -1,8 +1,9 @@
-from collections import defaultdict
-import numpy as np
-from collections import Counter
+from collections import Counter, defaultdict
 from itertools import product
 
+import numpy as np
+
+
 class Board:
     def __init__(self, num_pegs: int = 4, all_colors: list[str] = ['R', 'Y', 'G', 'B', 'O', 'P'], show_warnings: bool = True, show_progress: bool = False):
         assert num_pegs >= 1, 'num_pegs must be at least 1'

puzzle_solver/puzzles/inertia/inertia.py

@@ -3,7 +3,6 @@ from collections import defaultdict
 import numpy as np
 
 from puzzle_solver.core.utils import Direction8, Pos, get_all_pos, get_char, in_bounds, get_next_pos
-
 from . import tsp
 
 

puzzle_solver/puzzles/inertia/tsp.py

@@ -1,8 +1,10 @@
-from collections import deque, defaultdict
+from collections import defaultdict, deque
 from typing import Dict, List, Tuple, Set, Any, Optional
 import random
+
 from ortools.constraint_solver import pywrapcp, routing_enums_pb2
 
+
 Pos = Any  # Hashable node id
 
 def solve_optimal_walk(
@@ -81,7 +83,6 @@ def solve_optimal_walk(
         prev = {n: None for n in nodes}
         if src not in adj:
             return dist, prev
-        from collections import deque
         q = deque([src])
         dist[src] = 0
         while q:

puzzle_solver/puzzles/kakurasu/kakurasu.py

@@ -0,0 +1,46 @@
+import numpy as np
+from ortools.sat.python import cp_model
+
+from puzzle_solver.core.utils import Pos, get_all_pos, set_char, get_pos
+from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
+
+
+class Board:
+    def __init__(self, side: np.array, bottom: np.array):
+        assert side.ndim == 1, f'side must be 1d, got {side.ndim}'
+        self.V = side.shape[0]
+        assert bottom.ndim == 1, f'bottom must be 1d, got {bottom.ndim}'
+        self.H = bottom.shape[0]
+        self.side = side
+        self.bottom = bottom
+
+        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):
+        for row in range(self.V):
+            self.model.Add(sum([self.model_vars[get_pos(x=col, y=row)] * (col + 1) for col in range(self.H)]) == self.side[row])
+        for col in range(self.H):
+            self.model.Add(sum([self.model_vars[get_pos(x=col, y=row)] * (row + 1) for row in range(self.V)]) == self.bottom[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 = 'X' if single_res.assignment[pos] 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/puzzles/signpost/signpost.py

@@ -1,10 +1,8 @@
-from enum import Enum
-
 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, set_char, in_bounds, get_next_pos, Direction, get_row_pos, get_col_pos, Direction8
+from puzzle_solver.core.utils import Pos, get_all_pos, get_char, set_char, in_bounds, get_next_pos, Direction8
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
 
 

puzzle_solver/puzzles/stitches/parse_map/parse_map.py

@@ -206,4 +206,5 @@ def main(image):
 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')
+    # main(Path(__file__).parent / 'input_output' / 'MTM6OSw4MjEsNDAx.png')
+    main(Path(__file__).parent / 'input_output' / 'weekly_oct_3rd_2025.png')

puzzle_solver/puzzles/stitches/stitches.py

@@ -1,11 +1,9 @@
-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 import Pos, get_all_pos, get_char, set_char, 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
 
 

puzzle_solver/puzzles/tracks/tracks.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 import numpy as np
 from ortools.sat.python import cp_model
 
-from puzzle_solver.core.utils import Pos, get_all_pos, set_char, get_char, get_neighbors4, Direction, in_bounds, get_next_pos, get_row_pos, get_col_pos, get_opposite_direction
+from puzzle_solver.core.utils import Pos, get_all_pos, set_char, get_char, Direction, in_bounds, get_next_pos, get_row_pos, get_col_pos, get_opposite_direction
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution, and_constraint, or_constraint
 
 

puzzle_solver/puzzles/undead/undead.py

@@ -6,7 +6,7 @@ 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, set_char, get_pos, get_next_pos, in_bounds, get_char, Direction, get_row_pos, get_col_pos
+from puzzle_solver.core.utils import Pos, get_all_pos, set_char, get_pos, get_next_pos, in_bounds, get_char, Direction
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
 
 

puzzle_solver/utils/visualizer.py

@@ -123,6 +123,13 @@ def get_input():
 
 if __name__ == '__main__':
     board = get_input()
+    print('Visualizing board:')
+    print('[')
+    for i,row in enumerate(board):
+        print('    [' + ', '.join([f"'{c}'" for c in row]) + ']', end='')
+        if i != len(board) - 1:
+            print(',')
+    print('\n]')
     # 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)]