multi-puzzle-solver 1.0.4__py3-none-any.whl → 1.0.7__py3-none-any.whl

puzzle_solver/puzzles/heyawake/heyawake.py

@@ -1,9 +1,9 @@
 import numpy as np
 from ortools.sat.python import cp_model
 
-from puzzle_solver.core.utils import Pos, get_all_pos, get_neighbors4, get_pos, get_char
+from puzzle_solver.core.utils import Pos, get_all_pos, get_col_pos, get_neighbors4, get_pos, get_char, get_row_pos
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution, force_connected_component
-from puzzle_solver.core.utils_visualizer import render_shaded_grid
+from puzzle_solver.core.utils_visualizer import combined_function, id_board_to_wall_fn
 
 
 def return_3_consecutives(int_list: list[int]) -> list[tuple[int, int]]:
@@ -20,6 +20,17 @@ def return_3_consecutives(int_list: list[int]) -> list[tuple[int, int]]:
         out.append((begin_idx, end_idx))
     return out
 
+
+def get_diagonal(pos1: Pos, pos2: Pos) -> list[Pos]:
+    assert pos1 != pos2, 'positions must be different'
+    dx = pos1.x - pos2.x
+    dy = pos1.y - pos2.y
+    assert abs(dx) == abs(dy), 'positions must be on a diagonal'
+    sdx = 1 if dx > 0 else -1
+    sdy = 1 if dy > 0 else -1
+    return [get_pos(x=pos2.x + i*sdx, y=pos2.y + i*sdy) for i in range(abs(dx) + 1)]
+
+
 class Board:
     def __init__(self, board: np.array, region_to_clue: dict[str, int]):
         assert board.ndim == 2, f'board must be 2d, got {board.ndim}'
@@ -59,6 +70,10 @@ class Board:
         force_connected_component(self.model, self.W)
         # A straight (orthogonal) line of connected white cells cannot span across more than 2 regions.
         self.disallow_white_lines_spanning_3_regions()
+        # straight diagonal black lines from side wall to horizontal wall are not allowed; because they would disconnect the white cells
+        self.disallow_full_black_diagonal()
+        # disallow a diagonal black line coming out of a wall of length N then coming back in on the same wall; because it would disconnect the white cells
+        self.disallow_zigzag_on_wall()
 
     def disallow_white_lines_spanning_3_regions(self):
         # A straight (orthogonal) line of connected white cells cannot span across more than 2 regions.
@@ -77,18 +92,61 @@ class Board:
                 pos_list = [get_pos(x=col_num, y=y) for y in range(begin_idx, end_idx+1)]
                 self.model.AddBoolOr([self.B[p] for p in pos_list])
 
