multi-puzzle-solver 0.9.4__py3-none-any.whl → 0.9.5__py3-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.
- {multi_puzzle_solver-0.9.4.dist-info → multi_puzzle_solver-0.9.5.dist-info}/METADATA +91 -1
- {multi_puzzle_solver-0.9.4.dist-info → multi_puzzle_solver-0.9.5.dist-info}/RECORD +8 -7
- puzzle_solver/__init__.py +2 -1
- puzzle_solver/puzzles/battleships/battleships.py +153 -0
- puzzle_solver/puzzles/stitches/parse_map/parse_map.py +2 -1
- puzzle_solver/utils/visualizer.py +7 -0
- {multi_puzzle_solver-0.9.4.dist-info → multi_puzzle_solver-0.9.5.dist-info}/WHEEL +0 -0
- {multi_puzzle_solver-0.9.4.dist-info → multi_puzzle_solver-0.9.5.dist-info}/top_level.txt +0 -0
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: multi-puzzle-solver
|
3
|
-
Version: 0.9.
|
3
|
+
Version: 0.9.5
|
4
4
|
Summary: Efficient solvers for numerous popular and esoteric logic puzzles using CP-SAT
|
5
5
|
Author: Ar-Kareem
|
6
6
|
Project-URL: Homepage, https://github.com/Ar-Kareem/puzzle_solver
|
@@ -237,6 +237,11 @@ These are all the puzzles that are implemented in this repo. <br> Click on any o
|
|
237
237
|
<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/stitches_solved.png" alt="Stitches" width="140">
|
238
238
|
</a>
|
239
239
|
</td>
|
240
|
+
<td align="center">
|
241
|
+
<a href="#battleships-puzzle-type-29"><b>Battleships</b><br><br>
|
242
|
+
<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/battleships_solved.png" alt="Battleships" width="140">
|
243
|
+
</a>
|
244
|
+
</td>
|
240
245
|
</tr>
|
241
246
|
</table>
|
242
247
|
|
@@ -280,6 +285,7 @@ These are all the puzzles that are implemented in this repo. <br> Click on any o
|
|
280
285
|
- [Thermometers (Puzzle Type #26)](#thermometers-puzzle-type-26)
|
281
286
|
- [Aquarium (Puzzle Type #27)](#aquarium-puzzle-type-27)
|
282
287
|
- [Stitches (Puzzle Type #28)](#stitches-puzzle-type-28)
|
288
|
+
- [Battleships (Puzzle Type #29)](#battleships-puzzle-type-29)
|
283
289
|
- [Why SAT / CP-SAT?](#why-sat--cp-sat)
|
284
290
|
- [Testing](#testing)
|
285
291
|
- [Contributing](#contributing)
|
@@ -2320,6 +2326,9 @@ side = np.array([0, 10, 6, 4, 4, 1, 5, 8, 2, 6, 5, 11, 4, 3, 7])
|
|
2320
2326
|
binst = solver.Board(board=board, top=top, side=side)
|
2321
2327
|
solutions = binst.solve_and_print()
|
2322
2328
|
```
|
2329
|
+
|
2330
|
+
Note: `solver.Board` accepts an optional `connection_count=N` parameter to specify the (÷N) stitches puzzle (by default, 1 stitch).
|
2331
|
+
|
2323
2332
|
**Script Output**
|
2324
2333
|
|
2325
2334
|
```python
|
@@ -2350,6 +2359,86 @@ Time taken: 0.01 seconds
|
|
2350
2359
|
|
2351
2360
|
---
|
2352
2361
|
|
2362
|
+
## Battleships (Puzzle Type #29)
|
2363
|
+
|
2364
|
+
* [**Play online**](https://www.puzzle-battleships.com/)
|
2365
|
+
|
2366
|
+
* [**Solver Code**][29]
|
2367
|
+
|
2368
|
+
<details>
|
2369
|
+
<summary><strong>Rules</strong></summary>
|
2370
|
+
|
2371
|
+
- You have to find the location of the battleships hidden in the grid. Some battleships may be partially revealed.
|
2372
|
+
- A battleship is a straight line of consecutive black cells.
|
2373
|
+
- The number of the battleships from each size is shown in the legend.
|
2374
|
+
- 2 battleships cannot touch each other (even diagonally)
|
2375
|
+
- The numbers outside the grid show the number of cells occupied by battleships on that row/column.
|
2376
|
+
|
2377
|
+
</details>
|
2378
|
+
|
2379
|
+
**Unsolved puzzle**
|
2380
|
+
|
2381
|
+
<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/battleships_unsolved.png" alt="Battleships unsolved" width="500">
|
2382
|
+
|
2383
|
+
Code to utilize this package and solve the puzzle:
|
2384
|
+
|
2385
|
+
```python
|
2386
|
+
from puzzle_solver import battleships_solver as solver
|
2387
|
+
board = np.array([
|
2388
|
+
[' ', ' ', ' ', ' ', ' ', 'S', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2389
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'S', ' ', ' ', ' ', ' '],
|
2390
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'O', ' ', ' '],
|
2391
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2392
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2393
|
+
['W', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2394
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2395
|
+
[' ', ' ', ' ', ' ', ' ', ' ', 'O', ' ', ' ', ' ', ' ', 'W', ' ', ' ', 'R'],
|
2396
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2397
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2398
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2399
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'U', ' ', ' ', ' ', ' '],
|
2400
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', 'L', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2401
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '],
|
2402
|
+
[' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', 'S'],
|
2403
|
+
])
|
2404
|
+
top = np.array([2, 2, 4, 2, 1, 2, 1, 2, 4, 1, 3, 2, 5, 2, 2])
|
2405
|
+
side = np.array([1, 2, 1, 1, 0, 7, 0, 9, 2, 2, 5, 1, 3, 0, 1])
|
2406
|
+
ship_counts = {1: 5, 2: 4, 3: 3, 4: 2, 5: 1}
|
2407
|
+
binst = solver.Board(board=board, top=top, side=side, ship_counts=ship_counts)
|
2408
|
+
solutions = binst.solve_and_print()
|
2409
|
+
```
|
2410
|
+
|
2411
|
+
|
2412
|
+
**Script Output**
|
2413
|
+
|
2414
|
+
```python
|
2415
|
+
Solution found
|
2416
|
+
[[' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
|
2417
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' 'S' ' ' ' ']
|
2418
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ']
|
2419
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ']
|
2420
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
|
2421
|
+
[' ' 'S' 'S' 'S' 'S' ' ' ' ' ' ' ' ' ' ' ' ' 'S' 'S' 'S' ' ']
|
2422
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
|
2423
|
+
[' ' ' ' 'S' ' ' ' ' 'S' 'S' 'S' 'S' 'S' ' ' ' ' 'S' 'S' 'S']
|
2424
|
+
['S' ' ' 'S' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
|
2425
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ' 'S' ' ' ' ' ' ']
|
2426
|
+
['S' 'S' 'S' 'S' ' ' ' ' ' ' ' ' 'S' ' ' ' ' ' ' ' ' ' ' ' ']
|
2427
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' ' ' ' ' ' ' ' ']
|
2428
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S' 'S' ' ' 'S' ' ' ' ' ' ' ' ']
|
2429
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ']
|
2430
|
+
[' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' 'S']]
|
2431
|
+
Solutions found: 1
|
2432
|
+
status: OPTIMAL
|
2433
|
+
Time taken: 0.12 seconds
|
2434
|
+
```
|
2435
|
+
|
2436
|
+
**Solved puzzle**
|
2437
|
+
|
2438
|
+
<img src="https://raw.githubusercontent.com/Ar-Kareem/puzzle_solver/master/images/battleships_solved.png" alt="Battleships solved" width="500">
|
2439
|
+
|
2440
|
+
---
|
2441
|
+
|
2353
2442
|
---
|
2354
2443
|
|
2355
2444
|
## Why SAT / CP-SAT?
|
@@ -2429,3 +2518,4 @@ Issues and PRs welcome!
|
|
2429
2518
|
[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"
|
2430
2519
|
[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"
|
2431
2520
|
[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"
|
2521
|
+
[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"
|
@@ -1,7 +1,8 @@
|
|
1
|
-
puzzle_solver/__init__.py,sha256=
|
1
|
+
puzzle_solver/__init__.py,sha256=1PIodDzUT4ZJ0dIhb2cspUjjsun4qeycBueNkEC6ugA,2118
|
2
2
|
puzzle_solver/core/utils.py,sha256=3LlBDuie_G0uSlzibpQS2ULmEYSZmpJXh1kawj7rjkg,3396
|
3
3
|
puzzle_solver/core/utils_ortools.py,sha256=qLTIzmITqmgGZvg8XpYAZ4c-lhD5sEDQfS8ECdQ_dkM,3005
|
4
4
|
puzzle_solver/puzzles/aquarium/aquarium.py,sha256=BUfkAS2d9eG3TdMoe1cOGGeNYgKUebRvn-z9nsC9gvE,5708
|
5
|
+
puzzle_solver/puzzles/battleships/battleships.py,sha256=0jwDR-bv6EHo8QTDZZ18WzShc7ohYtSSZw_DXh8y5lw,7483
|
5
6
|
puzzle_solver/puzzles/bridges/bridges.py,sha256=zUT0TMIu8l982fqDMJfsTnTgqm48nG0iH8flsGT45_E,5489
|
6
7
|
puzzle_solver/puzzles/chess_range/chess_melee.py,sha256=KnfD_Sxd8bso46eQYpIemp4MIqOUNoonyRVe6soK8kc,231
|
7
8
|
puzzle_solver/puzzles/chess_range/chess_range.py,sha256=IaldwJR4d0VAUxME2QyvtJdUNzGzDV0FGs1iq9KqsRU,21072
|
@@ -25,7 +26,7 @@ puzzle_solver/puzzles/range/range.py,sha256=g6ZuHuulYLpNFsqbnPoIB5KoGPllYppU10-Z
|
|
25
26
|
puzzle_solver/puzzles/signpost/signpost.py,sha256=D19ua8rVwO6sgXq4nVLkZfEyz8hqc6qMOk3j-g44soU,3931
|
26
27
|
puzzle_solver/puzzles/singles/singles.py,sha256=kwMENfqQ-OP3YIz5baY6LRcvYCsNfhImEXN00lwazKM,5658
|
27
28
|
puzzle_solver/puzzles/stitches/stitches.py,sha256=YvT9WXvUMPLcFGOYXWIPyifCi6caZqRqBTuCgNmcTPQ,6662
|
28
|
-
puzzle_solver/puzzles/stitches/parse_map/parse_map.py,sha256=
|
29
|
+
puzzle_solver/puzzles/stitches/parse_map/parse_map.py,sha256=pUB9tG__u4Fq_RCFG_4NNq3LRKAa6FRrvuuL64cUIRM,8866
|
29
30
|
puzzle_solver/puzzles/sudoku/sudoku.py,sha256=M_pry7XyKKzlfCF5rFi02lyOrj5GWZzXnDAxmD3NXvI,3588
|
30
31
|
puzzle_solver/puzzles/tents/tents.py,sha256=iyVK2WXfIT5j_9qqlQg0WmwvixwXlZSsHGK3XA-KpII,6283
|
31
32
|
puzzle_solver/puzzles/thermometers/thermometers.py,sha256=nsvJZkm7G8FALT27bpaB0lv5E_AWawqmvapQI8QcYXw,4015
|
@@ -33,8 +34,8 @@ puzzle_solver/puzzles/towers/towers.py,sha256=QvL0Pp-Z2ewCeq9ZkNrh8MShKOh-Y52sFB
|
|
33
34
|
puzzle_solver/puzzles/tracks/tracks.py,sha256=VnAtxBkuUTHJYNXr1JGg0yYzJj3kRMBi8Nz7NHKS94A,9089
|
34
35
|
puzzle_solver/puzzles/undead/undead.py,sha256=ygNugW5SOlYLy6d740gZ2IW9UJQ3SAr9vuMm0ZFr2nY,6630
|
35
36
|
puzzle_solver/puzzles/unruly/unruly.py,sha256=sDF0oKT50G-NshyW2DYrvAgD9q9Ku9ANUyNhGSAu7cQ,3827
|
36
|
-
puzzle_solver/utils/visualizer.py,sha256=
|
37
|
-
multi_puzzle_solver-0.9.
|
38
|
-
multi_puzzle_solver-0.9.
|
39
|
-
multi_puzzle_solver-0.9.
|
40
|
-
multi_puzzle_solver-0.9.
|
37
|
+
puzzle_solver/utils/visualizer.py,sha256=2LmNoxEqb9PGWmBmHW6jh6OqFgNYguavhHB-9Dv5EUw,6113
|
38
|
+
multi_puzzle_solver-0.9.5.dist-info/METADATA,sha256=SZoYsEEiQ3rFfY54sI23v4X1BO86lJwOC6Wv2HIEakk,121887
|
39
|
+
multi_puzzle_solver-0.9.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
40
|
+
multi_puzzle_solver-0.9.5.dist-info/top_level.txt,sha256=exwVUQa-anK9vYrpKzBPvH8bX43iElWI4VeNiAyBGJY,14
|
41
|
+
multi_puzzle_solver-0.9.5.dist-info/RECORD,,
|
puzzle_solver/__init__.py
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
from puzzle_solver.puzzles.aquarium import aquarium as aquarium_solver
|
2
|
+
from puzzle_solver.puzzles.battleships import battleships as battleships_solver
|
2
3
|
from puzzle_solver.puzzles.bridges import bridges as bridges_solver
|
3
4
|
from puzzle_solver.puzzles.chess_range import chess_range as chess_range_solver
|
4
5
|
from puzzle_solver.puzzles.chess_range import chess_solo as chess_solo_solver
|
@@ -29,4 +30,4 @@ from puzzle_solver.puzzles.unruly import unruly as unruly_solver
|
|
29
30
|
|
30
31
|
from puzzle_solver.puzzles.inertia.parse_map.parse_map import main as inertia_image_parser
|
31
32
|
|
32
|
-
__version__ = '0.9.
|
33
|
+
__version__ = '0.9.5'
|
@@ -0,0 +1,153 @@
|
|
1
|
+
from enum import Enum
|
2
|
+
from dataclasses import dataclass, field
|
3
|
+
from typing import Optional
|
4
|
+
import numpy as np
|
5
|
+
from ortools.sat.python import cp_model
|
6
|
+
|
7
|
+
from puzzle_solver.core.utils import Pos, get_all_pos, get_char, get_neighbors8, set_char, get_neighbors4, get_row_pos, get_col_pos, get_pos, in_bounds
|
8
|
+
from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution, or_constraint
|
9
|
+
|
10
|
+
@dataclass
|
11
|
+
class Ship:
|
12
|
+
is_active: cp_model.IntVar
|
13
|
+
length: int
|
14
|
+
top_left_pos: Pos
|
15
|
+
body: set[Pos]
|
16
|
+
water: set[Pos]
|
17
|
+
mid_body: set[Pos] = field(default_factory=set)
|
18
|
+
top_tip: Optional[Pos] = field(default=None)
|
19
|
+
bottom_tip: Optional[Pos] = field(default=None)
|
20
|
+
left_tip: Optional[Pos] = field(default=None)
|
21
|
+
right_tip: Optional[Pos] = field(default=None)
|
22
|
+
|
23
|
+
class Board:
|
24
|
+
def __init__(self, board: np.array, top: np.array, side: np.array, ship_counts: dict[int, int]):
|
25
|
+
assert board.ndim == 2, f'board must be 2d, got {board.ndim}'
|
26
|
+
self.V = board.shape[0]
|
27
|
+
self.H = board.shape[1]
|
28
|
+
assert top.ndim == 1 and top.shape[0] == self.H, 'top must be a 1d array of length board width'
|
29
|
+
assert side.ndim == 1 and side.shape[0] == self.V, 'side must be a 1d array of length board height'
|
30
|
+
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'
|
31
|
+
self.board = board
|
32
|
+
self.top = top
|
33
|
+
self.side = side
|
34
|
+
self.ship_counts = ship_counts
|
35
|
+
|
36
|
+
self.model = cp_model.CpModel()
|
37
|
+
self.model_vars: dict[Pos, cp_model.IntVar] = {}
|
38
|
+
self.shipyard: list[Ship] = [] # will contain every possible ship based on ship counts
|
39
|
+
|
40
|
+
self.create_vars()
|
41
|
+
self.init_shipyard()
|
42
|
+
self.add_all_constraints()
|
43
|
+
|
44
|
+
def create_vars(self):
|
45
|
+
for pos in get_all_pos(self.V, self.H):
|
46
|
+
self.model_vars[pos] = self.model.NewBoolVar(f'{pos}:is_ship')
|
47
|
+
|
48
|
+
def get_ship(self, pos: Pos, length: int, orientation: str) -> Optional[Ship]:
|
49
|
+
assert orientation in ['horizontal', 'vertical'], 'orientation must be horizontal or vertical'
|
50
|
+
if length == 1:
|
51
|
+
body = {pos}
|
52
|
+
top_tip = None
|
53
|
+
bottom_tip = None
|
54
|
+
left_tip = None
|
55
|
+
right_tip = None
|
56
|
+
elif orientation == 'horizontal':
|
57
|
+
body = set(get_pos(x=x, y=pos.y) for x in range(pos.x, pos.x + length))
|
58
|
+
top_tip = None
|
59
|
+
bottom_tip = None
|
60
|
+
left_tip = pos
|
61
|
+
right_tip = get_pos(x=pos.x + length - 1, y=pos.y)
|
62
|
+
else:
|
63
|
+
body = set(get_pos(x=pos.x, y=y) for y in range(pos.y, pos.y + length))
|
64
|
+
left_tip = None
|
65
|
+
right_tip = None
|
66
|
+
top_tip = pos
|
67
|
+
bottom_tip = get_pos(x=pos.x, y=pos.y + length - 1)
|
68
|
+
if any(not in_bounds(p, self.V, self.H) for p in body):
|
69
|
+
return None
|
70
|
+
water = set(p for pos in body for p in get_neighbors8(pos, self.V, self.H))
|
71
|
+
water -= body
|
72
|
+
mid_body = body - {top_tip, bottom_tip, left_tip, right_tip} if length > 1 else set()
|
73
|
+
return Ship(
|
74
|
+
is_active=self.model.NewBoolVar(f'{pos}:is_active'),
|
75
|
+
length=length,
|
76
|
+
top_left_pos=pos,
|
77
|
+
body=body,
|
78
|
+
water=water,
|
79
|
+
mid_body=mid_body,
|
80
|
+
top_tip=top_tip,
|
81
|
+
bottom_tip=bottom_tip,
|
82
|
+
left_tip=left_tip,
|
83
|
+
right_tip=right_tip,
|
84
|
+
)
|
85
|
+
|
86
|
+
def init_shipyard(self):
|
87
|
+
for length in self.ship_counts.keys():
|
88
|
+
for pos in get_all_pos(self.V, self.H):
|
89
|
+
for orientation in ['horizontal', 'vertical']:
|
90
|
+
if length == 1 and orientation == 'vertical': # prevent double counting 1-length ships
|
91
|
+
continue
|
92
|
+
ship = self.get_ship(pos, length, orientation)
|
93
|
+
if ship is not None:
|
94
|
+
self.shipyard.append(ship)
|
95
|
+
|
96
|
+
def add_all_constraints(self):
|
97
|
+
# ship and cells linked
|
98
|
+
for ship in self.shipyard:
|
99
|
+
for pos in ship.body:
|
100
|
+
self.model.Add(self.model_vars[pos] == 1).OnlyEnforceIf(ship.is_active)
|
101
|
+
for pos in ship.water:
|
102
|
+
self.model.Add(self.model_vars[pos] == 0).OnlyEnforceIf(ship.is_active)
|
103
|
+
# constrain the cell to be an OR of all the ships that can be placed at that position
|
104
|
+
for pos in get_all_pos(self.V, self.H):
|
105
|
+
or_constraint(self.model, self.model_vars[pos], [ship.is_active for ship in self.shipyard if pos in ship.body])
|
106
|
+
# force ship counts
|
107
|
+
for length, count in self.ship_counts.items():
|
108
|
+
self.constrain_ship_counts([ship for ship in self.shipyard if ship.length == length], count)
|
109
|
+
# force initial board placement
|
110
|
+
for pos in get_all_pos(self.V, self.H):
|
111
|
+
c = get_char(self.board, pos)
|
112
|
+
if c == 'S': # single-length ship
|
113
|
+
self.constrain_ship_counts([ship for ship in self.shipyard if ship.length == 1 and ship.top_left_pos == pos], 1)
|
114
|
+
elif c == 'W': # water
|
115
|
+
self.model.Add(self.model_vars[pos] == 0)
|
116
|
+
elif c == 'O': # mid-body of a ship
|
117
|
+
self.constrain_ship_counts([ship for ship in self.shipyard if pos in ship.mid_body], 1)
|
118
|
+
elif c == 'U': # top tip of a ship
|
119
|
+
self.constrain_ship_counts([ship for ship in self.shipyard if ship.top_tip == pos], 1)
|
120
|
+
elif c == 'D': # bottom tip of a ship
|
121
|
+
self.constrain_ship_counts([ship for ship in self.shipyard if ship.bottom_tip == pos], 1)
|
122
|
+
elif c == 'L': # left tip of a ship
|
123
|
+
self.constrain_ship_counts([ship for ship in self.shipyard if ship.left_tip == pos], 1)
|
124
|
+
elif c == 'R': # right tip of a ship
|
125
|
+
self.constrain_ship_counts([ship for ship in self.shipyard if ship.right_tip == pos], 1)
|
126
|
+
elif c == ' ': # empty cell
|
127
|
+
pass
|
128
|
+
else:
|
129
|
+
raise ValueError(f'invalid character: {c}')
|
130
|
+
# force the top and side counts
|
131
|
+
for row in range(self.V):
|
132
|
+
self.model.Add(sum([self.model_vars[p] for p in get_row_pos(row, self.H)]) == self.side[row])
|
133
|
+
for col in range(self.H):
|
134
|
+
self.model.Add(sum([self.model_vars[p] for p in get_col_pos(col, self.V)]) == self.top[col])
|
135
|
+
|
136
|
+
def constrain_ship_counts(self, ships: list[Ship], count: int):
|
137
|
+
self.model.Add(sum([ship.is_active for ship in ships]) == count)
|
138
|
+
|
139
|
+
def solve_and_print(self, verbose: bool = True):
|
140
|
+
def board_to_solution(board: Board, solver: cp_model.CpSolverSolutionCallback) -> SingleSolution:
|
141
|
+
assignment: dict[Pos, int] = {}
|
142
|
+
for pos, var in board.model_vars.items():
|
143
|
+
assignment[pos] = solver.Value(var)
|
144
|
+
return SingleSolution(assignment=assignment)
|
145
|
+
def callback(single_res: SingleSolution):
|
146
|
+
print("Solution found")
|
147
|
+
res = np.full((self.V, self.H), ' ', dtype=str)
|
148
|
+
for pos, val in single_res.assignment.items():
|
149
|
+
c = 'S' if val == 1 else ' '
|
150
|
+
set_char(res, pos, c)
|
151
|
+
print(res)
|
152
|
+
|
153
|
+
return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose)
|
@@ -206,4 +206,5 @@ def main(image):
|
|
206
206
|
if __name__ == '__main__':
|
207
207
|
# to run this script and visualize the output, in the root run:
|
208
208
|
# python .\src\puzzle_solver\puzzles\stitches\parse_map\parse_map.py | python .\src\puzzle_solver\utils\visualizer.py --read_stdin
|
209
|
-
main(Path(__file__).parent / 'input_output' / 'MTM6OSw4MjEsNDAx.png')
|
209
|
+
# main(Path(__file__).parent / 'input_output' / 'MTM6OSw4MjEsNDAx.png')
|
210
|
+
main(Path(__file__).parent / 'input_output' / 'weekly_oct_3rd_2025.png')
|
@@ -123,6 +123,13 @@ def get_input():
|
|
123
123
|
|
124
124
|
if __name__ == '__main__':
|
125
125
|
board = get_input()
|
126
|
+
print('Visualizing board:')
|
127
|
+
print('[')
|
128
|
+
for i,row in enumerate(board):
|
129
|
+
print(' [' + ', '.join([f"'{c}'" for c in row]) + ']', end='')
|
130
|
+
if i != len(board) - 1:
|
131
|
+
print(',')
|
132
|
+
print('\n]')
|
126
133
|
# 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)]
|
127
134
|
vs =[0, 128, 255]
|
128
135
|
rcolors = [(v1, v2, v3) for v1 in vs for v2 in vs for v3 in vs if (v1, v2, v3) != (0, 0, 0)]
|
File without changes
|
File without changes
|