Skip to content

Commit ccfd59e

Browse files
committed
perf(map): memoize Q10 room-color palette across map renders
1 parent 109f433 commit ccfd59e

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

‎roborock/map/b01_q10_render.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import math
1818
from collections.abc import Sequence
1919
from dataclasses import dataclass
20+
from functools import lru_cache
2021

2122
from PIL import Image
2223
from vacuum_map_parser_base.config.color import ColorsPalette, SupportedColor
@@ -480,9 +481,8 @@ def _render_base_grid(packet: Q10MapPacket, *, config: MapParserConfig) -> Image
480481
show_walls=config.show_walls,
481482
show_rooms=config.show_rooms,
482483
)
483-
flat_palette = [channel for color in palette for channel in color]
484484
p_img = Image.frombytes("P", (packet.width, packet.height), packet.grid)
485-
p_img.putpalette(flat_palette, rawmode="RGBA")
485+
p_img.putpalette(palette, rawmode="RGBA")
486486
img = p_img.convert("RGBA")
487487
# The ss07 grid is stored top-down (row 0 = top of the home), so it is
488488
# rendered as-is -- unlike the V1/Q7 convention, no vertical flip.
@@ -499,13 +499,14 @@ def _opaque(color: tuple[int, ...]) -> tuple[int, int, int, int]:
499499
return (color[0], color[1], color[2], color[3] if len(color) == 4 else 255)
500500

501501

502+
@lru_cache(maxsize=16)
502503
def _build_palette(
503504
grid: bytes,
504505
width: int,
505506
*,
506507
show_walls: bool = True,
507508
show_rooms: bool = True,
508-
) -> list[tuple[int, int, int, int]]:
509+
) -> bytes:
509510
"""Map Q10 cells onto the same colors used by the V1 map renderer."""
510511

511512
def room_id(value: int) -> int | None:
@@ -529,4 +530,4 @@ def room_id(value: int) -> int | None:
529530
for value in range(Q10_WALL_THRESHOLD, 256):
530531
if value not in (Q10_UNSEGMENTED_FLOOR_VALUE, Q10_BACKGROUND_VALUE):
531532
palette[value] = wall
532-
return palette
533+
return bytes(channel for color in palette for channel in color)

‎tests/map/test_b01_q10_render.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,3 +486,25 @@ def fail_decomposition(*args: object, **kwargs: object) -> None:
486486

487487
monkeypatch.setattr("roborock.map.b01_q10_map_parser.decompose_grid", fail_decomposition)
488488
assert resolve_q10_current_room(packet, trace) == packet.rooms[1]
489+
490+
491+
def test_render_memoizes_palette_across_trace_updates(monkeypatch: pytest.MonkeyPatch) -> None:
492+
"""Repeated renders on the same map grid reuse the computed room-color palette."""
493+
from roborock.map.b01_q10_render import _build_palette
494+
from roborock.map.room_colors import adjacency_aware_room_colors
495+
496+
_build_palette.cache_clear()
497+
calls = 0
498+
499+
def counting_room_colors(*args: object, **kwargs: object) -> dict[int, tuple[int, ...]]:
500+
nonlocal calls
501+
calls += 1
502+
return adjacency_aware_room_colors(*args, **kwargs) # type: ignore[arg-type]
503+
504+
monkeypatch.setattr("roborock.map.b01_q10_render.adjacency_aware_room_colors", counting_room_colors)
505+
506+
packet, trace1 = _calibrated_inputs(heading=0)
507+
_, trace2 = _calibrated_inputs(heading=90)
508+
_render(packet, trace=trace1)
509+
_render(packet, trace=trace2)
510+
assert calls == 1

0 commit comments

Comments
 (0)