-    def solve_and_print(self, verbose: bool = True):
+    def disallow_full_black_diagonal(self):
+        corners_dx_dy = [
+            ((0, 0), 1, 1),
+            ((self.H-1, 0), -1, 1),
+            ((0, self.V-1), 1, -1),
+            ((self.H-1, self.V-1), -1, -1),
+        ]
+        for (corner_x, corner_y), dx, dy in corners_dx_dy:
+            for delta in range(1, min(self.V, self.H)):
+                pos1 = get_pos(x=corner_x, y=corner_y + delta*dy)
+                pos2 = get_pos(x=corner_x + delta*dx, y=corner_y)
+                diagonal_line = get_diagonal(pos1, pos2)
+                self.model.AddBoolOr([self.W[p] for p in diagonal_line])
+
+    def disallow_zigzag_on_wall(self):
+        for pos in get_row_pos(0, self.H):  # top line
+            for end_x in range(pos.x + 2, self.H, 2):  # end pos is even distance away from start pos
+                end_pos = get_pos(x=end_x, y=pos.y)
+                dx = end_x - pos.x
+                mid_pos = get_pos(x=pos.x + dx//2, y=pos.y + dx//2)
+                diag_1 = get_diagonal(pos, mid_pos)  # from top wall to bottom triangle tip "\"
+                diag_2 = get_diagonal(end_pos, mid_pos)  # from bottom triangle tip to top wall "/"
+                self.model.AddBoolOr([self.W[p] for p in diag_1 + diag_2])
+        for pos in get_row_pos(self.V-1, self.H):  # bottom line
+            for end_x in range(pos.x + 2, self.H, 2):  # end pos is even distance away from start pos
+                end_pos = get_pos(x=end_x, y=pos.y)
+                dx = end_x - pos.x
+                mid_pos = get_pos(x=pos.x + dx//2, y=pos.y - dx//2)
+                diag_1 = get_diagonal(pos, mid_pos)  # from bottom wall to top triangle tip "/"
+                diag_2 = get_diagonal(end_pos, mid_pos)  # from top triangle tip to bottom wall "\"
+                self.model.AddBoolOr([self.W[p] for p in diag_1 + diag_2])
+        for pos in get_col_pos(0, self.V):  # left line
+            for end_y in range(pos.y + 2, self.V, 2):  # end pos is even distance away from start pos
+                end_pos = get_pos(x=pos.x, y=end_y)
+                dy = end_y - pos.y
+                mid_pos = get_pos(x=pos.x + dy//2, y=pos.y + dy//2)
+                diag_1 = get_diagonal(pos, mid_pos)  # from left wall to right triangle tip "\"
+                diag_2 = get_diagonal(end_pos, mid_pos)  # from right triangle tip to left wall "/"
+                self.model.AddBoolOr([self.W[p] for p in diag_1 + diag_2])
+        for pos in get_col_pos(self.H-1, self.V):  # right line
+            for end_y in range(pos.y + 2, self.V, 2):  # end pos is even distance away from start pos
+                end_pos = get_pos(x=pos.x, y=end_y)
+                dy = end_y - pos.y
+                mid_pos = get_pos(x=pos.x - dy//2, y=pos.y + dy//2)
+                diag_1 = get_diagonal(pos, mid_pos)  # from right wall to left triangle tip "/"
+
+    def solve_and_print(self, verbose: bool = True, max_solutions: int = 20):
         def board_to_solution(board: Board, solver: cp_model.CpSolverSolutionCallback) -> SingleSolution:
-            assignment: dict[Pos, int] = {}
-            for pos, var in board.B.items():
-                assignment[pos] = 1 if solver.Value(var) == 1 else 0
-            return SingleSolution(assignment=assignment)
+            return SingleSolution(assignment={pos: solver.Value(var) for pos, var in board.B.items()})
         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 = 'B' if single_res.assignment[pos] == 1 else ' '
-            #     set_char(res, pos, c)
-            # print(res)
-            print(render_shaded_grid(self.V, self.H, lambda r, c: single_res.assignment[get_pos(x=c, y=r)] == 1, empty_text=lambda r, c: self.region_to_clue.get(int(self.board[r, c]), ' ')))
-        return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose, max_solutions=1)
+            print(combined_function(self.V, self.H,
+                cell_flags=id_board_to_wall_fn(self.board),
+                is_shaded=lambda r, c: single_res.assignment[get_pos(x=c, y=r)] == 1,
+                center_char=lambda r, c: self.region_to_clue.get(int(self.board[r, c]), ''),
+                text_on_shaded_cells=False
+            ))
+        return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose, max_solutions=max_solutions)

puzzle_solver/puzzles/kakurasu/kakurasu.py

@@ -1,22 +1,21 @@
 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 import Pos, get_all_pos, get_pos
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
+from puzzle_solver.core.utils_visualizer import combined_function
 
 
 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.V = side.shape[0]
         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()
 
@@ -32,15 +31,8 @@ class Board:
 
     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)
+            return SingleSolution(assignment={pos: solver.Value(var) for pos, var in board.model_vars.items()})
         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)
+            print(combined_function(self.V, self.H, is_shaded=lambda r, c: single_res.assignment[get_pos(x=c, y=r)]))
         return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose)

puzzle_solver/puzzles/kakuro/kakuro.py

@@ -6,7 +6,7 @@ from ortools.sat.python.cp_model import LinearExpr as lxp
 
 from puzzle_solver.core.utils import Direction, Pos, get_all_pos, get_next_pos, get_pos, in_bounds, get_char
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
-from puzzle_solver.core.utils_visualizer import render_shaded_grid
+from puzzle_solver.core.utils_visualizer import combined_function
 
 
 class Board:
