mirror of
https://github.com/ruvnet/RuView
synced 2026-06-18 11:43:19 +00:00
17471e93ff
* feat(calibration): NodeGeometry transceiver-geometry recording (ADR-152 §2.1.1) PerceptAlign-motivated geometry capture at enrollment: per-node optional records (position, antenna orientation, inter-node distances, acquisition method) — recorded when known, never required. Event-sourced via EnrollmentEvent::GeometryRecorded (latest recording wins); persisted on SpecialistBank with serde defaults so pre-ADR-152 bank JSON loads cleanly (fixture-proven, and geometry-free banks serialize byte-shape-identical to the old schema); threaded through MultiNodeMixture as data only — the learned geometry embeddings and algorithmic fusion use are §2.1.2, deliberately deferred until the ADR-151 P6 LoRA heads exist. Geometry recorded from now on means banks captured today remain usable for layout-conditioned training later — you can't retroactively add geometry to data you didn't record. 8 new tests (3 geometry, 2 anchor, 2 bank, 1 multistatic) + full-loop extension (2-node geometry, one tape-measured + one unknown, surviving the bank JSON round-trip the runtime loads from). 50/50 calibration (both feature configs) + 23 CLI tests green. Co-Authored-By: RuFlo <ruv@ruv.net> * feat(training): two-checkerboard camera↔room calibration for ADR-079 labels (ADR-152 §2.1.3) Defends the camera-supervised pipeline against PerceptAlign's "coordinate overfitting": MediaPipe keypoints were emitted in raw camera coordinates with no shared frame and no transceiver-geometry metadata — the exact label shape that memorizes deployment layout and collapses cross-layout. - scripts/calibrate-camera-room.py + calibration_lib.py: OpenCV two-checkerboard calibration → versioned bundle JSON (intrinsics, camera→room extrinsics, checkerboard spec, transceiver geometry, sha256 calibration_id). Intrinsics resolve from file > cache > multi-view computation > loud-warning 2-view fallback. - collect-ground-truth.py --calibration <bundle>: every sample gains keypoints_room (unit bearing rays from the camera center in the room frame — documented projective alignment; raw image coords preserved so training chooses), camera_origin_room, calibration_id, and the transceiver geometry stamp. Without the flag, output is byte-identical to before (tested) + a one-line ADR-152 warning. Design finding (recorded for ADR-152): a single planar checkerboard's corner grid is centrosymmetric — the reversed corner ordering fits a ghost camera pose with IDENTICAL reprojection error, so per-board flip disambiguation is mathematically ill-posed. solve_two_board_extrinsics solves the joint wall+floor set over all 4 flip combinations, where the minimum is unique — an independent reason the TWO-checkerboard method is required, beyond what PerceptAlign states. 15 headless pytest tests green (synthetic corners: extrinsics recovery incl. ghost resolution, bundle round-trip + hash stability, ray transforms w/ distortion + cross-resolution, no-calibration byte identity). Co-Authored-By: RuFlo <ruv@ruv.net> * feat(benchmarks): WiFlow-STD reproduction harness + measurement (a) results (ADR-152 §2.2) Shipped checkpoint REFUTED (0.08% PCK@20, wrong keypoint normalization); 6 reproducibility defects documented (broken imports, corrupted dataset tail with float32-max garbage that NaN-poisons fp16 BatchNorm, unreachable test phase). After repairs, retraining with upstream defaults reproduces 96.09% PCK@20 full-test / 96.61% corruption-free (published 97.25%) on RTX 5080. Claims graded MEASURED-EQUIVALENT; 2.23M params + ~0.055 GFLOPs verified. Third-party code/weights/data stay out of tree (gitignored). Co-Authored-By: claude-flow <ruv@ruv.net> * feat: ADR-152 Rust integrations + ADR-153 802.11bf protocol model - calibration: GeometryEmbedding — 32-slot permutation-invariant NodeGeometry featurization for future LoRA-head conditioning (ADR-152 §2.1.2); derived SpecialistBank::geometry_embedding() accessor; 59 tests - train: MaePretrainConfig + patchify/random-mask with UNSW measured recipe (80% masking, (30,3) patches; ADR-152 §2.3, arXiv 2511.18792); strict no-truncate/no-NaN policy; proptest properties - train: WiFlowStdModel — tch-gated port of the verified ~96%-PCK@20 WiFlow-STD architecture (ADR-152 §2.2 beyond-SOTA); ungated param formula pinned to 2,225,042; 15/17-keypoint support; 239 crate tests - hardware: ieee80211bf forward-compatibility protocol model (ADR-153): SpecProfile gates, SensingCapabilities negotiation, required ConsentMode, session FSM, SensingTransport + SimTransport + OpportunisticCsiBridge; full acceptance checklist covered; 156+4 tests - deps: ruvector bumps per ADR-152 §2.6 survey (mincut/solver 2.0.6, attention 2.1.0, gnn 2.2.0); vendor/ruvector synced to a083bd77f - docs: ADR-153 accepted; ADR-152 §2.2 status, §2.4 amendment, §2.6 added Workspace: 162 test suites green (--no-default-features); Python proof PASS. Known pre-existing flake: homecore-api env_empty_falls_back_to_defaults (unserialized env-var mutation) — untouched, follow-up. Co-Authored-By: claude-flow <ruv@ruv.net> * docs: CHANGELOG + CLAUDE.md entries for ADR-152 integrations and ADR-153 Co-Authored-By: claude-flow <ruv@ruv.net> * fix(train): repair tch-backend bit-rot — gated path compiles and tests run again Mechanical API refresh against current tch: Vec::from(Tensor) -> try_from (+ explicit flatten), numel() usize cast, Rem/div ops -> remainder() / divide_scalar_mode(floor) — the latter fixed a silent true-division bug in heatmap argmax decoding; clamp(1.0, f64::MAX) -> clamp_min (torch 2.x scalar overflow panic); petgraph EdgeRef import; missing EvalMetrics and verify_checkpoint_dir APIs that tests documented. wiflow_std roundtrip test uses safetensors (.pt _save_parameters roundtrip broken in torch 2.11 Windows). Gated: 349 passed (incl. all 20 wiflow_std); ungated: unchanged. Known pre-existing: gaussian-heatmap convention mismatch (2 tests), proof seed race under parallel threads — documented, deliberate follow-ups. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(train): WiFlow-STD PyTorch->tch weight import + numerical parity proof export_to_safetensors.py maps the retrained checkpoint (295 tensors -> 248 mapped, param sum exactly 2,225,042; num_batches_tracked dropped) into a tch-loadable safetensors plus a deterministic parity fixture. Gated #[ignore] integration test loads it strictly and asserts forward-pass agreement: max abs diff 1.192e-7 on the seed-42 fixture. dump_variable_names test makes the tch name layout authoritative. Zero architecture discrepancies found. Co-Authored-By: claude-flow <ruv@ruv.net> * fix: workflow-review findings — BN gamma init, ThresholdParams serde, init docs Concurrent validation workflow (2 review lanes + adversarial verification, 13 agents): 5 confirmed findings, 3 refuted. Fixes: - wiflow_std: pin BatchNorm gamma to 1.0 (tch default draws Uniform(0,1) — silently halves activations in from-scratch training; loaded checkpoints unaffected, parity re-verified after the change) - wiflow_std: document the conv-init divergences vs the reference's effective kaiming_normal(fan_out) re-init (from-scratch dynamics only) - ieee80211bf: ThresholdParams deserialization validates via try_from so the <=100 invariant holds for untrusted payloads (+ rejection test) Benchmarks (release, ruvzen): GeometryEmbedding 1.84us/call (542k/s), MAE tokenization 7.38us/window (135k/s), 802.11bf FSM 8.9M events/s — nothing suspicious. Co-Authored-By: claude-flow <ruv@ruv.net> * docs(adr): ADR-152 §2.1.4 gate resolved — PerceptAlign repo MIT, dataset on HF Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): edge optimization measured + measurement (b) blocked + 92.9% retraction Edge optimization (ADR-152 optimize track): ONNX Runtime fp32 is the CPU latency win (3.2 ms/window, ~3.4x faster than torch, parity 2.4e-7); ORT dynamic int8 reaches 2.44 MB (paper's ~2.2 MB claim plausible only via conv-capable toolchains; -0.16pt PCK@20, +18% MPJPE, 2x slower); torch dynamic quant converts 0% of this conv-only model; fp16 halves storage free but is slower on CPU. Measurement (b) BLOCKED-ON-DATA: only 1,077 paired ESP32 windows exist (stop rule <2k). Forensic recheck of the surviving April holdout RETRACTS the ADR-079 '92.9% PCK@20' figure: constant-output model, absolute (not torso) threshold, 69 near-static frames — mean predictor scores 100% under that protocol; torso-PCK@20 is 19.1%. Corroborates PR #535. Stale citations removed from user-guide, readme-details, ADR-152 §2.1.3; no-citation rule extended to ADR-079 accuracy claims. Unblock: >=2k-window multi-pose paired session + torso-PCK re-baseline. Co-Authored-By: claude-flow <ruv@ruv.net> * docs(user-guide): corrected camera-supervised collection tutorial Step 0 CSI-rate check + session-length math (window yield = frames/20 — the May session's 8x under-delivery was a ~12 Hz CSI rate, not an aligner bug); two-checkerboard calibration step (ADR-152 §2.1.3); pose-variety and confidence guidance; torso-normalized PCK + temporal-split + pred-variance eval protocol (lessons from the 92.9% retraction); scale presets re-keyed to realistic window counts. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): static PTQ int8 (calibrated) results + overnight capture script Conv-only static QDQ beats dynamic int8 on accuracy (PCK@20 96.61-96.63% vs 96.52%, MPJPE +10% vs +18% over fp32) at ~equal size/latency; all-ops QDQ strictly worse (int8 activations through attention glue). Entropy calibration verified bit-identical to MinMax on this data. Deployment: ONNX fp32 for speed (3.2ms), static conv-only QDQ for smallest (2.53MB). Also: scripts/overnight-empty-capture.py — segmented UDP CSI recorder for empty-room baselines (no glob collisions, detach-safe). Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): measurement (b) MEASURED — optimization transfer only, mean-pose baseline wins WiFlow-STD fine-tuned on 2,046 fresh single-room ESP32 paired windows (temporal 70/15/15, 70->540 adapter, K=17): pretrained-init 65% PCK@20 vs scratch 0% (optimization transfer) but frozen-trunk ~0% (no feature transfer), and NOTHING beats the mean-pose baseline (95.9% PCK@20 — single subject, near-static normalized coords). Honesty gates held: pred std 0.0113 (non-constant model) but mean-baseline dominance means no citable CSI->pose capability from this data. ADR-152 open question 1 answered partially; definitive answer needs multi-subject/position data. Two new aligner findings: heterogeneous csi_shape with silent zero-padding (~20%), and extractCsiMatrix's transposed shape label (frame-major data, [nSc, nFrames] label) — fixes pending. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): efficiency sweep MEASURED — half model dominates full reference Compact WiFlow-STD variants on the same data/split/protocol: half (843,834 params, 0.38x) strictly dominates the 2.23M reference (PCK@20 96.62 vs 96.61, PCK@50 99.47 vs 99.11, MPJPE 0.00898 vs 0.0094) — the published architecture is over-parameterized for its own benchmark. quarter (338k) 96.05%; tiny (56,290 params, 1/39.5) holds 94.11% — a ~220KB fp32 edge candidate. In-domain caveats recorded; cross-domain untested. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(train): compact WiFlow-STD presets in Rust + tiny edge artifact (ADR-152) WiFlowStdConfig gains half()/quarter()/tiny() mirroring the overnight sweep exactly: TcnGroupsMode (Fixed/Gcd/Depthwise), input_pw_groups, derived stride schedule and decoder-mid (all default to upstream behavior; legacy serde JSON unaffected). Param formulas pin to trained ground truth first try: 843,834 / 338,600 / 56,290; default 2,225,042 pin and 1.192e-7 parity unchanged. 248 tests green. Tiny edge artifact (tiny_edge_bench.py): ONNX fp32 = 295 KB, 0.66 ms/win (~1,500/s CPU), 94.11% PCK@20 (matches sweep clean-test exactly; parity 1.49e-7). Static int8 is a bad trade at this scale (-1.43pt, +19% MPJPE, -16% size, slower) — recorded as negative result. Export note: width-16 breaks AdaptiveAvgPool((15,1)) TorchScript export; replaced by exact mean+matmul equivalent, proven by parity. Co-Authored-By: claude-flow <ruv@ruv.net> * fix: resolve all 10 confirmed code-review findings (7-angle review, 20/20 verified) wiflow_std: min_feature_width (default 15) replaces the keypoints->stride coupling — for_keypoints(17) now provably builds the trained [2,2,2,2] graph and pools 15->17, matching the validated Python protocol (pinned by tests); param_count() total on invalid configs; random_mask returns Result and rejects non-finite/out-of-range ratios; trainer checkpoints switched to safetensors (.pt VarStore roundtrip broken on Windows torch 2.11). ieee80211bf: SBP proxy now re-triggers instances and relays reports via Action::RelaySbpReport -> SensingFrame::SbpReport (clients consume via their existing path); missed_instances reset on success = consecutive semantics; SessionTable gains a guarded SBP entry point + unknown-id drop counter; initiator-role sessions reject inbound setup/SBP requests (RejectedNotSupported) closing the idle hijack; StartSetup/StartSbp outside Idle return InvalidStateForCommand; SBP validation unified through evaluate_setup with a 1:1 SetupStatus->SbpStatus mapping. events.rs split out to honor the 500-line cap. calibration/cli: enrollment geometry now actually reaches trained banks — both production call sites attach .with_geometry; --geometry flag on train-room and POST /enroll/geometry + train-body geometry on calibrate-serve give production a recording surface; geometry-free banks log the ADR-152 §2.1.2 note. benchmarks: corruption masks committed as ground truth (unregenerable after in-place cleaning; verified bit-identical regeneration from the pristine copy) + generate_corruption_masks.py producer; _bench_common.py dedups the 5x-copied shim/evaluate/seed/remap (post-refactor PCK@20 re-verified equal to the last digit); remote scripts get the mmap patch; tiny_edge --calib validated multiple-of-64; onnx_bench --help no longer executes (and overwrote) the export — artifact restored byte-exact. Workspace: 2,963 tests passed, 0 failed; Python proof PASS. Co-Authored-By: claude-flow <ruv@ruv.net> * ci: build workspace tests without debuginfo — runner disk exhaustion The combined 38-crate debug target exceeds the GitHub runner's disk ('final link failed: No space left on device'); the same tree measured 151GB locally with full debuginfo. CARGO_PROFILE_{DEV,TEST}_DEBUG=0 shrinks the target ~5-10x; debuginfo serves no purpose in CI test runs. Co-Authored-By: claude-flow <ruv@ruv.net>
327 lines
14 KiB
Python
327 lines
14 KiB
Python
#!/usr/bin/env python3
|
|
"""Headless tests for the camera-room calibration pipeline (ADR-152 S2.1.3).
|
|
|
|
Covers calibration_lib.py end to end on synthetic data -- no camera, no
|
|
display, no MediaPipe:
|
|
* known extrinsics recovered from synthetic two-checkerboard corners
|
|
* calibration bundle JSON round-trip + stable content hash
|
|
* image->room keypoint transform correctness (rays pass through the
|
|
original 3D points -- the projective, no-depth alignment of ADR-079
|
|
labels into the shared room frame)
|
|
* collect-ground-truth's no-calibration record path is byte-identical
|
|
(augment_record with ctx=None is the identity)
|
|
|
|
Run: python -m pytest scripts/tests/ -q
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
|
|
import cv2
|
|
import numpy as np
|
|
import pytest
|
|
|
|
import calibration_lib as cal
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Synthetic scene fixtures
|
|
# ---------------------------------------------------------------------------
|
|
|
|
IMG_W, IMG_H = 1280, 720
|
|
K_GT = np.array(
|
|
[[800.0, 0.0, 640.0],
|
|
[0.0, 800.0, 360.0],
|
|
[0.0, 0.0, 1.0]]
|
|
)
|
|
DIST_ZERO = np.zeros(5)
|
|
DIST_MILD = np.array([-0.10, 0.02, 0.001, -0.001, 0.0])
|
|
|
|
BOARD_COLS, BOARD_ROWS = 9, 6
|
|
SQUARE_M = 0.025
|
|
|
|
|
|
def look_at_pose(camera_pos, target):
|
|
"""Ground-truth camera pose: returns (R_cam_to_room, camera_center_room).
|
|
|
|
Camera convention: +z forward (optical axis), +x right, +y down.
|
|
"""
|
|
c = np.asarray(camera_pos, dtype=np.float64)
|
|
fwd = np.asarray(target, dtype=np.float64) - c
|
|
fwd /= np.linalg.norm(fwd)
|
|
up_room = np.array([0.0, 0.0, 1.0])
|
|
x_cam = np.cross(fwd, -up_room)
|
|
x_cam /= np.linalg.norm(x_cam)
|
|
y_cam = np.cross(fwd, x_cam)
|
|
r_cam_to_room = np.stack([x_cam, y_cam, fwd], axis=1) # columns = camera axes in room
|
|
return r_cam_to_room, c
|
|
|
|
|
|
def room_to_cam(r_cam_to_room, center):
|
|
"""Invert to the solvePnP (room->camera) convention: rvec, tvec."""
|
|
r_room_to_cam = r_cam_to_room.T
|
|
tvec = -r_room_to_cam @ center
|
|
rvec, _ = cv2.Rodrigues(r_room_to_cam)
|
|
return rvec, tvec.reshape(3, 1)
|
|
|
|
|
|
def project_room_points(points_room, r_cam_to_room, center, k=K_GT, dist=DIST_ZERO):
|
|
rvec, tvec = room_to_cam(r_cam_to_room, center)
|
|
proj, _ = cv2.projectPoints(np.asarray(points_room, dtype=np.float64), rvec, tvec, k, dist)
|
|
return proj.reshape(-1, 2)
|
|
|
|
|
|
@pytest.fixture
|
|
def scene():
|
|
"""A camera in the room looking at the wall + floor checkerboards."""
|
|
r_gt, c_gt = look_at_pose(camera_pos=[1.5, 3.0, 1.3], target=[1.0, 0.5, 0.8])
|
|
wall_room = cal.board_room_points(
|
|
BOARD_COLS, BOARD_ROWS, SQUARE_M,
|
|
origin=[0.5, 0.0, 1.6], u_axis=cal.parse_axis("+x"), v_axis=cal.parse_axis("-z"),
|
|
)
|
|
floor_room = cal.board_room_points(
|
|
BOARD_COLS, BOARD_ROWS, SQUARE_M,
|
|
origin=[1.0, 1.0, 0.0], u_axis=cal.parse_axis("+x"), v_axis=cal.parse_axis("+y"),
|
|
)
|
|
return r_gt, c_gt, wall_room, floor_room
|
|
|
|
|
|
def make_bundle(r_gt, c_gt, dist=DIST_ZERO):
|
|
return cal.make_bundle(
|
|
camera_intrinsics={
|
|
"image_size": [IMG_W, IMG_H],
|
|
"camera_matrix": K_GT.tolist(),
|
|
"dist_coeffs": dist.tolist(),
|
|
"reprojection_error_px": 0.0,
|
|
"source": "synthetic",
|
|
},
|
|
camera_to_room_extrinsics={
|
|
"rotation": r_gt.tolist(),
|
|
"translation_m": c_gt.tolist(),
|
|
"rmse_px": 0.0,
|
|
},
|
|
checkerboard_spec={"cols": BOARD_COLS, "rows": BOARD_ROWS, "square_size_mm": 25.0},
|
|
transceiver_geometry={
|
|
"nodes": [
|
|
{"id": "esp32-s3-a", "position_m": [0.1, 2.4, 1.1], "antenna_yaw_deg": 180.0},
|
|
{"id": "esp32-c6-b", "position_m": [3.2, 0.3, 0.9]},
|
|
],
|
|
"units": "meters",
|
|
"source": "file",
|
|
},
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Extrinsics recovery from synthetic checkerboard corners
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestExtrinsicsRecovery:
|
|
def test_two_board_combined_recovers_known_pose(self, scene):
|
|
r_gt, c_gt, wall_room, floor_room = scene
|
|
room_pts = np.concatenate([wall_room, floor_room], axis=0)
|
|
img_pts = project_room_points(room_pts, r_gt, c_gt)
|
|
|
|
ext = cal.solve_extrinsics(room_pts, img_pts, K_GT, DIST_ZERO)
|
|
|
|
assert ext["rmse_px"] < 1e-3
|
|
np.testing.assert_allclose(np.asarray(ext["translation_m"]), c_gt, atol=1e-4)
|
|
r_delta = np.asarray(ext["rotation"]).T @ r_gt
|
|
angle_deg = np.degrees(np.arccos(np.clip((np.trace(r_delta) - 1) / 2, -1, 1)))
|
|
assert angle_deg < 0.01
|
|
|
|
def test_single_board_solves_agree(self, scene):
|
|
# With correct corner ordering, each board alone recovers the same pose.
|
|
r_gt, c_gt, wall_room, floor_room = scene
|
|
ext_wall = cal.solve_extrinsics(
|
|
wall_room, project_room_points(wall_room, r_gt, c_gt), K_GT, DIST_ZERO)
|
|
ext_floor = cal.solve_extrinsics(
|
|
floor_room, project_room_points(floor_room, r_gt, c_gt), K_GT, DIST_ZERO)
|
|
consistency = cal.extrinsics_consistency(ext_wall, ext_floor)
|
|
assert consistency["rotation_deg"] < 0.1
|
|
assert consistency["translation_m"] < 1e-3
|
|
|
|
def test_reversed_corner_order_auto_recovered(self, scene):
|
|
# findChessboardCorners may enumerate from either board end. A single
|
|
# board cannot disambiguate that flip (centrosymmetric grid), but the
|
|
# joint two-board solve can -- feed it a reversed wall ordering and
|
|
# require the true pose back.
|
|
r_gt, c_gt, wall_room, floor_room = scene
|
|
wall_img = project_room_points(wall_room, r_gt, c_gt)
|
|
floor_img = project_room_points(floor_room, r_gt, c_gt)
|
|
ext = cal.solve_two_board_extrinsics(
|
|
wall_room, wall_img[::-1].copy(), floor_room, floor_img,
|
|
K_GT, DIST_ZERO)
|
|
assert ext["wall_flipped"] is True
|
|
assert ext["floor_flipped"] is False
|
|
assert ext["rmse_px"] < 1e-3
|
|
np.testing.assert_allclose(np.asarray(ext["translation_m"]), c_gt, atol=1e-3)
|
|
|
|
def test_joint_solver_matches_unflipped(self, scene):
|
|
r_gt, c_gt, wall_room, floor_room = scene
|
|
ext = cal.solve_two_board_extrinsics(
|
|
wall_room, project_room_points(wall_room, r_gt, c_gt),
|
|
floor_room, project_room_points(floor_room, r_gt, c_gt),
|
|
K_GT, DIST_ZERO)
|
|
assert ext["wall_flipped"] is False and ext["floor_flipped"] is False
|
|
assert ext["per_board"]["wall"]["rmse_px"] < 1e-3
|
|
assert ext["per_board"]["floor"]["rmse_px"] < 1e-3
|
|
|
|
def test_intrinsics_recovered_from_synthetic_views(self):
|
|
# Several board views from different poses -> calibrateCamera should
|
|
# get focal length / principal point close to ground truth.
|
|
obj = cal.board_object_points(BOARD_COLS, BOARD_ROWS, SQUARE_M)
|
|
poses = [
|
|
([0.05, 1.2, 0.05], [0.10, 0.0, 0.06]),
|
|
([-0.25, 1.0, 0.20], [0.10, 0.0, 0.06]),
|
|
([0.45, 0.9, -0.15], [0.10, 0.0, 0.06]),
|
|
([0.10, 1.4, 0.30], [0.10, 0.0, 0.06]),
|
|
([-0.15, 0.8, -0.20], [0.10, 0.0, 0.06]),
|
|
]
|
|
corner_sets = []
|
|
for cam_pos, target in poses:
|
|
r, c = look_at_pose(cam_pos, target)
|
|
# Embed the board rigidly in the y=0 plane (u=+x, v=+z) and view it.
|
|
board_in_room = np.column_stack([obj[:, 0], obj[:, 2], obj[:, 1]])
|
|
corner_sets.append(project_room_points(board_in_room, r, c))
|
|
intr = cal.compute_intrinsics(corner_sets, (IMG_W, IMG_H),
|
|
BOARD_COLS, BOARD_ROWS, SQUARE_M)
|
|
k = np.asarray(intr["camera_matrix"])
|
|
assert abs(k[0, 0] - K_GT[0, 0]) / K_GT[0, 0] < 0.05
|
|
assert abs(k[1, 1] - K_GT[1, 1]) / K_GT[1, 1] < 0.05
|
|
assert intr["reprojection_error_px"] < 1.0
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Bundle round-trip + content hash
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestBundle:
|
|
def test_save_load_roundtrip(self, scene, tmp_path):
|
|
r_gt, c_gt, _, _ = scene
|
|
bundle = make_bundle(r_gt, c_gt)
|
|
path = tmp_path / "camera-room.json"
|
|
cal.save_bundle(bundle, path)
|
|
loaded = cal.load_bundle(path)
|
|
assert loaded == bundle
|
|
assert cal.calibration_id(loaded) == cal.calibration_id(bundle)
|
|
|
|
def test_bundle_schema_fields(self, scene):
|
|
r_gt, c_gt, _, _ = scene
|
|
bundle = make_bundle(r_gt, c_gt)
|
|
for key in ("schema_version", "method", "calibrated_at", "room_frame",
|
|
"checkerboard_spec", "camera_intrinsics",
|
|
"camera_to_room_extrinsics", "transceiver_geometry"):
|
|
assert key in bundle
|
|
assert bundle["method"] == "two-checkerboard"
|
|
|
|
def test_calibration_id_changes_with_content(self, scene):
|
|
r_gt, c_gt, _, _ = scene
|
|
bundle_a = make_bundle(r_gt, c_gt)
|
|
bundle_b = json.loads(json.dumps(bundle_a))
|
|
bundle_b["transceiver_geometry"]["nodes"][0]["position_m"] = [0.2, 2.4, 1.1]
|
|
assert cal.calibration_id(bundle_a) != cal.calibration_id(bundle_b)
|
|
assert cal.calibration_id(bundle_a).startswith("sha256:")
|
|
|
|
def test_load_bundle_rejects_missing_keys(self, tmp_path):
|
|
path = tmp_path / "bad.json"
|
|
path.write_text('{"camera_intrinsics": {}}', encoding="utf-8")
|
|
with pytest.raises(ValueError, match="missing key"):
|
|
cal.load_bundle(path)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Keypoint transform: image -> room-frame bearing rays (projective alignment)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestKeypointTransform:
|
|
PERSON_POINTS = np.array([
|
|
[1.2, 1.5, 1.7], # head height
|
|
[1.1, 1.5, 1.4], # shoulder
|
|
[1.3, 1.6, 0.9], # hip
|
|
[1.2, 1.5, 0.1], # ankle
|
|
])
|
|
|
|
@pytest.mark.parametrize("dist", [DIST_ZERO, DIST_MILD], ids=["no-distortion", "mild-distortion"])
|
|
def test_rays_pass_through_original_points(self, scene, dist):
|
|
r_gt, c_gt, _, _ = scene
|
|
img = project_room_points(self.PERSON_POINTS, r_gt, c_gt, dist=dist)
|
|
kps_norm = (img / np.array([IMG_W, IMG_H])).tolist()
|
|
|
|
ctx = cal.CalibrationContext(make_bundle(r_gt, c_gt, dist=dist), IMG_W, IMG_H)
|
|
origin, rays = ctx.transform_keypoints(kps_norm)
|
|
|
|
np.testing.assert_allclose(origin, c_gt, atol=1e-9)
|
|
np.testing.assert_allclose(np.linalg.norm(rays, axis=1), 1.0, atol=1e-9)
|
|
for point, ray in zip(self.PERSON_POINTS, rays):
|
|
v = point - origin
|
|
# Distance from the true 3D point to the recovered ray ~ 0, and
|
|
# the point sits in FRONT of the camera along the ray.
|
|
dist_to_ray = np.linalg.norm(v - np.dot(v, ray) * ray)
|
|
assert dist_to_ray < 1e-4
|
|
assert np.dot(v, ray) > 0
|
|
|
|
def test_resolution_scaling(self, scene):
|
|
# Collection camera runs 640x360 while the bundle was made at
|
|
# 1280x720 -- normalized keypoints must land on the same rays.
|
|
r_gt, c_gt, _, _ = scene
|
|
img = project_room_points(self.PERSON_POINTS, r_gt, c_gt)
|
|
kps_norm = (img / np.array([IMG_W, IMG_H])).tolist()
|
|
|
|
ctx = cal.CalibrationContext(make_bundle(r_gt, c_gt), 640, 360)
|
|
origin, rays = ctx.transform_keypoints(kps_norm)
|
|
for point, ray in zip(self.PERSON_POINTS, rays):
|
|
v = point - origin
|
|
assert np.linalg.norm(v - np.dot(v, ray) * ray) < 1e-4
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# collect-ground-truth record path (import-level; no camera loop)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestRecordAugmentation:
|
|
LEGACY_RECORD = {
|
|
"ts_ns": 1775300000000000000,
|
|
"keypoints": [[0.45, 0.12]] * 17,
|
|
"confidence": 0.92,
|
|
"n_visible": 14,
|
|
"n_persons": 1,
|
|
}
|
|
|
|
def test_no_calibration_is_byte_identical(self):
|
|
# The collector's no---calibration path must emit exactly the
|
|
# original ADR-079 JSONL line (back-compat guarantee).
|
|
record = json.loads(json.dumps(self.LEGACY_RECORD))
|
|
before = json.dumps(record)
|
|
out = cal.augment_record(record, None)
|
|
assert out is record
|
|
assert json.dumps(out) == before
|
|
assert set(out.keys()) == {"ts_ns", "keypoints", "confidence",
|
|
"n_visible", "n_persons"}
|
|
|
|
def test_calibrated_record_gains_room_fields(self, scene):
|
|
r_gt, c_gt, _, _ = scene
|
|
bundle = make_bundle(r_gt, c_gt)
|
|
ctx = cal.CalibrationContext(bundle, IMG_W, IMG_H)
|
|
|
|
record = json.loads(json.dumps(self.LEGACY_RECORD))
|
|
out = cal.augment_record(record, ctx)
|
|
|
|
# Raw image coords preserved untouched; room representation added.
|
|
assert out["keypoints"] == self.LEGACY_RECORD["keypoints"]
|
|
assert len(out["keypoints_room"]) == 17
|
|
assert all(len(ray) == 3 for ray in out["keypoints_room"])
|
|
assert out["calibration_id"] == cal.calibration_id(bundle)
|
|
assert out["transceiver_geometry"] == bundle["transceiver_geometry"]
|
|
assert len(out["camera_origin_room"]) == 3
|
|
json.dumps(out) # remains JSONL-serializable
|
|
|
|
def test_empty_keypoints_record(self, scene):
|
|
r_gt, c_gt, _, _ = scene
|
|
ctx = cal.CalibrationContext(make_bundle(r_gt, c_gt), IMG_W, IMG_H)
|
|
record = {"ts_ns": 1, "keypoints": [], "confidence": 0.0,
|
|
"n_visible": 0, "n_persons": 0}
|
|
out = cal.augment_record(record, ctx)
|
|
assert out["keypoints_room"] == []
|
|
assert "calibration_id" in out
|