697914fac8
Closes homemaker-py-ju3. DESIGN.md §39.3. The class: key from the bead's design was deliberately NOT built. Auditing every use of the prefix rule first showed it runs deeper than c/o/s -- l/k/b/t carry real adjacency semantics (graph.py builds bedroom<->toilet and kitchen<->living relations from first characters) -- so re-plumbing the type system would invalidate the whole corpus and every baseline, for a problem whose damage is the silence, not the convention. Two findings made the smaller fix sufficient: no corpus programme has ever declared a bare c/o/s code, so check_space_counts' skip only ever discarded declared rooms; and nothing references harbor's four codes in any adjacency or co_locate list. - programme.validate_codes raises on a reserved-prefix code, with the full explanation. Called from BOTH parse paths (programme._parse_spaces and fitness.Fitness._load_programme parse conf["spaces"] independently, so validating one would leave the other door open). l/k/b/t stay unreserved. - harbor-house and harbor-house-l0 renamed: cr1->fr1, of->ao, st1->gs1, st2->gs2. New prefixes are unused in harbor and semantically neutral, and the two storage codes still share a prefix, preserving the structure evaluate_building's per-code plot-ratio term depends on. name: unchanged. - experiments/migrate_ju3_rename.py migrates .dom files written before the rename (--check dry-runs). Pre-rename artefacts, notably evolved-3M*.dom, must be migrated or their leaves read as unmatched generics. - test_collapse_global's c/o/s exclusion test now uses a generic C leaf, which is what the exclusion is actually for; it previously relied on a programme code colliding, which is no longer possible. Re-baseline (seed 1, 20k evals, same settings as §38's run): 57 fails against the 32-instance effective programme -> 55 against the real 37-instance one, with all five previously-lost room instances now placed inside their declared sigma bands (fr1 87.2 vs declared 80, was 32.9/17.1; ao/gs1/gs2 were absent entirely) and no failure naming any of the four codes. At one seed each, 57 vs 55 is within noise -- the robust result is the room placement, not the count. Historical harbor numbers are not comparable to post-ju3 ones; filed homemaker-py-t3s to restate 2v1's acceptance figure once evolved-3M is migrated. 346 passed (+10 new), same 7 pre-existing fixture failures. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MJ84Feep79Hhm3E4zZJmnB
50 lines
2.1 KiB
Python
50 lines
2.1 KiB
Python
"""Tests for programme.py parsing and validation."""
|
|
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from homemaker_layout import fitness, programme
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# homemaker-py-ju3 / DESIGN.md §39.2 — reserved generic type prefixes
|
|
# --------------------------------------------------------------------------- #
|
|
def test_validate_codes_accepts_non_reserved_prefixes():
|
|
programme.validate_codes(["b1", "k1", "t3", "la1", "me1", "n", "fr1", "ao"])
|
|
|
|
|
|
@pytest.mark.parametrize("code", ["cr1", "of", "st1", "C", "O", "s2"])
|
|
def test_validate_codes_rejects_reserved_prefixes(code):
|
|
"""A colliding code must fail LOUDLY: silently reinterpreting it as a
|
|
generic type is the whole bug (§39.2)."""
|
|
with pytest.raises(ValueError, match="reserved generic type prefixes"):
|
|
programme.validate_codes([code])
|
|
|
|
|
|
def test_reserved_prefix_rejected_by_both_parse_paths():
|
|
"""programme._parse_spaces and fitness.Fitness._load_programme parse
|
|
conf["spaces"] independently — validating only one would leave the other
|
|
door open."""
|
|
conf = {"spaces": {"cr1": {"size": [80.0, 10.0]}}}
|
|
with pytest.raises(ValueError, match="reserved generic type prefixes"):
|
|
programme._parse_spaces(conf)
|
|
with pytest.raises(ValueError, match="reserved generic type prefixes"):
|
|
fitness.Fitness(conf=conf)
|
|
|
|
|
|
def test_semantic_but_unreserved_prefixes_are_allowed():
|
|
"""l/k/b/t carry adjacency semantics but never discard a requirement, so
|
|
programme codes may use them freely — only c/o/s are reserved."""
|
|
reqs = programme._parse_spaces({"spaces": {
|
|
"l1": {"size": [20.0, 4.0]}, "k1": {"size": [12.0, 3.0]},
|
|
"b1": {"size": [16.0, 4.0]}, "t1": {"size": [3.0, 1.0]},
|
|
}})
|
|
assert sorted(reqs) == ["b1", "k1", "l1", "t1"]
|
|
|
|
|
|
def test_corpus_programmes_are_namespace_clean():
|
|
"""Every checked-in example must load — a regression here means a corpus
|
|
programme reintroduced a colliding code."""
|
|
for d in sorted(Path("examples").iterdir()):
|
|
if (d / "patterns.config").is_file():
|
|
programme.load_programme_dir(str(d))
|