@@ -73,5 +73,9 @@ class Board:
             return SingleSolution(assignment=assignment)
         def callback(single_res: SingleSolution):
             print("Solution found")
-            print(render_shaded_grid(self.V, self.H, is_shaded=lambda r, c: self.board[r, c] == '#', empty_text=lambda r, c: str(single_res.assignment[get_pos(x=c, y=r)])))
+            print(combined_function(self.V, self.H,
+                is_shaded=lambda r, c: self.board[r, c] == '#',
+                center_char=lambda r, c: str(single_res.assignment[get_pos(x=c, y=r)]),
+                text_on_shaded_cells=False
+            ))
         return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose)

puzzle_solver/puzzles/lits/lits.py

@@ -6,7 +6,7 @@ import numpy as np
 
 from puzzle_solver.core.utils import Pos, get_all_pos, get_char, set_char, get_pos, in_bounds, Direction, get_next_pos, polyominoes_with_shape_id
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution, force_connected_component
-from puzzle_solver.core.utils_visualizer import id_board_to_wall_board, render_grid
+from puzzle_solver.core.utils_visualizer import combined_function, id_board_to_wall_fn
 
 
 # a shape on the 2d board is just a set of positions
@@ -132,5 +132,7 @@ class Board:
             res = np.full((self.V, self.H), ' ', dtype=object)
             for pos, val in single_res.assignment.items():
                 set_char(res, pos, '▒▒▒' if val == 1 else ' ')
-            print(render_grid(id_board_to_wall_board(self.board), center_char=lambda r, c: res[r][c]))
+            print(combined_function(self.V, self.H,
+                cell_flags=id_board_to_wall_fn(self.board),
+                center_char=lambda r, c: res[r][c]))
         return generic_solve_all(self, board_to_solution, callback=callback if verbose_callback else None, verbose=verbose, max_solutions=max_solutions)

puzzle_solver/puzzles/mosaic/mosaic.py

@@ -2,47 +2,37 @@ 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_char, get_neighbors8
+from puzzle_solver.core.utils import Pos, get_all_pos, get_char, get_neighbors8, get_pos
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
+from puzzle_solver.core.utils_visualizer import combined_function
 
 
 class Board:
     def __init__(self, board: np.array):
         assert board.ndim == 2, f'board must be 2d, got {board.ndim}'
-        assert board.shape[0] == board.shape[1], 'board must be square'
         assert all((c.item() == ' ') or str(c.item()).isdecimal() for c in np.nditer(board)), 'board must contain only space or digits'
         self.board = board
-        self.N = board.shape[0]
+        self.V, self.H = board.shape
         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.N):
+        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 pos in get_all_pos(self.N):
+        for pos in get_all_pos(self.V, self.H):
             c = get_char(self.board, pos)
             if not str(c).isdecimal():
                 continue
-            neighbour_vars = [self.model_vars[p] for p in get_neighbors8(pos, self.N, include_self=True)]
-            self.model.Add(lxp.sum(neighbour_vars) == int(c))
+            self.model.Add(lxp.Sum([self.model_vars[n] for n in get_neighbors8(pos, self.V, self.H, include_self=True)]) == int(c))
 
     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)
+            return SingleSolution(assignment={pos: solver.Value(var) for pos, var in board.model_vars.items()})
         def callback(single_res: SingleSolution):
             print("Solution found")
-            res = np.full((self.N, self.N), ' ', dtype=object)
-            for pos in get_all_pos(self.N):
-                c = get_char(self.board, pos)
-                c = 'B' if single_res.assignment[pos] == 1 else ' '
-                set_char(res, pos, c)
-            print(res)
+            print(combined_function(self.V, self.H, is_shaded=lambda r, c: single_res.assignment[get_pos(x=c, y=r)] == 1, center_char=lambda r, c: str(self.board[r, c]), text_on_shaded_cells=False))
         return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose)

puzzle_solver/puzzles/nonograms/nonograms.py

