Skip to content

chore(deps): lock file maintenance #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjpieters merged 2 commits into from
Jul 24, 2026
Merged

chore(deps): lock file maintenance #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a309a50
chore(deps): lock file maintenance
renovate[bot] Jul 24, 2026
b2f20e4
chore: ignore new "partially unknown" errors
mjpieters Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/rummikub_solver/_gamestate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def add_rack(self, *tiles: Tile | int) -> None:
return
tmap = self._tile_map
self._rack += Counter(tmap[t] for t in tiles)
np.add.at(self._rack_array, np.array(tiles) - 1, 1)
np.add.at(self._rack_array, np.array(tiles) - 1, 1) # pyright: ignore[reportUnknownMemberType]

def remove_rack(self, *tiles: Tile | int) -> None:
"""Remove tiles from the rack.
Expand All @@ -180,7 +180,7 @@ def remove_rack(self, *tiles: Tile | int) -> None:
tmap = self._tile_map
self._rack -= Counter(tmap[t] for t in tiles)
rack = self._rack_array
np.subtract.at(rack, np.array(tiles) - 1, 1)
np.subtract.at(rack, np.array(tiles) - 1, 1) # pyright: ignore[reportUnknownMemberType]
rack[rack < 0] = 0 # in case we removed tiles not on the rack

def add_table(self, *tiles: Tile | int) -> None:
Expand All @@ -196,7 +196,7 @@ def add_table(self, *tiles: Tile | int) -> None:
return
tmap = self._tile_map
self._table += Counter(tmap[t] for t in tiles)
np.add.at(self._table_array, np.array(tiles) - 1, 1)
np.add.at(self._table_array, np.array(tiles) - 1, 1) # pyright: ignore[reportUnknownMemberType]

def remove_table(self, *tiles: Tile | int) -> None:
"""Remove tiles from the table.
Expand All @@ -213,7 +213,7 @@ def remove_table(self, *tiles: Tile | int) -> None:
tmap = self._tile_map
self._table -= Counter(tmap[t] for t in tiles)
table = self._table_array
np.subtract.at(table, np.array(tiles) - 1, 1)
np.subtract.at(table, np.array(tiles) - 1, 1) # pyright: ignore[reportUnknownMemberType]
table[table < 0] = 0 # in case we removed tiles not on the table

def __eq__(self, other: object) -> bool:
Expand Down
12 changes: 6 additions & 6 deletions src/rummikub_solver/_solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ def __init__(self, ruleset: RuleSet, backend: MILPSolver | None = None) -> None:
# a given set. Each column is a set, each row a tile
slen = len(ruleset.sets)
smatrix = np.zeros((ruleset.tile_count, slen), dtype=np.uint8)
np.add.at(
np.add.at( # pyright: ignore[reportUnknownMemberType]
smatrix,
(
np.fromiter(chain.from_iterable(ruleset.sets), np.uint8) - 1,
np.repeat(
np.repeat( # pyright: ignore[reportUnknownMemberType]
np.arange(slen), np.fromiter(map(len, ruleset.sets), np.uint16)
),
),
Expand Down Expand Up @@ -102,11 +102,11 @@ def __init__(self, ruleset: RuleSet, backend: MILPSolver | None = None) -> None:
p[SolverMode.TILE_COUNT] = cp.Problem(cp.Maximize(cp.sum(tiles)), constraints) # type: ignore[reportUnknownMemberType]

# Problem solver maximising the total value of tiles placed
tilevalue = np.tile(
tilevalue = np.tile( # pyright: ignore[reportUnknownMemberType]
np.arange(ruleset.numbers, dtype=np.uint16) + 1, ruleset.colours
)
if ruleset.jokers:
tilevalue = np.append(tilevalue, 0)
tilevalue = np.append(tilevalue, 0) # pyright: ignore[reportUnknownMemberType]
p[SolverMode.TOTAL_VALUE] = cp.Problem(
cp.Maximize(cp.sum(tiles[:, np.newaxis] @ tilevalue[np.newaxis, :])), # type: ignore[reportUnknownMemberType]
constraints,
Expand Down Expand Up @@ -166,12 +166,12 @@ def __call__(self, mode: SolverMode, state: GameState) -> SolverSolution:
tiles = np.rint(self.tiles.value).astype(int)
(tidx,) = tiles.nonzero()
# add 1 to the indices to get tile numbers
selected_tiles = np.repeat(tidx + 1, tiles[tidx]).tolist()
selected_tiles = np.repeat(tidx + 1, tiles[tidx]).tolist() # pyright: ignore[reportUnknownMemberType]

if TYPE_CHECKING:
assert self.sets.value is not None
sets = np.rint(self.sets.value).astype(int)
(sidx,) = sets.nonzero()
selected_sets = np.repeat(sidx, sets[sidx]).tolist()
selected_sets = np.repeat(sidx, sets[sidx]).tolist() # pyright: ignore[reportUnknownMemberType]

return SolverSolution(selected_tiles, selected_sets)
Loading
Loading