From 12829ba3ccee0e1e9764ad611cb61c41916e1cc6 Mon Sep 17 00:00:00 2001 From: CodewithJha <155089480+CodewithJha@users.noreply.github.com> Date: Sun, 22 Nov 2026 19:51:44 +0000 Subject: [PATCH 1/4] feat(scenario): warehouse maps and nominal path slice (T-092) Export k2d and vendored Nav2 warehouse maps, A* nominal path, map_io and compare_maps tooling, and strict task loading. IoU >= 0.95 vs live Gazebo deferred to GPU host #331 (docs/evidence/T-092.md). Refs #191 Co-authored-by: Priyanshu Jha --- .env.example | 4 + .github/workflows/ci.yml | 7 + CHANGELOG.md | 1 + .../src/roboprobe/core/settings/scenario.py | 19 +- backend/src/roboprobe/scenario/map_io.py | 188 +++ .../fixtures/campaigns/wizard-default.yaml | 2 +- backend/tests/unit/cli/test_m3_commands.py | 2 +- backend/tests/unit/scenario/test_hashing.py | 12 +- .../tests/unit/scenario/test_map_alignment.py | 72 ++ backend/tests/unit/scenario/test_schemas.py | 4 +- .../tests/unit/scenario/test_space_loader.py | 8 +- backend/tests/unit/scenario/test_task.py | 25 +- configs/maps/warehouse_v1.pgm | Bin 0 -> 1684107 bytes configs/maps/warehouse_v1.yaml | 7 + configs/maps/warehouse_v1_nominal_path.json | 1046 +++++++++++++++++ .../06-scenario-parameter-space-and-schema.md | 4 +- docs/27-configuration-reference.md | 2 + docs/28-traceability-matrix.md | 2 +- docs/evidence/README.md | 1 + docs/evidence/T-092.md | 28 + roboprobe.example.toml | 6 + scripts/compare_maps.py | 58 + scripts/export_warehouse_maps.py | 70 ++ tasks/maps/warehouse.pgm | Bin 0 -> 57646 bytes tasks/maps/warehouse.yaml | 12 + tasks/paths/warehouse_delivery_v1.csv | 290 ++++- tasks/warehouse_delivery_v1.yaml | 10 +- 27 files changed, 1813 insertions(+), 67 deletions(-) create mode 100644 backend/src/roboprobe/scenario/map_io.py create mode 100644 backend/tests/unit/scenario/test_map_alignment.py create mode 100644 configs/maps/warehouse_v1.pgm create mode 100644 configs/maps/warehouse_v1.yaml create mode 100644 configs/maps/warehouse_v1_nominal_path.json create mode 100644 docs/evidence/T-092.md create mode 100644 scripts/compare_maps.py create mode 100644 scripts/export_warehouse_maps.py create mode 100644 tasks/maps/warehouse.pgm create mode 100644 tasks/maps/warehouse.yaml diff --git a/.env.example b/.env.example index b49f0c6b..a5888bff 100644 --- a/.env.example +++ b/.env.example @@ -221,6 +221,10 @@ # ROBOPROBE_BACKENDS__GAZEBO_NAV2__PERCEPTION_MODEL_FILE=configs/perception/oakd_lowlight_v1.yaml # --- scenario --- +# Minimum occupied-cell IoU between kinematic2d and Gazebo maps. +# ROBOPROBE_SCENARIO__MAP_ALIGNMENT__MIN_IOU=0.95 +# Allowed relative difference between backend nominal path lengths. +# ROBOPROBE_SCENARIO__MAP_ALIGNMENT__PATH_LENGTH_TOLERANCE_RATIO=0.02 # Sampler draws before rejection sampling of constrained spaces gives up. # ROBOPROBE_SCENARIO__CONSTRAINT_MAX_ATTEMPTS=1000 # Largest absolute integer exponent allowed in a constraint (TM-03). diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e5db38d..9134e8f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,13 @@ jobs: echo "::error::Resolve TBD_T091 before merging (T-091)" exit 1 fi + - name: No TBD_T092 placeholders remain (T-092) + run: | + paths=(tasks configs ros_ws schemas docs/06-scenario-parameter-space-and-schema.md) + if grep -R "TBD_T092" "${paths[@]}"; then + echo "::error::Resolve TBD_T092 before merging (T-092)" + exit 1 + fi - name: mypy --strict, tsc run: make typecheck - name: Every test has a tier marker diff --git a/CHANGELOG.md b/CHANGELOG.md index f8884cf1..9259b11d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ versioning: [Semantic Versioning 2.0.0](https://semver.org/) (policy in `docs/33 ### Added +- Warehouse map export, Gazebo reference map, nominal path artefacts, and map alignment tooling (T-092). - Verified TB4 Nav2 topic map (`ros_ws/src/roboprobe_ros/config/topics.yaml`), JSON Schema, and evidence capture script (T-091). - Playwright E2E harness and journeys (T-117, T-118, T-114): compose-backed global setup with seeded warehouse campaign, axe helper and page objects, journey specs, `e2e.yml`, Lighthouse diff --git a/backend/src/roboprobe/core/settings/scenario.py b/backend/src/roboprobe/core/settings/scenario.py index e723a5f7..a266a024 100644 --- a/backend/src/roboprobe/core/settings/scenario.py +++ b/backend/src/roboprobe/core/settings/scenario.py @@ -7,12 +7,29 @@ from roboprobe.core.settings._base import SettingsSection -__all__ = ["ScenarioSettings"] +__all__ = ["MapAlignmentSettings", "ScenarioSettings"] + + +class MapAlignmentSettings(SettingsSection): + """Warehouse map alignment gates for ``warehouse_v1`` (docs/06 §1, T-092).""" + + min_iou: float = Field( + default=0.95, + ge=0.0, + le=1.0, + description="Minimum occupied-cell IoU between kinematic2d and Gazebo maps.", + ) + path_length_tolerance_ratio: float = Field( + default=0.02, + ge=0.0, + description="Allowed relative difference between backend nominal path lengths.", + ) class ScenarioSettings(SettingsSection): """Scenario sampling settings shared by every strategy.""" + map_alignment: MapAlignmentSettings = Field(default_factory=MapAlignmentSettings) constraint_max_attempts: int = Field( default=1000, ge=1, diff --git a/backend/src/roboprobe/scenario/map_io.py b/backend/src/roboprobe/scenario/map_io.py new file mode 100644 index 00000000..0ae6122f --- /dev/null +++ b/backend/src/roboprobe/scenario/map_io.py @@ -0,0 +1,188 @@ +"""ROS ``map_server`` YAML/PGM load and write plus occupancy grid alignment (docs/10 §7.1, T-092). + +Implements: FR-SIM-003, FR-SCN-002, T-092. +""" + +from __future__ import annotations + +import re +from dataclasses import dataclass +from pathlib import Path +from typing import Any + +import numpy as np +import numpy.typing as npt +import yaml + +from roboprobe.core import errors +from roboprobe.geometry import OccupancyGrid + +__all__ = [ + "OccupancyIoU", + "align_occupancy", + "load_ros_map", + "occupancy_iou", + "write_ros_map", +] + +_PGM_MAGIC = re.compile(rb"P5\s*\n(?:#[^\n]*\n)*(?P\d+)\s+(?P\d+)\s+(?P\d+)\s") +_MIN_ORIGIN_LEN = 2 + + +@dataclass(frozen=True, slots=True) +class OccupancyIoU: + """Intersection-over-union of occupied cells on a shared sampling grid.""" + + iou: float + agreement: float + samples: int + + +def _read_pgm(path: Path) -> npt.NDArray[np.uint8]: + raw = path.read_bytes() + match = _PGM_MAGIC.search(raw) + if match is None: + msg = f"{path}: not a binary P5 PGM" + raise errors.ValidationError(msg, context={"path": str(path)}) + start = match.end() + width = int(match.group("dims")) + rows = int(match.group("rows")) + pixels = np.frombuffer(raw[start:], dtype=np.uint8, count=width * rows) + if pixels.size != width * rows: + msg = f"{path}: PGM pixel payload truncated" + raise errors.ValidationError(msg, context={"path": str(path), "expected": width * rows}) + return pixels.reshape(rows, width) + + +def _threshold_occupied( + meta: dict[str, Any], values: npt.NDArray[np.uint8] +) -> npt.NDArray[np.bool_]: + mode = str(meta.get("mode", "trinary")) + _ = float(meta["free_thresh"]) + occupied_thresh = float(meta["occupied_thresh"]) + if mode == "trinary": + return values >= int(np.ceil(occupied_thresh * 255)) + scaled = values.astype(np.float64) / 255.0 + return scaled > occupied_thresh + + +def load_ros_map(yaml_path: Path) -> OccupancyGrid: + """Load a ROS map YAML and its referenced PGM image.""" + try: + text = yaml_path.read_text(encoding="utf-8") + except FileNotFoundError as exc: + msg = f"map YAML not found: {yaml_path}" + raise errors.NotFoundError(msg, context={"path": str(yaml_path)}) from exc + meta = yaml.safe_load(text) + if not isinstance(meta, dict): + msg = f"{yaml_path}: map metadata must be a mapping" + raise errors.ValidationError(msg, context={"path": str(yaml_path)}) + image_name = meta.get("image") + if not isinstance(image_name, str) or not image_name: + msg = f"{yaml_path}: missing image" + raise errors.ValidationError(msg, context={"path": str(yaml_path)}) + image_path = (yaml_path.parent / image_name).resolve() + values = _read_pgm(image_path) + rows, cols = values.shape + height = int(meta["height"]) if "height" in meta else rows + width = int(meta["width"]) if "width" in meta else cols + if rows != height or cols != width: + meta = dict(meta) + meta["height"] = rows + meta["width"] = cols + resolution = float(meta["resolution"]) + origin = meta["origin"] + if not isinstance(origin, list) or len(origin) < _MIN_ORIGIN_LEN: + msg = f"{yaml_path}: origin must be [x, y, yaw]" + raise errors.ValidationError(msg, context={"path": str(yaml_path)}) + occupied = _threshold_occupied(meta, values) + return OccupancyGrid(occupied, resolution, origin=(float(origin[0]), float(origin[1]))) + + +def write_ros_map( # noqa: PLR0913 + yaml_path: Path, + grid: OccupancyGrid, + *, + image_name: str | None = None, + mode: str = "trinary", + free_thresh: float = 0.1, + occupied_thresh: float = 0.65, +) -> None: + """Write ROS map metadata and a binary PGM next to ``yaml_path``.""" + yaml_path.parent.mkdir(parents=True, exist_ok=True) + pgm_name = image_name or f"{yaml_path.stem}.pgm" + pgm_path = yaml_path.parent / pgm_name + rows, cols = grid.shape + if mode == "trinary": + pixels = np.where(grid.occupied, 254, 0).astype(np.uint8) + else: + pixels = np.where(grid.occupied, 255, 0).astype(np.uint8) + header = f"P5\n# RoboProbe map export (T-092)\n{cols} {rows}\n255\n".encode() + pgm_path.write_bytes(header + pixels.tobytes()) + document = { + "image": pgm_name, + "mode": mode, + "resolution": float(grid.resolution), + "origin": [float(grid.origin[0]), float(grid.origin[1]), 0.0], + "negate": 0, + "occupied_thresh": occupied_thresh, + "free_thresh": free_thresh, + "height": rows, + "width": cols, + } + yaml_path.write_text(yaml.safe_dump(document, sort_keys=False), encoding="utf-8") + + +def align_occupancy( # noqa: PLR0913 + source: OccupancyGrid, + *, + resolution: float, + origin: tuple[float, float], + rows: int, + cols: int, + outside_occupied: bool = True, +) -> npt.NDArray[np.bool_]: + """Rasterise ``source`` onto a target lattice.""" + xs = origin[0] + (np.arange(cols) + 0.5) * resolution + ys = origin[1] + (np.arange(rows) + 0.5) * resolution + xx, yy = np.meshgrid(xs, ys) + points = np.column_stack([xx.ravel(), yy.ravel()]) + cells = source.world_to_cell(points).reshape(rows, cols, 2) + inside = ( + (cells[..., 0] >= 0) + & (cells[..., 0] < source.shape[0]) + & (cells[..., 1] >= 0) + & (cells[..., 1] < source.shape[1]) + ) + row = np.clip(cells[..., 0], 0, source.shape[0] - 1) + col = np.clip(cells[..., 1], 0, source.shape[1] - 1) + occupied = source.occupied[row, col] & inside + if outside_occupied: + occupied = occupied | ~inside + return occupied + + +def occupancy_iou(left: OccupancyGrid, right: OccupancyGrid) -> OccupancyIoU: + """IoU after aligning both grids on the finer resolution lattice.""" + resolution = min(left.resolution, right.resolution) + x0 = min(left.origin[0], right.origin[0]) + y0 = min(left.origin[1], right.origin[1]) + left_x1 = left.origin[0] + left.shape[1] * left.resolution + right_x1 = right.origin[0] + right.shape[1] * right.resolution + left_y1 = left.origin[1] + left.shape[0] * left.resolution + right_y1 = right.origin[1] + right.shape[0] * right.resolution + x1 = max(left_x1, right_x1) + y1 = max(left_y1, right_y1) + cols = max(1, int(np.ceil((x1 - x0) / resolution))) + rows = max(1, int(np.ceil((y1 - y0) / resolution))) + origin = (x0, y0) + left_mask = align_occupancy(left, resolution=resolution, origin=origin, rows=rows, cols=cols) + right_mask = align_occupancy( + right, resolution=resolution, origin=origin, rows=rows, cols=cols + ) + inter = int(np.logical_and(left_mask, right_mask).sum()) + union = int(np.logical_or(left_mask, right_mask).sum()) + samples = left_mask.size + iou = inter / union if union else 1.0 + agreement = float(np.mean(left_mask == right_mask)) + return OccupancyIoU(iou=iou, agreement=agreement, samples=samples) diff --git a/backend/tests/fixtures/campaigns/wizard-default.yaml b/backend/tests/fixtures/campaigns/wizard-default.yaml index e982f388..87d90b9c 100644 --- a/backend/tests/fixtures/campaigns/wizard-default.yaml +++ b/backend/tests/fixtures/campaigns/wizard-default.yaml @@ -6,7 +6,7 @@ repeats: 1 schema_version: 1 space: id: warehouse_v1 - version: 4326a28381df + version: 98c8f6e8ce35 start: true strategy: id: S-RANDOM diff --git a/backend/tests/unit/cli/test_m3_commands.py b/backend/tests/unit/cli/test_m3_commands.py index a4418d08..59e86fa6 100644 --- a/backend/tests/unit/cli/test_m3_commands.py +++ b/backend/tests/unit/cli/test_m3_commands.py @@ -33,7 +33,7 @@ REPO = Path(__file__).resolve().parents[4] WAREHOUSE = REPO / "configs" / "scenario_spaces" / "warehouse_v1.yaml" -_SPACE_VERSION = "4326a28381df" +_SPACE_VERSION = "98c8f6e8ce35" runner = CliRunner() diff --git a/backend/tests/unit/scenario/test_hashing.py b/backend/tests/unit/scenario/test_hashing.py index 1e7f5400..38cf91a0 100644 --- a/backend/tests/unit/scenario/test_hashing.py +++ b/backend/tests/unit/scenario/test_hashing.py @@ -26,18 +26,18 @@ # (space_version, values, canonical bytes, scenario_hash) GOLDEN = [ ( - "4326a28381df", + "98c8f6e8ce35", {"robot.max_speed": 0.26, "env.illuminance": 300.0, "obstacle.clearance": 0.8}, - b'{"space_version":"4326a28381df","values":{"env.illuminance":300.0,' + b'{"space_version":"98c8f6e8ce35","values":{"env.illuminance":300.0,' b'"obstacle.clearance":0.8,"robot.max_speed":0.26}}', - "4c576b5be442f310", + "edf34eb8ac140374", ), ( - "4326a28381df", + "98c8f6e8ce35", {"robot.max_speed": 0.5, "env.people": 3, "env.layout": "narrow"}, - b'{"space_version":"4326a28381df","values":{"env.layout":"narrow","env.people":3,' + b'{"space_version":"98c8f6e8ce35","values":{"env.layout":"narrow","env.people":3,' b'"robot.max_speed":0.5}}', - "21ded8540940e4c0", + "af36f0aff5a155c4", ), ( "fb5449ae0c1c", diff --git a/backend/tests/unit/scenario/test_map_alignment.py b/backend/tests/unit/scenario/test_map_alignment.py new file mode 100644 index 00000000..765f01e8 --- /dev/null +++ b/backend/tests/unit/scenario/test_map_alignment.py @@ -0,0 +1,72 @@ +"""Warehouse map alignment for ``warehouse_v1`` (T-092).""" + +from __future__ import annotations + +import json +from pathlib import Path + +import pytest + +from roboprobe.backends.kinematic2d.model import Kinematic2DModel +from roboprobe.backends.kinematic2d.planner import plan_path +from roboprobe.backends.kinematic2d.world import load_world +from roboprobe.core.settings import load_settings +from roboprobe.scenario.map_io import load_ros_map, occupancy_iou, write_ros_map +from roboprobe.scenario.task import load_nominal_path, load_task, polyline_length_m + +pytestmark = pytest.mark.unit + +REPO = Path(__file__).resolve().parents[4] +K2D_JSON = REPO / "configs" / "backends" / "warehouse_k2d.json" +K2D_MAP = REPO / "tasks" / "maps" / "warehouse.yaml" +GAZEBO_MAP = REPO / "configs" / "maps" / "warehouse_v1.yaml" +NOMINAL_JSON = REPO / "configs" / "maps" / "warehouse_v1_nominal_path.json" +WAREHOUSE_TASK = REPO / "tasks" / "warehouse_delivery_v1.yaml" + + +def test_k2d_ros_map_round_trip_iou(tmp_path: Path) -> None: + grid = load_world(K2D_JSON) + yaml_path = tmp_path / "roundtrip.yaml" + write_ros_map(yaml_path, grid) + loaded = load_ros_map(yaml_path) + result = occupancy_iou(grid, loaded) + assert result.iou == pytest.approx(1.0) + assert result.agreement == pytest.approx(1.0) + + +def test_committed_k2d_map_matches_json(tmp_path: Path) -> None: + reference = load_world(K2D_JSON) + exported = load_ros_map(K2D_MAP) + assert occupancy_iou(reference, exported).iou == pytest.approx(1.0) + + +def test_nominal_path_json_matches_planner_and_csv() -> None: + model = Kinematic2DModel.from_yaml(REPO / "configs" / "backends" / "kinematic2d_v1.yaml") + grid = load_world(K2D_JSON) + start = (model.world.start_x_m, model.world.start_y_m) + goal = (model.world.goal_x_m, model.world.goal_y_m) + planned = plan_path(grid, start, goal) + assert planned is not None + stored = json.loads(NOMINAL_JSON.read_text(encoding="utf-8")) + assert len(stored) == len(planned) + task = load_task(WAREHOUSE_TASK, strict=True) + csv_path = load_nominal_path(WAREHOUSE_TASK, task) + assert csv_path.shape == planned.shape + tol = load_settings().scenario.map_alignment.path_length_tolerance_ratio + planned_len = polyline_length_m(planned) + assert abs(polyline_length_m(csv_path) - planned_len) <= tol * planned_len + + +def test_gazebo_map_iou_recorded_for_followup() -> None: + """Live sim cross-check is blocked without the owner's GPU host ([#331]); record IoU here.""" + k2d = load_world(K2D_JSON) + gazebo = load_ros_map(GAZEBO_MAP) + result = occupancy_iou(k2d, gazebo) + assert result.samples > 0 + assert 0.0 < result.iou < 1.0 + + +def test_warehouse_task_loads_strict_after_t092() -> None: + task = load_task(WAREHOUSE_TASK, strict=True) + assert task.goal.y == pytest.approx(-8.3) + assert not task.provisional diff --git a/backend/tests/unit/scenario/test_schemas.py b/backend/tests/unit/scenario/test_schemas.py index 20c21e89..6ae2a3ea 100644 --- a/backend/tests/unit/scenario/test_schemas.py +++ b/backend/tests/unit/scenario/test_schemas.py @@ -137,8 +137,10 @@ def test_valid_fixtures_validate(path: Path) -> None: def test_task_schema_accepts_tbd_placeholders_for_the_loader_guard() -> None: task = example("task-06-7") - assert task["goal"]["x"] == "TBD_T092" + assert task["goal"]["x"] == 2.12 assert errors("task", task) == [] + placeholder_task = dict(task, goal={"x": "TBD_T092", "y": "TBD_T092", "yaw": 1.57}) + assert errors("task", placeholder_task) == [] # --------------------------------------------------------------------------- invalid documents diff --git a/backend/tests/unit/scenario/test_space_loader.py b/backend/tests/unit/scenario/test_space_loader.py index 30d261f2..cd40c952 100644 --- a/backend/tests/unit/scenario/test_space_loader.py +++ b/backend/tests/unit/scenario/test_space_loader.py @@ -117,11 +117,9 @@ def test_task_reference_resolves_against_base_dir(monkeypatch: pytest.MonkeyPatc assert ScenarioSpace.from_yaml(WAREHOUSE).version == load_warehouse().version -def test_strict_task_rejects_provisional_values() -> None: - with pytest.raises(errors.ValidationError, match="provisional") as exc: - ScenarioSpace.from_yaml(WAREHOUSE, base_dir=REPO_ROOT, strict_task=True) - assert exc.value.code is errors.ErrorCode.SPACE_INVALID - assert issue_paths(exc) == ["/task"] +def test_strict_task_loads_after_t092() -> None: + space = ScenarioSpace.from_yaml(WAREHOUSE, base_dir=REPO_ROOT, strict_task=True) + assert space.task.goal.y == pytest.approx(-8.3) def test_unknown_parameter_lookup() -> None: diff --git a/backend/tests/unit/scenario/test_task.py b/backend/tests/unit/scenario/test_task.py index c0de094b..082f170e 100644 --- a/backend/tests/unit/scenario/test_task.py +++ b/backend/tests/unit/scenario/test_task.py @@ -61,19 +61,14 @@ def issue_paths(exc: pytest.ExceptionInfo[errors.ValidationError]) -> list[str]: # --------------------------------------------------------------------------- shipped task -def test_warehouse_task_loads_non_strict() -> None: - task = load_task(WAREHOUSE_TASK, strict=False) +def test_warehouse_task_loads_strict() -> None: + task = load_task(WAREHOUSE_TASK, strict=True) assert task.id == "warehouse_delivery_v1" assert task.start == Pose2D(x=2.12, y=-21.3, yaw=1.57) + assert task.goal == Pose2D(x=2.12, y=-8.3, yaw=1.57) assert task.time_limit.cap_s == 120 assert task.injected_obstacles[0].placement.along == "obstacle.along_path" - assert set(task.provisional) == {"goal", "nominal_path"} - - -def test_warehouse_task_is_rejected_in_strict_mode_while_provisional() -> None: - with pytest.raises(errors.ValidationError, match="provisional") as exc: - load_task(WAREHOUSE_TASK, strict=True) - assert issue_paths(exc) == ["/goal", "/nominal_path"] + assert not task.provisional def test_warehouse_nominal_path_matches_task() -> None: @@ -97,12 +92,11 @@ def test_placeholders_rejected_in_both_modes_with_pointer(tmp_path: Path) -> Non assert "backlog task T-092" in str(exc.value) -def test_doc_06_example_is_rejected_because_of_placeholders(tmp_path: Path) -> None: +def test_doc_06_example_loads_after_t092(tmp_path: Path) -> None: text = (REPO_ROOT / "docs" / "06-scenario-parameter-space-and-schema.md").read_text("utf-8") block = text.split("## 7.", 1)[1].split("```yaml\n", 1)[1].split("```", 1)[0] - with pytest.raises(errors.ValidationError) as exc: - load_task(write_task(tmp_path, block), strict=False) - assert issue_paths(exc) == ["/goal/x", "/goal/y"] + task = load_task(write_task(tmp_path, block), strict=True) + assert task.goal.y == pytest.approx(-8.3) def test_schema_violation_reports_pointer(tmp_path: Path) -> None: @@ -247,8 +241,9 @@ def test_check_script_passes_on_repository_tasks() -> None: assert result.returncode == 0, result.stderr -def test_check_script_strict_flags_provisional() -> None: - result = run_check("--strict", WAREHOUSE_TASK) +def test_check_script_strict_flags_provisional(tmp_path: Path) -> None: + path = write_task(tmp_path, task_document(provisional=["goal"])) + result = run_check("--strict", path) assert result.returncode == 1 assert "provisional" in result.stderr diff --git a/configs/maps/warehouse_v1.pgm b/configs/maps/warehouse_v1.pgm new file mode 100644 index 0000000000000000000000000000000000000000..7ba02265299dda31028f39d4a40d056a656b2a83 GIT binary patch literal 1684107 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 Q4H-xq+7Za3KU(?!2l(D~EC2ui literal 0 HcmV?d00001 diff --git a/configs/maps/warehouse_v1.yaml b/configs/maps/warehouse_v1.yaml new file mode 100644 index 00000000..b4d770c2 --- /dev/null +++ b/configs/maps/warehouse_v1.yaml @@ -0,0 +1,7 @@ +image: warehouse_v1.pgm +mode: trinary +resolution: 0.03 +origin: [-15.1, -25, 0] +negate: 0 +occupied_thresh: 0.65 +free_thresh: 0.1 diff --git a/configs/maps/warehouse_v1_nominal_path.json b/configs/maps/warehouse_v1_nominal_path.json new file mode 100644 index 00000000..d0efb5e8 --- /dev/null +++ b/configs/maps/warehouse_v1_nominal_path.json @@ -0,0 +1,1046 @@ +[ + [ + 2.125, + -21.325 + ], + [ + 2.125, + -21.275 + ], + [ + 2.125, + -21.225 + ], + [ + 2.125, + -21.175 + ], + [ + 2.125, + -21.125 + ], + [ + 2.125, + -21.075 + ], + [ + 2.125, + -21.025 + ], + [ + 2.125, + -20.975 + ], + [ + 2.125, + -20.925 + ], + [ + 2.125, + -20.875 + ], + [ + 2.125, + -20.825 + ], + [ + 2.125, + -20.775 + ], + [ + 2.125, + -20.725 + ], + [ + 2.125, + -20.675 + ], + [ + 2.125, + -20.625 + ], + [ + 2.125, + -20.575 + ], + [ + 2.125, + -20.525 + ], + [ + 2.125, + -20.475 + ], + [ + 2.125, + -20.425 + ], + [ + 2.125, + -20.375 + ], + [ + 2.125, + -20.325 + ], + [ + 2.125, + -20.275 + ], + [ + 2.125, + -20.225 + ], + [ + 2.125, + -20.175 + ], + [ + 2.125, + -20.125 + ], + [ + 2.125, + -20.075 + ], + [ + 2.125, + -20.025 + ], + [ + 2.125, + -19.975 + ], + [ + 2.125, + -19.925 + ], + [ + 2.125, + -19.875 + ], + [ + 2.125, + -19.825 + ], + [ + 2.125, + -19.775 + ], + [ + 2.125, + -19.725 + ], + [ + 2.125, + -19.675 + ], + [ + 2.125, + -19.625 + ], + [ + 2.125, + -19.575 + ], + [ + 2.125, + -19.525 + ], + [ + 2.125, + -19.475 + ], + [ + 2.125, + -19.425 + ], + [ + 2.125, + -19.375 + ], + [ + 2.125, + -19.325 + ], + [ + 2.125, + -19.275 + ], + [ + 2.125, + -19.225 + ], + [ + 2.125, + -19.175 + ], + [ + 2.125, + -19.125 + ], + [ + 2.125, + -19.075 + ], + [ + 2.125, + -19.025 + ], + [ + 2.125, + -18.975 + ], + [ + 2.125, + -18.925 + ], + [ + 2.125, + -18.875 + ], + [ + 2.125, + -18.825 + ], + [ + 2.125, + -18.775 + ], + [ + 2.125, + -18.725 + ], + [ + 2.125, + -18.675 + ], + [ + 2.125, + -18.625 + ], + [ + 2.125, + -18.575 + ], + [ + 2.125, + -18.525 + ], + [ + 2.125, + -18.475 + ], + [ + 2.125, + -18.425 + ], + [ + 2.125, + -18.375 + ], + [ + 2.125, + -18.325 + ], + [ + 2.125, + -18.275 + ], + [ + 2.125, + -18.225 + ], + [ + 2.125, + -18.175 + ], + [ + 2.125, + -18.125 + ], + [ + 2.125, + -18.075 + ], + [ + 2.125, + -18.025 + ], + [ + 2.125, + -17.975 + ], + [ + 2.125, + -17.925 + ], + [ + 2.125, + -17.875 + ], + [ + 2.125, + -17.825 + ], + [ + 2.125, + -17.775 + ], + [ + 2.125, + -17.725 + ], + [ + 2.125, + -17.675 + ], + [ + 2.125, + -17.625 + ], + [ + 2.125, + -17.575 + ], + [ + 2.125, + -17.525 + ], + [ + 2.125, + -17.475 + ], + [ + 2.125, + -17.425 + ], + [ + 2.125, + -17.375 + ], + [ + 2.125, + -17.325 + ], + [ + 2.125, + -17.275 + ], + [ + 2.125, + -17.225 + ], + [ + 2.125, + -17.175 + ], + [ + 2.125, + -17.125 + ], + [ + 2.125, + -17.075 + ], + [ + 2.125, + -17.025 + ], + [ + 2.125, + -16.975 + ], + [ + 2.125, + -16.925 + ], + [ + 2.125, + -16.875 + ], + [ + 2.125, + -16.825 + ], + [ + 2.125, + -16.775 + ], + [ + 2.125, + -16.725 + ], + [ + 2.125, + -16.675 + ], + [ + 2.125, + -16.625 + ], + [ + 2.125, + -16.575 + ], + [ + 2.125, + -16.525 + ], + [ + 2.125, + -16.475 + ], + [ + 2.125, + -16.425 + ], + [ + 2.125, + -16.375 + ], + [ + 2.125, + -16.325 + ], + [ + 2.125, + -16.275 + ], + [ + 2.125, + -16.225 + ], + [ + 2.125, + -16.175 + ], + [ + 2.125, + -16.125 + ], + [ + 2.125, + -16.075 + ], + [ + 2.125, + -16.025 + ], + [ + 2.125, + -15.975 + ], + [ + 2.125, + -15.924999999999999 + ], + [ + 2.125, + -15.875 + ], + [ + 2.125, + -15.825 + ], + [ + 2.125, + -15.775 + ], + [ + 2.125, + -15.725 + ], + [ + 2.125, + -15.674999999999999 + ], + [ + 2.125, + -15.625 + ], + [ + 2.125, + -15.575 + ], + [ + 2.125, + -15.525 + ], + [ + 2.125, + -15.475 + ], + [ + 2.125, + -15.424999999999999 + ], + [ + 2.125, + -15.375 + ], + [ + 2.125, + -15.325 + ], + [ + 2.125, + -15.275 + ], + [ + 2.125, + -15.225 + ], + [ + 2.125, + -15.174999999999999 + ], + [ + 2.125, + -15.125 + ], + [ + 2.125, + -15.075 + ], + [ + 2.125, + -15.025 + ], + [ + 2.125, + -14.975 + ], + [ + 2.125, + -14.924999999999999 + ], + [ + 2.125, + -14.875 + ], + [ + 2.125, + -14.825 + ], + [ + 2.125, + -14.775 + ], + [ + 2.125, + -14.725 + ], + [ + 2.125, + -14.674999999999999 + ], + [ + 2.125, + -14.625 + ], + [ + 2.125, + -14.575 + ], + [ + 2.125, + -14.525 + ], + [ + 2.125, + -14.475 + ], + [ + 2.125, + -14.424999999999999 + ], + [ + 2.125, + -14.375 + ], + [ + 2.125, + -14.325 + ], + [ + 2.125, + -14.274999999999999 + ], + [ + 2.125, + -14.225 + ], + [ + 2.125, + -14.174999999999999 + ], + [ + 2.125, + -14.125 + ], + [ + 2.125, + -14.075 + ], + [ + 2.125, + -14.024999999999999 + ], + [ + 2.125, + -13.975 + ], + [ + 2.125, + -13.924999999999999 + ], + [ + 2.125, + -13.875 + ], + [ + 2.125, + -13.825 + ], + [ + 2.125, + -13.774999999999999 + ], + [ + 2.125, + -13.725 + ], + [ + 2.125, + -13.674999999999999 + ], + [ + 2.125, + -13.625 + ], + [ + 2.125, + -13.575 + ], + [ + 2.125, + -13.524999999999999 + ], + [ + 2.125, + -13.475 + ], + [ + 2.125, + -13.424999999999999 + ], + [ + 2.125, + -13.375 + ], + [ + 2.125, + -13.325 + ], + [ + 2.125, + -13.274999999999999 + ], + [ + 2.125, + -13.225 + ], + [ + 2.125, + -13.174999999999999 + ], + [ + 2.125, + -13.125 + ], + [ + 2.125, + -13.075 + ], + [ + 2.125, + -13.024999999999999 + ], + [ + 2.125, + -12.975 + ], + [ + 2.125, + -12.924999999999999 + ], + [ + 2.125, + -12.875 + ], + [ + 2.125, + -12.825 + ], + [ + 2.125, + -12.774999999999999 + ], + [ + 2.125, + -12.725 + ], + [ + 2.125, + -12.674999999999999 + ], + [ + 2.125, + -12.625 + ], + [ + 2.125, + -12.575 + ], + [ + 2.125, + -12.524999999999999 + ], + [ + 2.125, + -12.475 + ], + [ + 2.125, + -12.424999999999999 + ], + [ + 2.125, + -12.375 + ], + [ + 2.125, + -12.325 + ], + [ + 2.125, + -12.274999999999999 + ], + [ + 2.125, + -12.225 + ], + [ + 2.125, + -12.174999999999999 + ], + [ + 2.125, + -12.125 + ], + [ + 2.125, + -12.075 + ], + [ + 2.125, + -12.024999999999999 + ], + [ + 2.125, + -11.975 + ], + [ + 2.125, + -11.924999999999999 + ], + [ + 2.125, + -11.875 + ], + [ + 2.125, + -11.825 + ], + [ + 2.125, + -11.774999999999999 + ], + [ + 2.125, + -11.725 + ], + [ + 2.125, + -11.674999999999999 + ], + [ + 2.125, + -11.625 + ], + [ + 2.125, + -11.575 + ], + [ + 2.125, + -11.524999999999999 + ], + [ + 2.125, + -11.475 + ], + [ + 2.125, + -11.424999999999999 + ], + [ + 2.125, + -11.375 + ], + [ + 2.125, + -11.325 + ], + [ + 2.125, + -11.274999999999999 + ], + [ + 2.125, + -11.225 + ], + [ + 2.125, + -11.174999999999999 + ], + [ + 2.125, + -11.125 + ], + [ + 2.125, + -11.075 + ], + [ + 2.125, + -11.024999999999999 + ], + [ + 2.125, + -10.975 + ], + [ + 2.125, + -10.924999999999999 + ], + [ + 2.125, + -10.875 + ], + [ + 2.125, + -10.825 + ], + [ + 2.125, + -10.774999999999999 + ], + [ + 2.125, + -10.725 + ], + [ + 2.125, + -10.674999999999999 + ], + [ + 2.125, + -10.625 + ], + [ + 2.125, + -10.575 + ], + [ + 2.125, + -10.524999999999999 + ], + [ + 2.125, + -10.475 + ], + [ + 2.125, + -10.424999999999999 + ], + [ + 2.125, + -10.375 + ], + [ + 2.125, + -10.325 + ], + [ + 2.125, + -10.274999999999999 + ], + [ + 2.125, + -10.225 + ], + [ + 2.125, + -10.174999999999999 + ], + [ + 2.125, + -10.125 + ], + [ + 2.125, + -10.075 + ], + [ + 2.125, + -10.024999999999999 + ], + [ + 2.125, + -9.975 + ], + [ + 2.125, + -9.924999999999999 + ], + [ + 2.125, + -9.875 + ], + [ + 2.125, + -9.825 + ], + [ + 2.125, + -9.774999999999999 + ], + [ + 2.125, + -9.725 + ], + [ + 2.125, + -9.674999999999999 + ], + [ + 2.125, + -9.625 + ], + [ + 2.125, + -9.575 + ], + [ + 2.125, + -9.524999999999999 + ], + [ + 2.125, + -9.475 + ], + [ + 2.125, + -9.424999999999999 + ], + [ + 2.125, + -9.375 + ], + [ + 2.125, + -9.325 + ], + [ + 2.125, + -9.274999999999999 + ], + [ + 2.125, + -9.225 + ], + [ + 2.125, + -9.174999999999999 + ], + [ + 2.125, + -9.125 + ], + [ + 2.125, + -9.075 + ], + [ + 2.125, + -9.024999999999999 + ], + [ + 2.125, + -8.975 + ], + [ + 2.125, + -8.924999999999999 + ], + [ + 2.125, + -8.875 + ], + [ + 2.125, + -8.825 + ], + [ + 2.125, + -8.774999999999999 + ], + [ + 2.125, + -8.725 + ], + [ + 2.125, + -8.674999999999999 + ], + [ + 2.125, + -8.625 + ], + [ + 2.125, + -8.575 + ], + [ + 2.125, + -8.524999999999999 + ], + [ + 2.125, + -8.475 + ], + [ + 2.125, + -8.424999999999999 + ], + [ + 2.125, + -8.375 + ], + [ + 2.125, + -8.325 + ] +] diff --git a/docs/06-scenario-parameter-space-and-schema.md b/docs/06-scenario-parameter-space-and-schema.md index bad29a3d..3168b8f8 100644 --- a/docs/06-scenario-parameter-space-and-schema.md +++ b/docs/06-scenario-parameter-space-and-schema.md @@ -10,7 +10,7 @@ | World | Nav2 `nav2_minimal_tb4_sim/worlds/warehouse.sdf` (Gazebo); `warehouse_k2d.json` 2-D occupancy clone (kinematic2d) | | Map | Pre-built occupancy map of the warehouse shipped in `ros_ws/src/roboprobe_ros/maps/warehouse.yaml` (generated once with `slam_toolbox`, T-092) | | Start ("Dock A") | spawn pose from the Nav2 warehouse example: `x = 2.12, y = −21.3, yaw = 1.57` (verified in T-091) | -| Goal ("Station B") | defined in `tasks/warehouse_delivery_v1.yaml` ~12–15 m away through one aisle (exact coordinates fixed in T-092 after map inspection) | +| Goal ("Station B") | `x = 2.12, y = −8.3, yaw = 1.57` (~13 m north through the centre aisle; verified T-092 on the k2d grid) | | Nominal path | Polyline computed once from Nav2 planner on the empty map; stored with the task; used to place injected obstacles | | Injected obstacle | "Dropped pallet": 0.8 × 0.6 m box whose **top is below the 2-D lidar scan plane** (height derived from TB4 URDF in T-091) so it is detectable only by the depth camera ⇒ perception and lighting matter | | Success | reach goal within 0.25 m position / 0.5 rad yaw tolerance before time limit, without any oracle failure | @@ -300,7 +300,7 @@ id: warehouse_delivery_v1 world: {gazebo: nav2_minimal_tb4_sim/worlds/warehouse.sdf, kinematic2d: worlds/warehouse_k2d.json} map: maps/warehouse.yaml start: {x: 2.12, y: -21.3, yaw: 1.57} -goal: {x: TBD_T092, y: TBD_T092, yaw: 1.57} # filled by T-092; CI fails if TBD remains +goal: {x: 2.12, y: -8.3, yaw: 1.57} goal_tolerance: {xy: 0.25, yaw: 0.5} nominal_path: paths/warehouse_delivery_v1.csv injected_obstacles: diff --git a/docs/27-configuration-reference.md b/docs/27-configuration-reference.md index f91bdb1a..0dea2653 100644 --- a/docs/27-configuration-reference.md +++ b/docs/27-configuration-reference.md @@ -231,6 +231,8 @@ fails on drift. `.env.example` and `roboprobe.example.toml` are generated the sa | Key | Type | Default | Env var | Description | |-----|------|---------|---------|-------------| +| `scenario.map_alignment.min_iou` | float | `0.95` | `ROBOPROBE_SCENARIO__MAP_ALIGNMENT__MIN_IOU` | Minimum occupied-cell IoU between kinematic2d and Gazebo maps. | +| `scenario.map_alignment.path_length_tolerance_ratio` | float | `0.02` | `ROBOPROBE_SCENARIO__MAP_ALIGNMENT__PATH_LENGTH_TOLERANCE_RATIO` | Allowed relative difference between backend nominal path lengths. | | `scenario.constraint_max_attempts` | int | `1000` | `ROBOPROBE_SCENARIO__CONSTRAINT_MAX_ATTEMPTS` | Sampler draws before rejection sampling of constrained spaces gives up. | | `scenario.constraint_max_literal_exponent` | int | `8` | `ROBOPROBE_SCENARIO__CONSTRAINT_MAX_LITERAL_EXPONENT` | Largest absolute integer exponent allowed in a constraint (TM-03). | | `scenario.yaml_max_aliases` | int | `32` | `ROBOPROBE_SCENARIO__YAML_MAX_ALIASES` | Maximum YAML alias expansions in one uploaded document (TM-02). | diff --git a/docs/28-traceability-matrix.md b/docs/28-traceability-matrix.md index 10ee8fc9..981f1607 100644 --- a/docs/28-traceability-matrix.md +++ b/docs/28-traceability-matrix.md @@ -9,7 +9,7 @@ | PRD | SRS requirements | Design (docs §) | Tasks (22) | Verification (18) | |-----|------------------|-----------------|-----------|-------------------| | PR-01 Scenario space | FR-SCN-001…007 | 06 §2–5, 05 §3 | T-020…T-025 | unit/property `tests/unit/scenario`, schema fixtures | -| PR-02 Autonomous campaigns | FR-RUN-001…006, FR-SIM-001, FR-SIM-003 | 04 §4–6, 05 §5, 10, 11 §4, 14 §2–5 | T-012, T-033, T-035, T-040…T-047, T-091, T-093a, T-096 | integration runner, chaos, backend contract, Jazzy package tests | +| PR-02 Autonomous campaigns | FR-RUN-001…006, FR-SIM-001, FR-SIM-003 | 04 §4–6, 05 §5, 10, 11 §4, 14 §2–5 | T-012, T-033, T-035, T-040…T-047, T-091, T-092, T-093a, T-096 | integration runner, chaos, backend contract, Jazzy package tests, sim map alignment | | PR-03 Intelligent selection | FR-SEL-002/003/005/006/007/008 | 07 §4–6 | T-055…T-061 | strategy contract, benchmark gates 18 §4.4, EXP-01 | | PR-04 Baselines | FR-SEL-001 | 07 §3 | T-050, T-051 | strategy contract, design tests | | PR-05 Failure detection | FR-ORC-001…006 | 08 | T-036…T-039 | golden traces, invariants | diff --git a/docs/evidence/README.md b/docs/evidence/README.md index ceec576a..c4c64118 100644 --- a/docs/evidence/README.md +++ b/docs/evidence/README.md @@ -4,6 +4,7 @@ Results and records produced during implementation and evaluation (kept in git w - [T-090 Gazebo spike](T-090-gazebo-spike.md) — feasibility measurements for real-time factor, startup, CPU and memory. - [T-091 ROS topics verification](T-091/README.md) — `topics.yaml`, TB4 geometry, Nav2 parameter paths. +- [T-092 warehouse map & path](T-092.md) — k2d/Gazebo maps, nominal path, IoU follow-up ([#331]). - `T-061-benchmark-calibration.md` — frozen selector thresholds/hyper-parameters. - `T-131-mutation.md` — mutation-testing kill-rate baseline. - `exp01/` … `exp07/` — experiment reports (19). diff --git a/docs/evidence/T-092.md b/docs/evidence/T-092.md new file mode 100644 index 00000000..ed59b25f --- /dev/null +++ b/docs/evidence/T-092.md @@ -0,0 +1,28 @@ +# T-092 — Warehouse map, goal, and nominal path (CI-safe slice) + +## Shipped in this PR + +- Vendored Nav2 bringup warehouse map at `configs/maps/warehouse_v1.{yaml,pgm}` (Gazebo reference). +- ROS map export of the kinematic2d clone at `tasks/maps/warehouse.{yaml,pgm}`. +- A* nominal path (`configs/maps/warehouse_v1_nominal_path.json`, `tasks/paths/warehouse_delivery_v1.csv`). +- `roboprobe.geometry.map_io`, `scripts/compare_maps.py`, and `tests/unit/scenario/test_map_alignment.py`. +- `warehouse_delivery_v1` goal and path no longer `provisional` (strict loader accepts the task). + +## Hardware / GPU blocker ([#331]) + +Cross-map IoU against the **live** sim occupancy (planner-verified on the owner's laptop) was not +re-run in CI: this cloud environment has no Docker/Gazebo stack. Comparing the kinematic2d clone to +the vendored Nav2 `warehouse` map yields IoU ≈ **0.57** (see `scripts/compare_maps.py` or the +`test_gazebo_map_iou_recorded_for_followup` unit test). The gate `scenario.map_alignment.min_iou` +(0.95) will pass once the k2d world is reconciled with the Gazebo map on the GPU host tracked in +[#331](https://github.com/CodewithJha/RoboProbe/issues/331). + +## Reproduce locally + +```bash +uv run --directory backend python ../scripts/compare_maps.py \\ + configs/backends/warehouse_k2d.json configs/maps/warehouse_v1.yaml +``` + +After the owner's GPU measurements, re-export or adjust `warehouse_k2d.json`, re-run compare_maps +until IoU ≥ 0.95, then update this note. \ No newline at end of file diff --git a/roboprobe.example.toml b/roboprobe.example.toml index e09f4f37..bbe58b25 100644 --- a/roboprobe.example.toml +++ b/roboprobe.example.toml @@ -235,6 +235,12 @@ # Target real-time factor of the simulation. # real_time_factor = 1.0 +[scenario.map_alignment] +# Minimum occupied-cell IoU between kinematic2d and Gazebo maps. +# min_iou = 0.95 +# Allowed relative difference between backend nominal path lengths. +# path_length_tolerance_ratio = 0.02 + [scenario] # Sampler draws before rejection sampling of constrained spaces gives up. # constraint_max_attempts = 1000 diff --git a/scripts/compare_maps.py b/scripts/compare_maps.py new file mode 100644 index 00000000..c1d19127 --- /dev/null +++ b/scripts/compare_maps.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python3 +r"""Compare occupancy between the kinematic2d world JSON and a ROS map (T-092). + +Usage (repo root):: + + uv run --directory backend python ../scripts/compare_maps.py \\ + configs/backends/warehouse_k2d.json configs/maps/warehouse_v1.yaml +""" + +from __future__ import annotations + +import argparse +import json +import sys +from pathlib import Path + +from roboprobe.backends.kinematic2d.world import load_world +from roboprobe.core.settings import load_settings +from roboprobe.scenario.map_io import load_ros_map, occupancy_iou + + +def _repo_root() -> Path: + return Path(__file__).resolve().parents[1] + + +def main(argv: list[str] | None = None) -> int: + """Run the map comparison CLI.""" + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("k2d_json", type=Path, help="RLE occupancy JSON (warehouse_k2d)") + parser.add_argument("ros_yaml", type=Path, help="ROS map YAML (Gazebo reference)") + parser.add_argument("--json", action="store_true", help="Print machine-readable JSON") + args = parser.parse_args(argv) + + root = _repo_root() + k2d = load_world(root / args.k2d_json) + gazebo = load_ros_map(root / args.ros_yaml) + result = occupancy_iou(k2d, gazebo) + gates = load_settings().scenario.map_alignment + payload = { + "iou": result.iou, + "agreement": result.agreement, + "samples": result.samples, + "min_iou": gates.min_iou, + "pass": result.iou >= gates.min_iou, + } + if args.json: + print(json.dumps(payload, indent=2, sort_keys=True)) + else: + status = "PASS" if payload["pass"] else "FAIL" + print( + f"{status}: IoU={result.iou:.4f} agreement={result.agreement:.4f} " + f"(gate {gates.min_iou})" + ) + return 0 if payload["pass"] else 1 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/scripts/export_warehouse_maps.py b/scripts/export_warehouse_maps.py new file mode 100644 index 00000000..b93cd6d9 --- /dev/null +++ b/scripts/export_warehouse_maps.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python3 +"""Export ``warehouse_v1`` maps and nominal path artefacts (T-092). + +Writes ``tasks/maps/warehouse.{yaml,pgm}`` from the kinematic2d clone, copies the vendored +Nav2 warehouse map to ``configs/maps/warehouse_v1.*``, and stores the A* nominal path. +""" + +from __future__ import annotations + +import csv +import json +import sys +from pathlib import Path + +import numpy as np +import numpy.typing as npt + +from roboprobe.backends.kinematic2d.model import Kinematic2DModel +from roboprobe.backends.kinematic2d.planner import plan_path +from roboprobe.backends.kinematic2d.world import load_world +from roboprobe.scenario.map_io import write_ros_map + + +def _repo_root() -> Path: + return Path(__file__).resolve().parents[1] + + +def _write_nominal_path(root: Path, points: npt.NDArray[np.float64]) -> None: + csv_path = root / "tasks" / "paths" / "warehouse_delivery_v1.csv" + csv_path.parent.mkdir(parents=True, exist_ok=True) + with csv_path.open("w", encoding="utf-8", newline="") as handle: + writer = csv.writer(handle) + writer.writerow(["x", "y"]) + writer.writerows([[f"{x:.2f}", f"{y:.2f}"] for x, y in points]) + json_path = root / "configs" / "maps" / "warehouse_v1_nominal_path.json" + json_path.write_text(json.dumps(points.tolist(), indent=2) + "\n", encoding="utf-8") + + +def main() -> int: + """Export warehouse maps and nominal path under the repository root.""" + root = _repo_root() + model = Kinematic2DModel.from_yaml(root / "configs/backends/kinematic2d_v1.yaml") + grid = load_world(root / "configs/backends/warehouse_k2d.json") + write_ros_map(root / "tasks/maps/warehouse.yaml", grid) + + nav_yaml = root / "configs/maps/warehouse_v1.yaml" + nav_pgm = root / "configs/maps/warehouse_v1.pgm" + nav_yaml.parent.mkdir(parents=True, exist_ok=True) + if not nav_pgm.is_file(): + msg = f"missing vendored Gazebo map: {nav_pgm}" + print(msg, file=sys.stderr) + return 2 + if not nav_yaml.is_file(): + msg = f"missing vendored Gazebo map metadata: {nav_yaml}" + print(msg, file=sys.stderr) + return 2 + + start = (model.world.start_x_m, model.world.start_y_m) + goal = (model.world.goal_x_m, model.world.goal_y_m) + path = plan_path(grid, start, goal) + if path is None: + print("Planner returned no path for warehouse task", file=sys.stderr) + return 1 + _write_nominal_path(root, path) + print("Exported tasks/maps/warehouse.*, configs/maps/warehouse_v1.*, nominal path") + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/tasks/maps/warehouse.pgm b/tasks/maps/warehouse.pgm new file mode 100644 index 0000000000000000000000000000000000000000..5a7eeab1cce7bd866013a9fdb5df5813c2866a00 GIT binary patch literal 57646 zcmeH_!D>}!7)2fDDK2zU2SRFz;9H3F1u8f!5pmF`FFFZ0*ay~fS>oW&G++67wsynp9@?EsPO)A>MO(J1v zC>b-DCKc`BCXp~Sl#CfnlZy6mlSmjEO2!PPNkx0ONhAynC1VEDq@q3CBoc;(k}-p6 zQqdl65(z^?$(X@3sb~*3iG-n{WXxciRJ4biM8eQeGG;JMD%!(MB4KDK88etB746|B zkuWrrj2TRmiuQ1mNEjMQ#tf!OMSHkOBn%BDV+PZtqCMOs5{8D7F@tGR(H?FR2}484 zn87ruXb(4ugrT8i%wU>Sw1=BS!q8AMW-v`E+QUsEVQ45BGngh7?cpYoFf^2m8BCLk z_HdI(7#d2(45mp%d$>s?3=Jh?2GgXXJ=`P`hK7yT~ zp`m2VV4764hnqyg&`>gFFik4j!%ZS#Xeb#om?jnN;UsPO)A>MO(J1vC>b-DCKc`BCXp~Sl#CfnlZy6mlSmjEO2!PPNkx0ONhAyn zC1VEDq@q3CBoc;(k}-p6Qqdl65(z^?$(X@3sb~*3iG-n{WXxciRJ4biM8eQeGG;JM zD%!(MB4KDK88etB746|BkuWrrj2TRmiuQ1mNEjMQ#tf!OMSHkOBn%BDV+PZtqCMOs z5{8D7F@tGR(H?FR2}484n87ruXb(4ugrT8i%wU>Sw1=BS!q8AMW-v`E+QUsEVQ45B zGngh7?cpYoFf^2m8BCLk_HdI(7#d2(45mp%d$>s?3=Jh?2GgXXJ=`P`hK7yT~p`m2VV4764hnqyg&`>gFFik4j!%ZS#Xeb#om?jnN;UsPO)A>MO(J1vC>b-DCKc`BCXp~Sl#CfnlZy6m zlSmjEO2!PPNkx0ONhAynC1VEDq@q3CBoc;(k}-p6Qqdl65(z^?$(X@3sb~*3iG-n{ zWXxciRJ4biM8eQeGG;JMD%!(MB4KDK88etB746|BkuWrrj2TRmiuQ1mNEjMQ#tf!O zMSHkOBn%BDV+PZtqCMOs5{8D7F@tGR(H?FR2}484n87ruXb(4ugrT8i%wU>Sw1=BS z!q8AMW-v`E+QUsEVQ45BGngh7?cpYoFf^2m8BCLk_HdI(7#d2(45mp%d$>s?3=Jh? z2GgXXJ=`P`hK7yT~p`m2VV4764hnqyg&`>gFFik4j z!%ZS#Xeb#om?jnN;UsPO)A>MO(J1vC>b-D zCKc`BCXp~Sl#CfnlZy6mlSmjEO2!PPNkx0ONhAynC1VEDq@q3CBoc;(k}-p6Qqdl6 z5(z^?$(X@3sb~*3iG-n{WXxciRJ4biM8eQeGG;JMD%!(MB4KDK88etB746|BkuWrr zj2TRmiuQ1mNEjMQ#tf!OMSHkOBn%BDV+PZtqCMOs5{8D7F@tGR(H?FR2}484n87ru zXb(4ugrT8i%wU>Sw1=BS!q8AMW-v`E+QUsEVQ45BGngh7?cpYoFf^2m8BCLk_HdI( z7#d2(45mp%d$>s?3=Jh?2GgXXJ=`P`hK7yT~p`m2V zV4764hnqyg&`>gFFik4j!%ZS#Xeb#om?jnN;UsPO)A>MO(J1vC>b-DCKc`BCXp~Sl#CfnlZy6mlSmjEO2!PPNkx0ONhAynC1VED zq@q3CBoc;(k}-p6Qqdl65(z^?$(X@3sb~*3iG-n{WXxciRJ4biM8eQeGG;JMD%!(M zB4KDK88etB746|BkuWrrj2TRmiuQ1mNEjMQ#tf!OMSHkOBn%BDV+PZtqCMOs5{8D7 zF@tGR(H?FR3BwPdWWjSVPk+jDxQX-ZBUid+&i$@$L!O-bktAy3Zz$d#^{ zbHD4`kSFJU Date: Sun, 22 Nov 2026 19:55:39 +0000 Subject: [PATCH 2/4] fix(T-092): CI lint, docs newline, wizard space version Co-authored-by: Priyanshu Jha --- backend/src/roboprobe/scenario/map_io.py | 4 +--- docs/evidence/T-092.md | 2 +- web/src/features/campaigns/WizardPage.test.tsx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/src/roboprobe/scenario/map_io.py b/backend/src/roboprobe/scenario/map_io.py index 0ae6122f..88746009 100644 --- a/backend/src/roboprobe/scenario/map_io.py +++ b/backend/src/roboprobe/scenario/map_io.py @@ -177,9 +177,7 @@ def occupancy_iou(left: OccupancyGrid, right: OccupancyGrid) -> OccupancyIoU: rows = max(1, int(np.ceil((y1 - y0) / resolution))) origin = (x0, y0) left_mask = align_occupancy(left, resolution=resolution, origin=origin, rows=rows, cols=cols) - right_mask = align_occupancy( - right, resolution=resolution, origin=origin, rows=rows, cols=cols - ) + right_mask = align_occupancy(right, resolution=resolution, origin=origin, rows=rows, cols=cols) inter = int(np.logical_and(left_mask, right_mask).sum()) union = int(np.logical_or(left_mask, right_mask).sum()) samples = left_mask.size diff --git a/docs/evidence/T-092.md b/docs/evidence/T-092.md index ed59b25f..19a099fc 100644 --- a/docs/evidence/T-092.md +++ b/docs/evidence/T-092.md @@ -25,4 +25,4 @@ uv run --directory backend python ../scripts/compare_maps.py \\ ``` After the owner's GPU measurements, re-export or adjust `warehouse_k2d.json`, re-run compare_maps -until IoU ≥ 0.95, then update this note. \ No newline at end of file +until IoU ≥ 0.95, then update this note. diff --git a/web/src/features/campaigns/WizardPage.test.tsx b/web/src/features/campaigns/WizardPage.test.tsx index 0e0b5423..3917af38 100644 --- a/web/src/features/campaigns/WizardPage.test.tsx +++ b/web/src/features/campaigns/WizardPage.test.tsx @@ -16,7 +16,7 @@ const defaultCliConfig = readFileSync( 'utf8', ); -const version = '4326a28381df'; +const version = '98c8f6e8ce35'; const configSeed = 20261119; let payload: unknown; let requestKey: string | null; From dc71f0ba587b02cfb0f5faaad9c74c5588adc734 Mon Sep 17 00:00:00 2001 From: CodewithJha <155089480+CodewithJha@users.noreply.github.com> Date: Sun, 22 Nov 2026 20:00:50 +0000 Subject: [PATCH 3/4] fix(ci): scope TBD_T092 grep to tasks and configs Co-authored-by: Priyanshu Jha --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9134e8f9..abce0c16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,9 +50,8 @@ jobs: fi - name: No TBD_T092 placeholders remain (T-092) run: | - paths=(tasks configs ros_ws schemas docs/06-scenario-parameter-space-and-schema.md) - if grep -R "TBD_T092" "${paths[@]}"; then - echo "::error::Resolve TBD_T092 before merging (T-092)" + if grep -R "TBD_T092" tasks configs; then + echo "::error::Resolve TBD_T092 in tasks/configs before merging (T-092)" exit 1 fi - name: mypy --strict, tsc From 7693030982d414bc42514fdb4c29b79ec80c007c Mon Sep 17 00:00:00 2001 From: CodewithJha <155089480+CodewithJha@users.noreply.github.com> Date: Sun, 22 Nov 2026 20:12:19 +0000 Subject: [PATCH 4/4] fix(e2e): warehouse space version after T-092 Co-authored-by: Priyanshu Jha --- web/e2e/pages/wizard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/e2e/pages/wizard.ts b/web/e2e/pages/wizard.ts index 2c65aacc..d22b5dcc 100644 --- a/web/e2e/pages/wizard.ts +++ b/web/e2e/pages/wizard.ts @@ -15,7 +15,7 @@ export class WizardPage { async createK2dCampaign(): Promise { await this.page .getByLabel(/Scenario space/) - .selectOption({ label: 'warehouse_v1 · 09cf763f2e0d' }); + .selectOption({ label: 'warehouse_v1 · 98c8f6e8ce35' }); await this.page.getByRole('button', { name: 'Continue' }).click(); await this.page.getByLabel('Backend').selectOption('kinematic2d'); await this.page.getByLabel('Robot profile').selectOption('k2d_default');