@@ -1,8 +1,82 @@
-import numpy as np
 from ortools.sat.python import cp_model
 
-from puzzle_solver.core.utils import Pos, get_all_pos, set_char, get_row_pos, get_col_pos
+from puzzle_solver.core.utils import Pos, get_all_pos, get_pos, get_row_pos, get_col_pos
 from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
+from puzzle_solver.core.utils_visualizer import combined_function
+
+
+def constrain_nonogram_sequence(model: cp_model.CpModel, clues: list[int], current_sequence: list[cp_model.IntVar], ns: str):
+    """
+    Constrain a binary sequence (current_sequence) to match the nonogram clues in clues.
+
+    clues: e.g., [3,1] means: a run of 3 ones, >=1 zero, then a run of 1 one.
+    current_sequence: list of IntVar in {0,1}.
+    extra_vars: dict for storing helper vars safely across multiple calls.
+
+    steps:
+    - Create start position s_i for each run i.
+    - Enforce order and >=1 separation between runs.
+    - Link each cell j to exactly one run interval (or none) via coverage booleans.
+    - Force sum of ones to equal sum(clues).
+    """
+    L = len(current_sequence)
+
+    # not needed but useful for debugging: any clue longer than the line ⇒ unsat.
+    if sum(clues) + len(clues) - 1 > L:
+        print(f"Infeasible: clue {clues} longer than line length {L} for {ns}")
+        model.Add(0 == 1)
+        return
+
+    result = {}
+    # Start variables for each run. This is the most critical variable for the problem.
+    starts = []
+    result[f"{ns}_starts"] = starts
+    for i in range(len(clues)):
+        s = model.NewIntVar(0, L, f"{ns}_s[{i}]")
+        starts.append(s)
+    # Enforce order and >=1 blank between consecutive runs.
+    for i in range(len(clues) - 1):
+        model.Add(starts[i + 1] >= starts[i] + clues[i] + 1)
+    # enforce that every run is fully contained in the board
+    for i in range(len(clues)):
+        model.Add(starts[i] + clues[i] <= L)
+
+    # For each cell j, create booleans cover[i][j] that indicate
+    # whether run i covers cell j:  (starts[i] <= j) AND (j < starts[i] + clues[i])
+    cover = [[None] * L for _ in range(len(clues))]
+    list_b_le = [[None] * L for _ in range(len(clues))]
+    list_b_lt_end = [[None] * L for _ in range(len(clues))]
+    result[f"{ns}_cover"] = cover
+    result[f"{ns}_list_b_le"] = list_b_le
+    result[f"{ns}_list_b_lt_end"] = list_b_lt_end
+
+    for i, c in enumerate(clues):
+        s_i = starts[i]
+        for j in range(L):
+            # b_le: s_i <= j [is start[i] <= j]
+            b_le = model.NewBoolVar(f"{ns}_le[{i},{j}]")
+            model.Add(s_i <= j).OnlyEnforceIf(b_le)
+            model.Add(s_i >= j + 1).OnlyEnforceIf(b_le.Not())
+
+            # b_lt_end: j < s_i + c  ⇔  s_i + c - 1 >= j [is start[i] + clues[i] - 1 (aka end[i]) >= j]
+            b_lt_end = model.NewBoolVar(f"{ns}_lt_end[{i},{j}]")
+            end_expr = s_i + c - 1
+            model.Add(end_expr >= j).OnlyEnforceIf(b_lt_end)
+            model.Add(end_expr <= j - 1).OnlyEnforceIf(b_lt_end.Not())  # (s_i + c - 1) < j
+
+            b_cov = model.NewBoolVar(f"{ns}_cov[{i},{j}]")
+            # If covered ⇒ both comparisons true
+            model.AddBoolAnd([b_le, b_lt_end]).OnlyEnforceIf(b_cov)
+            # If both comparisons true ⇒ covered
+            model.AddBoolOr([b_cov, b_le.Not(), b_lt_end.Not()])
+            cover[i][j] = b_cov
+            list_b_le[i][j] = b_le
+            list_b_lt_end[i][j] = b_lt_end
+
+    # Each cell j is 1 iff it is covered by exactly one run.
+    # (Because runs are separated by >=1 zero, these coverage intervals cannot overlap,
+    for j in range(L):
+        model.Add(sum(cover[i][j] for i in range(len(clues))) == current_sequence[j])
 
 
 class Board:
@@ -30,97 +104,18 @@ class Board:
             if ground_sequence == -1:
                 continue
             current_sequence = [self.model_vars[pos] for pos in get_row_pos(i, self.H)]
-            self.constrain_nonogram_sequence(ground_sequence, current_sequence, f'ngm_side_{i}')
+            constrain_nonogram_sequence(self.model, ground_sequence, current_sequence, f'ngm_side_{i}')
         for i in range(self.H):
             ground_sequence = self.top[i]
             if ground_sequence == -1:
                 continue
             current_sequence = [self.model_vars[pos] for pos in get_col_pos(i, self.V)]
-            self.constrain_nonogram_sequence(ground_sequence, current_sequence, f'ngm_top_{i}')
-
-    def constrain_nonogram_sequence(self, clues: list[int], current_sequence: list[cp_model.IntVar], ns: str):
-        """
-        Constrain a binary sequence (current_sequence) to match the nonogram clues in clues.
-
-        clues: e.g., [3,1] means: a run of 3 ones, >=1 zero, then a run of 1 one.
-        current_sequence: list of IntVar in {0,1}.
-        extra_vars: dict for storing helper vars safely across multiple calls.
-
-        steps:
-        - Create start position s_i for each run i.
-        - Enforce order and >=1 separation between runs.
-        - Link each cell j to exactly one run interval (or none) via coverage booleans.
-        - Force sum of ones to equal sum(clues).
-        """
-        L = len(current_sequence)
-
-        # not needed but useful for debugging: any clue longer than the line ⇒ unsat.
-        if sum(clues) + len(clues) - 1 > L:
-            print(f"Infeasible: clue {clues} longer than line length {L} for {ns}")
-            self.model.Add(0 == 1)
-            return
-
-        # Start variables for each run. This is the most critical variable for the problem.
-        starts = []
-        self.extra_vars[f"{ns}_starts"] = starts
-        for i in range(len(clues)):
-            s = self.model.NewIntVar(0, L, f"{ns}_s[{i}]")
-            starts.append(s)
-        # Enforce order and >=1 blank between consecutive runs.
-        for i in range(len(clues) - 1):
-            self.model.Add(starts[i + 1] >= starts[i] + clues[i] + 1)
-        # enforce that every run is fully contained in the board
-        for i in range(len(clues)):
-            self.model.Add(starts[i] + clues[i] <= L)
-
-        # For each cell j, create booleans cover[i][j] that indicate
-        # whether run i covers cell j:  (starts[i] <= j) AND (j < starts[i] + clues[i])
-        cover = [[None] * L for _ in range(len(clues))]
-        list_b_le = [[None] * L for _ in range(len(clues))]
-        list_b_lt_end = [[None] * L for _ in range(len(clues))]
-        self.extra_vars[f"{ns}_cover"] = cover
-        self.extra_vars[f"{ns}_list_b_le"] = list_b_le
-        self.extra_vars[f"{ns}_list_b_lt_end"] = list_b_lt_end
-
-        for i, c in enumerate(clues):
-            s_i = starts[i]
-            for j in range(L):
-                # b_le: s_i <= j [is start[i] <= j]
-                b_le = self.model.NewBoolVar(f"{ns}_le[{i},{j}]")
-                self.model.Add(s_i <= j).OnlyEnforceIf(b_le)
-                self.model.Add(s_i >= j + 1).OnlyEnforceIf(b_le.Not())
-
-                # b_lt_end: j < s_i + c  ⇔  s_i + c - 1 >= j [is start[i] + clues[i] - 1 (aka end[i]) >= j]
-                b_lt_end = self.model.NewBoolVar(f"{ns}_lt_end[{i},{j}]")
-                end_expr = s_i + c - 1
-                self.model.Add(end_expr >= j).OnlyEnforceIf(b_lt_end)
-                self.model.Add(end_expr <= j - 1).OnlyEnforceIf(b_lt_end.Not())  # (s_i + c - 1) < j
-
-                b_cov = self.model.NewBoolVar(f"{ns}_cov[{i},{j}]")
-                # If covered ⇒ both comparisons true
-                self.model.AddBoolAnd([b_le, b_lt_end]).OnlyEnforceIf(b_cov)
-                # If both comparisons true ⇒ covered
-                self.model.AddBoolOr([b_cov, b_le.Not(), b_lt_end.Not()])
-                cover[i][j] = b_cov
-                list_b_le[i][j] = b_le
-                list_b_lt_end[i][j] = b_lt_end
-
-        # Each cell j is 1 iff it is covered by exactly one run.
-        # (Because runs are separated by >=1 zero, these coverage intervals cannot overlap,
-        for j in range(L):
-            self.model.Add(sum(cover[i][j] for i in range(len(clues))) == current_sequence[j])
+            constrain_nonogram_sequence(self.model, ground_sequence, current_sequence, f'ngm_top_{i}')
 
     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)
+            return SingleSolution(assignment={pos: solver.value(var) for pos, var in board.model_vars.items()})
         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 = 'B' if single_res.assignment[pos] == 1 else ' '
-                set_char(res, pos, c)
-            print(res)
+            print(combined_function(self.V, self.H, is_shaded=lambda r, c: single_res.assignment[get_pos(x=c, y=r)]))
         return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose)

puzzle_solver/puzzles/nonograms/nonograms_colored.py

@@ -0,0 +1,221 @@
+from collections import defaultdict
+from typing import Optional
+
+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_pos, set_char, get_row_pos, get_col_pos
+from puzzle_solver.core.utils_ortools import generic_solve_all, SingleSolution
+from puzzle_solver.core.utils_visualizer import combined_function
+
+
+def assert_input(lines: list[list[tuple[int, str]]]):
+    for line in lines:
+        for i,c in enumerate(line):
+            if c == -1:
+                continue
+            elif isinstance(c, str):
+                assert c[:-1].isdigit(), f'strings must begin with a digit, got {c}'
+                line[i] = (int(c[:-1]), c[-1])
+            elif isinstance(c, tuple):
+                assert len(c) == 2 and isinstance(c[0], int) and isinstance(c[1], str), f'tuples must be (int, str), got {c}'
+            else:
+                raise ValueError(f'invalid cell value: {c}')
+
+
+class Board:
+    def __init__(self, top: list[list[tuple[int, str]]], side: list[list[tuple[int, str]]]):
+        assert_input(top)
+        assert_input(side)
+        self.top = top
+        self.side = side
+        self.V = len(side)
+        self.H = len(top)
+        self.unique_colors = list(set([i[1] for line in top for i in line if i != -1] + [i[1] for line in side for i in line if i != -1]))
+        self.model = cp_model.CpModel()
+        self.model_vars: dict[Pos, dict[str, cp_model.IntVar]] = defaultdict(dict)
+        self.extra_vars = {}
+
+        self.create_vars()
+        self.add_all_constraints()
+
+    def create_vars(self):
+        for pos in get_all_pos(self.V, self.H):
+            for color in self.unique_colors:
+                self.model_vars[pos][color] = self.model.NewBoolVar(f'{pos}:{color}')
+
+    def add_all_constraints(self):
+        for pos in get_all_pos(self.V, self.H):
+            self.model.Add(lxp.sum(list(self.model_vars[pos].values())) <= 1)
+        for i in range(self.V):
+            ground_sequence = self.side[i]
+            if tuple(ground_sequence) == (-1,):
+                continue
+            current_sequence = [self.model_vars[pos] for pos in get_row_pos(i, self.H)]
+            self.constrain_nonogram_sequence(ground_sequence, current_sequence, f'ngm_side_{i}')
+        for i in range(self.H):
+            ground_sequence = self.top[i]
+            if tuple(ground_sequence) == (-1,):
+                continue
+            current_sequence = [self.model_vars[pos] for pos in get_col_pos(i, self.V)]
+            self.constrain_nonogram_sequence(ground_sequence, current_sequence, f'ngm_top_{i}')
+
+    def constrain_nonogram_sequence(self, clues: list[tuple[int, str]], current_sequence: list[dict[str, cp_model.IntVar]], ns: str):
+        """
+        Constrain a colored sequence (current_sequence) to match the nonogram clues in clues.
+
+        clues: e.g., [(3, 'R'), (1, 'G')] means: a run of 3 red ones, then a run of 1 green one. If two clues are next to each other and have the same color, they must be separated by at least one blank.
+        current_sequence: list of dicts of IntVar in {0,1} for each color.
+
+        steps:
+        - Create start position s_i for each run i.
+        - Enforce order and >=1 separation between runs.
+        - Link each cell j to exactly one run interval (or none) via coverage booleans.
+        - Force sum of ones to equal sum(clues).
+        """
+        L = len(current_sequence)
+        R = len(clues)
+
+        # Early infeasibility check:
+        # Minimum required blanks equals number of adjacent pairs with same color.
+        same_color_separators = sum(1 for (len_i, col_i), (len_j, col_j) in zip(clues, clues[1:]) if col_i == col_j)
+        min_needed = sum(len_i for len_i, _ in clues) + same_color_separators
+        if min_needed > L:
+            print(f"Infeasible: clues {clues} need {min_needed} cells but line length is {L} for {ns}")
+            self.model.Add(0 == 1)
+            return
+
+        # Collect the color set present in clues and in the line vars
+        clue_colors = {c for _, c in clues}
+        seq_colors = set()
+        for j in range(L):
+            seq_colors.update(current_sequence[j].keys())
+        colors = sorted(clue_colors | seq_colors)
+
+        # Start vars per run
+        starts: list[cp_model.IntVar] = []
+        self.extra_vars[f"{ns}_starts"] = starts
+        for i in range(len(clues)):
+            # s_i in [0, L] but we will bound by containment constraint below
+            s = self.model.NewIntVar(0, L, f"{ns}_s[{i}]")
+            starts.append(s)
+
+        # Ordering + separation:
+        # If same color: s[i+1] >= s[i] + len[i] + 1
+        # If different color: s[i+1] >= s[i] + len[i]
+        for i in range(R - 1):
+            len_i, col_i = clues[i]
+            _, col_next = clues[i + 1]
+            gap = 1 if col_i == col_next else 0
+            self.model.Add(starts[i + 1] >= starts[i] + len_i + gap)
+
+        # Containment: s[i] + len[i] <= L
+        for i, (run_len, _) in enumerate(clues):
+            self.model.Add(starts[i] + run_len <= L)
+
+        # Coverage booleans: cover[i][j] <=> (starts[i] <= j) AND (j < starts[i] + run_len)
+        cover = [[None] * L for _ in range(R)]
+        list_b_le = [[None] * L for _ in range(R)]
+        list_b_lt_end = [[None] * L for _ in range(R)]
+        self.extra_vars[f"{ns}_cover"] = cover
+        self.extra_vars[f"{ns}_list_b_le"] = list_b_le
+        self.extra_vars[f"{ns}_list_b_lt_end"] = list_b_lt_end
+
+        for i, (run_len, _) in enumerate(clues):
+            s_i = starts[i]
+            for j in range(L):
+                b_le = self.model.NewBoolVar(f"{ns}_le[{i},{j}]")  # s_i <= j
+                self.model.Add(s_i <= j).OnlyEnforceIf(b_le)
+                self.model.Add(s_i >= j + 1).OnlyEnforceIf(b_le.Not())
+
+                b_lt_end = self.model.NewBoolVar(f"{ns}_lt_end[{i},{j}]")  # j < s_i + run_len  <=>  s_i + run_len - 1 >= j
+                end_expr = s_i + run_len - 1
+                self.model.Add(end_expr >= j).OnlyEnforceIf(b_lt_end)
+                self.model.Add(end_expr <= j - 1).OnlyEnforceIf(b_lt_end.Not())
+
+                b_cov = self.model.NewBoolVar(f"{ns}_cov[{i},{j}]")
+                self.model.AddBoolAnd([b_le, b_lt_end]).OnlyEnforceIf(b_cov)
+                self.model.AddBoolOr([b_cov, b_le.Not(), b_lt_end.Not()])
+
+                cover[i][j] = b_cov
+                list_b_le[i][j] = b_le
+                list_b_lt_end[i][j] = b_lt_end
+
+        # Link coverage to per-cell, per-color variables.
+        # For each color k and cell j:
+        #   sum_{i: color_i == k} cover[i][j] == current_sequence[j][k]
+        # Also tie the total cover at j to the sum over all colors at j:
+        #   sum_i cover[i][j] == sum_k current_sequence[j][k]
+        # This enforces that at most one color is active per cell (since the LHS is in {0,1} due to non-overlap).
+        # If a color var is missing in current_sequence[j], assume it’s an implicit 0 by creating a fixed zero var.
+        # (Alternatively, require the caller to provide all colors per cell.)
+        zero_cache = {}
+        def get_zero(name: str):
+            if name not in zero_cache:
+                z = self.model.NewConstant(0)
+                zero_cache[name] = z
+            return zero_cache[name]
+
+        # Pre-index runs by color for efficiency
+        runs_by_color = {k: [] for k in colors}
+        for i, (_, k) in enumerate(clues):
+            runs_by_color[k].append(i)
+
+        for j in range(L):
+            # Total coverage at cell j
+            total_cov_j = sum(cover[i][j] for i in range(R)) if R > 0 else 0
+
+            # Sum of color vars at cell j
+            color_vars_j = []
+            for k in colors:
+                v = current_sequence[j].get(k, None)
+                if v is None:
+                    v = get_zero(f"{ns}_zero_{k}")
+                color_vars_j.append(v)
+
+                # Per-color coverage equality
+                if runs_by_color[k]:
+                    self.model.Add(sum(cover[i][j] for i in runs_by_color[k]) == v)
+                else:
+                    # No runs of this color -> force cell color var to 0
+                    self.model.Add(v == 0)
+
+            # Tie total coverage to sum of color vars (blank vs exactly-one color)
+            if R > 0:
+                self.model.Add(total_cov_j == sum(color_vars_j))
+            else:
+                # No runs at all: all cells must be blank across all colors
+                for v in color_vars_j:
+                    self.model.Add(v == 0)
+
+        # Optional but strong propagation: per-color totals must match total clue lengths of that color
+        total_len_by_color = {k: 0 for k in colors}
+        for length, k in clues:
+            total_len_by_color[k] += length
+
+        for k in colors:
+            total_cells_k = sum(current_sequence[j].get(k, get_zero(f"{ns}_zero_{k}")) for j in range(L))
+            self.model.Add(total_cells_k == total_len_by_color[k])
+
+    def solve_and_print(self, verbose: bool = True, visualize_colors: Optional[dict[str, str]] = None):
+        def board_to_solution(board: Board, solver: cp_model.CpSolverSolutionCallback) -> SingleSolution:
+            return SingleSolution(assignment={pos: color for pos, d in board.model_vars.items() for color, var in d.items() if solver.value(var) == 1})
+        def callback(single_res: SingleSolution):
+            print("Solution found")
+            print(combined_function(self.V, self.H, center_char=lambda r, c: single_res.assignment.get(get_pos(x=c, y=r), ' ')))
+            if visualize_colors is not None:
+                from matplotlib import pyplot as plt
+                from matplotlib.colors import ListedColormap
+                visualize_colors[' '] = 'black'
+                visualize_colors_keys = list(visualize_colors.keys())
+                char_to_int = {c: i for i, c in enumerate(visualize_colors_keys)}
+                nums = [[char_to_int[single_res.assignment.get(get_pos(x=c, y=r), ' ')] for c in range(self.H)] for r in range(self.V)]
+                plt.imshow(nums,
+                        aspect='equal',
+                        cmap=ListedColormap([visualize_colors[c] for c in visualize_colors_keys]),
+                        extent=[0, self.H, self.V, 0])
+                plt.colorbar()
+                # plt.grid(True)
+                plt.show()
+        return generic_solve_all(self, board_to_solution, callback=callback if verbose else None, verbose=verbose)