bruno/homemaker-layout
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

§39.7: access requirements become a declared usage: attribute (homemaker-py-sel)

Browse source 
Closes the second namespace sharing a first character with programme codes: the
usage prefixes b/t/l/k, under which a room silently inherited another room's
connectivity rules from its spelling.

usage is a plain, MANDATORY attribute of the space definition -- not a lookup
table. An interim design proposed a top-level usage_classes: table binding
author-coined names to behaviour; withdrawn, because an indirect name->behaviour
mapping living apart from the thing it describes is exactly the shape of the
prefix rule §39 exists to remove, it would be the only such table in a schema
where every other space property is a plain attribute, and the need it served
was already met -- "building specific" is about what a room is CALLED, and
name: is already free text.

Rule that settles it: a usage value exists iff the engine treats it differently
somewhere. Config selects among behaviours; it cannot invent them.

- programme.USAGES (living/kitchen/bedroom/toilet/utility/none) plus the
  behaviour groupings PRIVATE_USAGES / PRIVATE_STRIPS / TOILET_STRIPS /
  SOCIABLE_USAGES. Missing or unknown usage is a load error naming the code,
  from BOTH parse paths.
- Code-level, never leaf-level: usage_of(leaf.type) is looked up fresh, so a
  retype changes the class automatically. 51 sites assign leaf.type, and
  share/share_type plus the r5a resurrection are the precedent for why
  leaf-level attributes rot.
- graph.has_circulation takes the usage map and trims on declared class;
  fitness.access and the public-access check likewise. fitness._t0 is DELETED --
  no first-character type test remains anywhere in the codebase.
- utility is distinct from bedroom (same access requirements today) because it
  is a different use and gives derive_interchange_classes an axis to relax on.
- A toilet now keeps its edge to a terminal room -- the Brand adjacency, which
  the old b-before-t loop ordering severed.
- All 107 corpus entries migrated by experiments/migrate_usage_key.py, comments
  and layout preserved.

MEASURED -- the connectivity model was ~4x too permissive. `none` is not
neutral: nothing is trimmed, so the graph may route THROUGH the room, and 34 of
52 codes had no class (Dental Surgery, Records Room, Utilities Closet all served
as corridors). Edges trimmed, prefix-inferred vs declared, 3 seeds each:
  harbor-house   18 (9%)  -> 79 (39%)   inaccessible fails 0 -> 4
  health-centre  12 (8%)  -> 59 (40%)   inaccessible fails 2 -> 3
  maple-court    53 (17%) -> 123 (39%)  inaccessible fails 1 -> 5

Re-baseline (seed 1, 20k, harbor): 58 fails (15h/43s) -> 61 (16h/45s), now
reporting 1-inaccessible-usable-space x2 plus level 0 and level 1 not connected.
The count rose because the objective got honest -- those failures were always
true of the layout and the old model could not see them. Every harbor number
before this was measured against a graph crediting routes through store
cupboards.

Sharpens §38.2: the objective pays x60-85 to delete circulation, and until now
the deleted corridors were not missed because storage stood in for them. With
that substitution gone, homemaker-py-2v1 is the remaining half -- and now
measurable, because the fails it should prevent actually fire.

350 passed (+5 new), same 7 pre-existing fixture failures, lint unchanged.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MJ84Feep79Hhm3E4zZJmnB
This commit is contained in:
Claude 2026-08-26 13:39:41 +00:00
parent 72673a2ebf
commit 03aadec1ba
No known key found for this signature in database
27 changed files with 548 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.beads/issues.jsonl
View file

File diff suppressed because one or more lines are too long

9
AGENTS.md
View file

@ -65,10 +65,11 @@ Leaf types share a first character across three namespaces:
at load.
- **programme room codes** — lowercase, may start with *any* letter. The generic
tests match `C`/`O`/`S` exactly, so `cr1` is a room, not circulation.
- **usage prefixes `b`/`t`/`l`/`k`** — bedroom / toilet / living / kitchen,
still matched by first letter *by design*. `graph.has_circulation` strips graph
edges from them, so a code beginning with one inherits that room's
connectivity rules whether or not intended (`homemaker-py-sel`).
- **`usage:`** — every space declares its access-requirement class
(`living`/`kitchen`/`bedroom`/`toilet`/`utility`/`none`), mandatory, no
fallback (DESIGN.md §39.7). A code's spelling decides nothing: `name:` is free
text, `usage:` drives behaviour. There is no first-character type test left
anywhere in the codebase.
When adding or editing a programme, run
`python experiments/audit_programme_config.py` — it reports reserved-name

9
CLAUDE.md
View file

@ -31,10 +31,11 @@ Leaf types share a first character across three namespaces:
at load.
- **programme room codes** — lowercase, may start with *any* letter. The generic
tests match `C`/`O`/`S` exactly, so `cr1` is a room, not circulation.
- **usage prefixes `b`/`t`/`l`/`k`** — bedroom / toilet / living / kitchen,
still matched by first letter *by design*. `graph.has_circulation` strips graph
edges from them, so a code beginning with one inherits that room's
connectivity rules whether or not intended (`homemaker-py-sel`).
- **`usage:`** — every space declares its access-requirement class
(`living`/`kitchen`/`bedroom`/`toilet`/`utility`/`none`), mandatory, no
fallback (DESIGN.md §39.7). A code's spelling decides nothing: `name:` is free
text, `usage:` drives behaviour. There is no first-character type test left
anywhere in the codebase.
When adding or editing a programme, run
`python experiments/audit_programme_config.py` — it reports reserved-name

75
DESIGN.md
View file

@ -5347,3 +5347,78 @@ are *currently spelled correctly* too, so it needs its own A/B and re-baseline
rather than being folded in here.
### 39.7 `usage:` — access requirements become a declared attribute (`homemaker-py-sel`) — DONE
§39.4 separated programme codes from the generic structural types. This closes
the second namespace sharing the same first character: the **usage prefixes**
`b`/`t`/`l`/`k`, under which a room silently inherited another room's
connectivity rules from its spelling.
**Usage is an ACCESS-REQUIREMENT class, not a room-name category** — "library
corner and staff room are living rooms as they have the same access
requirements". It is now a plain, mandatory attribute of the space definition:
```yaml
spaces:
la1:
usage: utility # controlled, drives engine behaviour
name: Laundry Room # free text, building-specific
```
**Why an attribute and not a lookup table.** An interim design proposed a
top-level `usage_classes:` table binding author-coined names to behaviour. It
was withdrawn: an indirect name→behaviour mapping living apart from the thing
it describes is *exactly* the shape of the prefix rule §39 exists to remove,
it is the only such table the schema would contain (every other space property
— `name`, `size`, `adjacency`, `level`, `count`, `share`, `interchange`,
`co_locate` — is a plain attribute), and the need it served was already met:
"building specific" is about what a room is **called**, and `name:` is already
free text. The rule that settles it: **a usage value exists if and only if the
engine treats it differently somewhere.** Config selects among behaviours; it
cannot invent them.
**Mutation safety.** Usage is keyed by CODE, so `usage_of(leaf.type)` is looked
up fresh on every read exactly as size/width/adjacency are; a retype changes the
code and the class follows. It is never stamped on a leaf — 51 sites assign
`leaf.type`, and `share`/`share_type` plus the `r5a` stale-stamp resurrection
are this project's own evidence for why leaf-level attributes rot.
**Vocabulary** (closed): `living`, `kitchen`, `bedroom`, `toilet`, `utility`,
`none`. Missing or unknown is a load error naming the code, from **both** parse
paths. `utility` shares `bedroom`'s access requirements today but is a distinct
value — a genuinely different use, and an axis
`derive_interchange_classes` can relax on (bedroom- and utility-class leaves
interchangeable *during* search, collapsing to their real use at scoring time —
the superposition relaxation §13/§26 already implements).
`graph.has_circulation` now takes the usage map and trims on declared class;
`fitness.access` and the public-access check likewise. **`fitness._t0` is
deleted — no first-character type test remains anywhere in the codebase.**
**The connectivity model was ~4× too permissive.** `none` is not neutral:
nothing is trimmed, so the graph may route *through* the room. 34 of 52 corpus
codes had no class, meaning a Dental Surgery, a Records Room and a Utilities
Closet all served as corridors. Measured on constructed seeds, 3 per programme,
prefix-inferred vs declared:
| programme | codes reclassified | edges trimmed before | after | inaccessible-space fails |
|---|---|---|---|---|
| harbor-house | 12 of 16 | 18 (9%) | **79 (39%)** | 0 → **4** |
| health-centre | 14 of 19 | 12 (8%) | **59 (40%)** | 2 → **3** |
| maple-court | 18 of 26 | 53 (17%) | **123 (39%)** | 1 → **5** |
**Re-baseline** (`--budget 20000 --workers 4 --seed 1`, harbor-house): 58 fails
(15 hard / 43 soft) → **61 (16 hard / 45 soft)**, and the result now reports
`1 inaccessible usable space` ×2, `level 0 not connected` and `level 1 not
connected`. The count went **up because the objective got honest**: those
failures were always true of the layout, and the old model could not see them.
Every harbor number before §39.7 was measured against a connectivity graph that
credited routes through store cupboards.
This sharpens §38.2 rather than competing with it. The objective already pays
×60–85 to delete circulation; until now the corridors it deleted were not
missed, because consulting rooms and storage stood in for them. With that
substitution gone, `homemaker-py-2v1` (connectivity priced at ×0.5 against a ×6
circulation→habitable value gap) is the remaining half of the same problem —
and now measurable, because the fails it should be preventing actually fire.

27
README.md
View file

@ -75,18 +75,23 @@ letter: since DESIGN.md §39.4 the generic tests match `C`/`O`/`S` exactly, so
naming a room `cr1` no longer makes it circulation. (Before that fix it did —
and silently dropped it from the required-space check entirely.)
**3. Usage prefixes — `b` bedroom, `t` toilet, `l` living, `k` kitchen.**
Still matched by first letter, deliberately: this is how Urb encodes room usage.
`graph.has_circulation` deletes graph edges based on them (a "bedroom" loses its
edges to living/kitchen/bedroom/toilet; a "toilet" loses its edges to
outside/living/kitchen/toilet), and the access and public-access checks read
them too.
**3. Access requirements — the `usage:` attribute.** Every space declares one
of `living`, `kitchen`, `bedroom`, `toilet`, `utility`, `none`. Mandatory, no
fallback, and a missing or unknown value is a load error. It replaced a
first-character convention (`b`/`t`/`l`/`k`) under which a room silently
inherited another room's connectivity rules from its spelling — `la1` "Laundry
Room" was trimmed as a living room (DESIGN.md §39.7).
**So a code beginning with `b`/`t`/`l`/`k` inherits that room's connectivity
rules whether or not you meant it** — `la1` "Laundry Room" is treated as a
living room, `tr1` "Treatment Room" as a toilet. This is a known wart
(`homemaker-py-sel`, DESIGN.md §39.6); an explicit `usage:` key is the planned
fix. Until then, check any new programme with:
```yaml
spaces:
la1:
usage: utility # controlled, drives engine behaviour
name: Laundry Room # free text, building-specific
```
A usage value exists only where the engine treats it differently, so the
vocabulary is closed: a new access class means new code, not new config. Check a
programme with:
```bash
python experiments/audit_programme_config.py

10
examples/harbor-house-l0/patterns.config
View file

@ -11,6 +11,7 @@
spaces:
cr1:
usage: living
name: Common Room with Fireplace
size:
- 80.0
@ -26,6 +27,7 @@ spaces:
- o
ef1:
usage: none
name: Entrance Foyer
size:
- 15.0
@ -37,6 +39,7 @@ spaces:
- c
da1:
usage: living
name: Dining Area
size:
- 60.0
@ -53,6 +56,7 @@ spaces:
- o
k1:
usage: kitchen
name: Kitchen
size:
- 30.0
@ -65,6 +69,7 @@ spaces:
- c
ws1:
usage: living
name: Workshop Space
size:
- 40.0
@ -80,6 +85,7 @@ spaces:
- o
m:
usage: living
name: Meeting Room
size:
- 10.0
@ -92,6 +98,7 @@ spaces:
count: 3
la1:
usage: utility
name: Laundry Room
size:
- 20.0
@ -103,6 +110,7 @@ spaces:
- c
st1:
usage: utility
name: Ground Floor Storage
size:
- 22.0
@ -114,6 +122,7 @@ spaces:
- c
me1:
usage: utility
name: Mechanical/Electrical Room
size:
- 25.0
@ -125,6 +134,7 @@ spaces:
- c
of:
usage: bedroom
name: Staff Office
size:
- 12.5

16
examples/harbor-house/patterns.config
View file

@ -7,6 +7,7 @@
spaces:
# GROUND FLOOR - Main Community Areas
cr1:
usage: living
name: Common Room with Fireplace
size:
- 80.0
@ -23,6 +24,7 @@ spaces:
- o
ef1:
usage: none
name: Entrance Foyer
size:
- 15.0
@ -40,6 +42,7 @@ spaces:
- m
da1:
usage: living
name: Dining Area
size:
- 60.0
@ -57,6 +60,7 @@ spaces:
- o
k1:
usage: kitchen
name: Kitchen
size:
- 30.0
@ -71,6 +75,7 @@ spaces:
# SLEEPING AREAS - Anonymous neighborhoods (5 total, 2 ground + 3 first)
n:
usage: bedroom
name: Neighborhood
size:
- 60.0
@ -87,6 +92,7 @@ spaces:
# GROUND FLOOR - Activity Spaces
ws1:
usage: living
name: Workshop Space
size:
- 40.0
@ -104,6 +110,7 @@ spaces:
# MEETING ROOMS - Anonymous interchangeable (3 total)
m:
usage: living
name: Meeting Room
size:
- 10.0
@ -121,6 +128,7 @@ spaces:
# GROUND FLOOR - Service Areas
# BATHROOMS - Ground floor (3 total)
t:
usage: toilet
name: Bathroom
size:
- 6.0
@ -133,6 +141,7 @@ spaces:
count: 6 # 3 ground + 3 first floor
la1:
usage: utility
name: Laundry Room
size:
- 20.0
@ -149,6 +158,7 @@ spaces:
- me1
st1:
usage: utility
name: Ground Floor Storage
size:
- 22.0
@ -161,6 +171,7 @@ spaces:
- c
me1:
usage: utility
name: Mechanical/Electrical Room
size:
- 25.0
@ -176,6 +187,7 @@ spaces:
# STAFF OFFICES - Anonymous (2 total)
of:
usage: bedroom
name: Staff Office
size:
- 12.5
@ -190,6 +202,7 @@ spaces:
# FIRST FLOOR - Community Areas
li1:
usage: living
name: Library Corner
size:
- 20.0
@ -203,6 +216,7 @@ spaces:
# FIRST FLOOR - Individual Rooms (10 anonymous rooms)
r:
usage: bedroom
name: Individual Room
size:
- 10.0
@ -217,6 +231,7 @@ spaces:
# FIRST FLOOR - Storage
st2:
usage: utility
name: First Floor Storage
size:
- 18.0
@ -229,6 +244,7 @@ spaces:
- c
ut1:
usage: utility
name: Utilities Closet
size:
- 14.0

19
examples/health-centre/patterns.config
View file

@ -24,6 +24,7 @@
spaces:
# ---- PUBLIC / RECEPTION ----
rc1:
usage: none
name: Reception
size:
- 10.0
@ -40,6 +41,7 @@ spaces:
- o
wa1:
usage: none
name: Waiting Room
size:
- 28.0
@ -57,6 +59,7 @@ spaces:
- rc1
ph1:
usage: bedroom
name: Pharmacy / Dispensary
size:
- 12.0
@ -75,6 +78,7 @@ spaces:
# ---- CLINICAL ----
gp1:
usage: bedroom
name: GP Consulting Room
size:
- 14.0
@ -89,6 +93,7 @@ spaces:
- c
ms1:
usage: bedroom
name: Minor Surgery Room
size:
- 20.0
@ -107,6 +112,7 @@ spaces:
- de1
de1:
usage: bedroom
name: Dental Surgery
size:
- 18.0
@ -124,6 +130,7 @@ spaces:
- ms1
zt1:
usage: utility
name: Sterilisation Room
size:
- 6.0
@ -139,6 +146,7 @@ spaces:
- de1
pt1:
usage: bedroom
name: Physiotherapy Room
size:
- 24.0
@ -153,6 +161,7 @@ spaces:
- c
qr1:
usage: bedroom
name: Counselling Room
size:
- 9.0
@ -167,6 +176,7 @@ spaces:
- c
tr1:
usage: bedroom
name: Treatment Room
size:
- 16.0
@ -182,6 +192,7 @@ spaces:
# ---- ADMIN / STAFF ----
mo1:
usage: bedroom
name: Manager's Office
size:
- 10.0
@ -200,6 +211,7 @@ spaces:
- ao1
ao1:
usage: bedroom
name: Admin Office
size:
- 14.0
@ -217,6 +229,7 @@ spaces:
- br1
re1:
usage: utility
name: Records Room
size:
- 7.0
@ -234,6 +247,7 @@ spaces:
- dp1
br1:
usage: living
name: Staff Room
size:
- 16.0
@ -250,6 +264,7 @@ spaces:
- ao1
kt1:
usage: kitchen
name: Staff Kitchenette
size:
- 8.0
@ -266,6 +281,7 @@ spaces:
# ---- SERVICE ----
me1:
usage: utility
name: Plant / Mechanical Room
size:
- 9.0
@ -280,6 +296,7 @@ spaces:
- c
dp1:
usage: utility
name: General Storage
size:
- 8.0
@ -296,6 +313,7 @@ spaces:
- re1
t9:
usage: toilet
name: Public WC
size:
- 4.0
@ -311,6 +329,7 @@ spaces:
count: 2
t10:
usage: toilet
name: Staff WC
size:
- 3.0

26
examples/maple-court/patterns.config
View file

@ -15,6 +15,7 @@
spaces:
# ---- GROUND FLOOR (level 0): community + service ----
lr1:
usage: living
name: Common Living Room
size:
- 80.0
@ -31,6 +32,7 @@ spaces:
- o
ef1:
usage: none
name: Entrance Foyer
size:
- 15.0
@ -43,6 +45,7 @@ spaces:
- c
da1:
usage: living
name: Dining Area
size:
- 60.0
@ -60,6 +63,7 @@ spaces:
- o
k1:
usage: kitchen
name: Kitchen
size:
- 30.0
@ -73,6 +77,7 @@ spaces:
- c
ws1:
usage: living
name: Workshop Space
size:
- 40.0
@ -89,6 +94,7 @@ spaces:
- o
la1:
usage: utility
name: Laundry Room
size:
- 20.0
@ -101,6 +107,7 @@ spaces:
- c
me1:
usage: utility
name: Mechanical/Electrical Room
size:
- 25.0
@ -113,6 +120,7 @@ spaces:
- c
ur1:
usage: utility
name: Ground Floor Storage
size:
- 22.0
@ -125,6 +133,7 @@ spaces:
- c
rc1:
usage: none
name: Reception Office
size:
- 14.0
@ -137,6 +146,7 @@ spaces:
- c
ph1:
usage: bedroom
name: Clinic Room
size:
- 18.0
@ -149,6 +159,7 @@ spaces:
- c
gh1:
usage: living
name: Greenhouse
size:
- 24.0
@ -163,6 +174,7 @@ spaces:
# Meeting rooms - anonymous interchangeable (3 total, ground floor)
m:
usage: living
name: Meeting Room
size:
- 10.0
@ -177,6 +189,7 @@ spaces:
# Ground-floor bathrooms (6 total)
t:
usage: toilet
name: Bathroom
size:
- 6.0
@ -191,6 +204,7 @@ spaces:
# ---- FIRST FLOOR (level 1): residents' shared + neighborhoods ----
li1:
usage: living
name: Library Corner
size:
- 20.0
@ -203,6 +217,7 @@ spaces:
- c
lo1:
usage: living
name: Lounge
size:
- 30.0
@ -220,6 +235,7 @@ spaces:
# Staff offices - anonymous (2 total)
em:
usage: bedroom
name: Staff Office
size:
- 12.5
@ -234,6 +250,7 @@ spaces:
# Sleeping neighborhoods - anonymous interchangeable (4 total)
n:
usage: bedroom
name: Neighborhood
size:
- 60.0
@ -250,6 +267,7 @@ spaces:
count: 4
ur2:
usage: utility
name: First Floor Storage
size:
- 18.0
@ -262,6 +280,7 @@ spaces:
- c
en1:
usage: living
name: TV / Media Room
size:
- 22.0
@ -275,6 +294,7 @@ spaces:
# Therapy rooms - anonymous (2 total)
py:
usage: bedroom
name: Therapy Room
size:
- 16.0
@ -290,6 +310,7 @@ spaces:
# ---- SECOND FLOOR (level 2): individual rooms + amenity ----
# Individual resident rooms - anonymous (12 total)
r:
usage: bedroom
name: Individual Room
size:
- 10.0
@ -303,6 +324,7 @@ spaces:
count: 12
gy1:
usage: living
name: Exercise Room
size:
- 28.0
@ -319,6 +341,7 @@ spaces:
- o
ut1:
usage: utility
name: Utilities Closet
size:
- 14.0
@ -331,6 +354,7 @@ spaces:
- c
ur3:
usage: utility
name: Second Floor Storage
size:
- 16.0
@ -344,6 +368,7 @@ spaces:
# Second-floor bathrooms (4 total)
tt:
usage: toilet
name: Upper Bathroom
size:
- 6.0
@ -357,6 +382,7 @@ spaces:
count: 4
q1:
usage: bedroom
name: Quiet Room
size:
- 12.0

6
examples/programme-house/patterns.config
View file

@ -8,6 +8,7 @@
# Building programme: 2-bedroom house with ensuite
spaces:
b1:
usage: bedroom
name: Master Bedroom
size:
- 16.0
@ -21,6 +22,7 @@ spaces:
adjacency:
- c
t1:
usage: toilet
name: Ensuite Bathroom
size:
- 5.0
@ -31,6 +33,7 @@ spaces:
adjacency:
- b1
b2:
usage: bedroom
name: Second Bedroom
size:
- 12.0
@ -41,6 +44,7 @@ spaces:
adjacency:
- c
t2:
usage: toilet
name: Guest Bathroom
size:
- 4.0
@ -48,6 +52,7 @@ spaces:
adjacency:
- c
l1:
usage: living
name: Living/Dining/Kitchen
size:
- 35.0
@ -62,6 +67,7 @@ spaces:
adjacency:
- c
t3:
usage: toilet
name: Ground Floor WC
size:
- 3.0

6
examples/programme-house2/patterns.config
View file

@ -12,6 +12,7 @@
# Building programme: 2-bedroom house with ensuite
spaces:
b1:
usage: bedroom
name: Master Bedroom
size:
- 16.0
@ -25,6 +26,7 @@ spaces:
adjacency:
- c
t1:
usage: toilet
name: Ensuite Bathroom
size:
- 5.0
@ -35,6 +37,7 @@ spaces:
adjacency:
- b1
b2:
usage: bedroom
name: Second Bedroom
size:
- 12.0
@ -45,6 +48,7 @@ spaces:
adjacency:
- c
t2:
usage: toilet
name: Guest Bathroom
size:
- 4.0
@ -52,6 +56,7 @@ spaces:
adjacency:
- c
l1:
usage: living
name: Living/Dining/Kitchen
size:
- 25.0
@ -65,6 +70,7 @@ spaces:
adjacency:
- c
t3:
usage: toilet
name: Ground Floor WC
size:
- 3.0

6
examples/y51-sweep-10/patterns.config
View file

@ -5,6 +5,7 @@
# parameters (storey limits, ratios, adjacency, room-type mix) unchanged.
spaces:
b1:
usage: bedroom
name: Master Bedroom
size:
- 16.0
@ -19,6 +20,7 @@ spaces:
- c
count: 2
t1:
usage: toilet
name: Ensuite Bathroom
size:
- 5.0
@ -30,6 +32,7 @@ spaces:
- b1
count: 2
b2:
usage: bedroom
name: Second Bedroom
size:
- 12.0
@ -41,6 +44,7 @@ spaces:
- c
count: 2
t2:
usage: toilet
name: Guest Bathroom
size:
- 4.0
@ -49,6 +53,7 @@ spaces:
- c
count: 2
l1:
usage: living
name: Living/Dining/Kitchen
size:
- 35.0
@ -63,6 +68,7 @@ spaces:
adjacency:
- c
t3:
usage: toilet
name: Ground Floor WC
size:
- 3.0

6
examples/y51-sweep-14/patterns.config
View file

@ -5,6 +5,7 @@
# parameters (storey limits, ratios, adjacency, room-type mix) unchanged.
spaces:
b1:
usage: bedroom
name: Master Bedroom
size:
- 16.0
@ -19,6 +20,7 @@ spaces:
- c
count: 3
t1:
usage: toilet
name: Ensuite Bathroom
size:
- 5.0
@ -30,6 +32,7 @@ spaces:
- b1
count: 3
b2:
usage: bedroom
name: Second Bedroom
size:
- 12.0
@ -41,6 +44,7 @@ spaces:
- c
count: 3
t2:
usage: toilet
name: Guest Bathroom
size:
- 4.0
@ -49,6 +53,7 @@ spaces:
- c
count: 3
l1:
usage: living
name: Living/Dining/Kitchen
size:
- 35.0
@ -63,6 +68,7 @@ spaces:
adjacency:
- c
t3:
usage: toilet
name: Ground Floor WC
size:
- 3.0

6
examples/y51-sweep-18/patterns.config
View file

@ -5,6 +5,7 @@
# parameters (storey limits, ratios, adjacency, room-type mix) unchanged.
spaces:
b1:
usage: bedroom
name: Master Bedroom
size:
- 16.0
@ -19,6 +20,7 @@ spaces:
- c
count: 4
t1:
usage: toilet
name: Ensuite Bathroom
size:
- 5.0
@ -30,6 +32,7 @@ spaces:
- b1
count: 4
b2:
usage: bedroom
name: Second Bedroom
size:
- 12.0
@ -41,6 +44,7 @@ spaces:
- c
count: 4
t2:
usage: toilet
name: Guest Bathroom
size:
- 4.0
@ -49,6 +53,7 @@ spaces:
- c
count: 4
l1:
usage: living
name: Living/Dining/Kitchen
size:
- 35.0
@ -63,6 +68,7 @@ spaces:
adjacency:
- c
t3:
usage: toilet
name: Ground Floor WC
size:
- 3.0

6
examples/y51-sweep-22/patterns.config
View file

@ -5,6 +5,7 @@
# parameters (storey limits, ratios, adjacency, room-type mix) unchanged.
spaces:
b1:
usage: bedroom
name: Master Bedroom
size:
- 16.0
@ -19,6 +20,7 @@ spaces:
- c
count: 5
t1:
usage: toilet
name: Ensuite Bathroom
size:
- 5.0
@ -30,6 +32,7 @@ spaces:
- b1
count: 5
b2:
usage: bedroom
name: Second Bedroom
size:
- 12.0
@ -41,6 +44,7 @@ spaces:
- c
count: 5
t2:
usage: toilet
name: Guest Bathroom
size:
- 4.0
@ -49,6 +53,7 @@ spaces:
- c
count: 5
l1:
usage: living
name: Living/Dining/Kitchen
size:
- 35.0
@ -63,6 +68,7 @@ spaces:
adjacency:
- c
t3:
usage: toilet
name: Ground Floor WC
size:
- 3.0

113
experiments/migrate_usage_key.py Normal file
View file

@ -0,0 +1,113 @@
"""Write the agreed `usage:` attribute into every corpus `patterns.config`.
One-shot migration for `homemaker-py-sel` (DESIGN.md §39.7). Reads the reviewed
assignments in ``usage_map_proposal.yaml`` and inserts a ``usage:`` line into
each space definition, in place, preserving comments and formatting (the file
is edited as text, not round-tripped through the YAML emitter, which would strip
every comment in the corpus).
Idempotent: a space that already declares ``usage:`` is left alone unless
``--force`` is given, in which case the existing value is rewritten.
Usage::
python experiments/migrate_usage_key.py --check # dry run, report only
python experiments/migrate_usage_key.py # apply
"""
from __future__ import annotations
import argparse
import re
import sys
from pathlib import Path
import yaml
PROPOSAL = Path(__file__).with_name("usage_map_proposal.yaml")
CORPUS = Path(__file__).resolve().parent.parent / "examples"
def load_assignments() -> dict[str, str]:
"""code -> usage, from the reviewed proposal (its top-level keys ARE the
usage classes; every other key in the file is a comment)."""
doc = yaml.safe_load(PROPOSAL.read_text()) or {}
out: dict[str, str] = {}
for usage, codes in doc.items():
for code in (codes or {}):
out[code] = usage
return out
def migrate(path: Path, assign: dict[str, str], check: bool,
force: bool) -> tuple[int, int, list[str]]:
"""Insert ``usage:`` as the first property of each space definition.
Returns ``(written, skipped, unknown_codes)``. Edits the file as text so the
corpus keeps its comments and layout.
"""
text = path.read_text()
spaces = (yaml.safe_load(text) or {}).get("spaces") or {}
space_key = re.compile(r"^ ([A-Za-z_][\w-]*):\s*$")
written = skipped = 0
unknown: list[str] = []
out: list[str] = []
for line in text.splitlines(keepends=True):
m = space_key.match(line)
code = m.group(1) if m and m.group(1) in spaces else None
# drop a pre-existing usage line when rewriting
if force and re.match(r"^ usage:\s", line):
continue
out.append(line)
if code is None:
continue
usage = assign.get(code)
if usage is None:
unknown.append(code)
elif "usage" in spaces[code] and not force:
skipped += 1
else:
out.append(f" usage: {usage}\n")
written += 1
if not check and written:
path.write_text("".join(out))
return written, skipped, unknown
def main() -> int:
ap = argparse.ArgumentParser(description=__doc__,
formatter_class=argparse.RawDescriptionHelpFormatter)
ap.add_argument("--check", action="store_true", help="dry run")
ap.add_argument("--force", action="store_true",
help="rewrite a usage: that is already present")
args = ap.parse_args()
assign = load_assignments()
print(f"{len(assign)} code -> usage assignments loaded from "
f"{PROPOSAL.name}\n")
total_unknown: list[tuple[str, str]] = []
for cfg in sorted(CORPUS.glob("*/patterns.config")):
written, skipped, unknown = migrate(cfg, assign, args.check, args.force)
total_unknown += [(cfg.parent.name, c) for c in unknown]
verb = "would write" if args.check else "wrote"
print(f" {cfg.parent.name:<20} {verb} {written:>3}, "
f"already present {skipped:>3}"
+ (f", UNKNOWN {unknown}" if unknown else ""))
if total_unknown:
print(f"\n{len(total_unknown)} code(s) have no assignment — "
"add them to the proposal first:", file=sys.stderr)
for d, c in total_unknown:
print(f" {d}: {c}", file=sys.stderr)
return 1
return 0
if __name__ == "__main__":
raise SystemExit(main())

53
src/homemaker_layout/fitness.py
View file

@ -28,6 +28,7 @@ import yaml
from . import dom as dom_mod
from . import geometry
from . import programme as _programme
from .dom import Node
FAIL_THRESHOLD = 0.1 # Urb::Dom::Fitness::Base
@ -295,9 +296,9 @@ def _generic_class(n: Node) -> str:
``""`` for a programme room (§39.4).
Replaces the old ``_t0(leaf)`` first-character dispatch in the quality terms
and value rate. ``_t0`` is still the right tool for the SEMANTIC prefixes
(``k`` kitchen, ``l`` living, …), which classify programme codes; this one
is for the generic structural types, which must match exactly. ``S`` (sahn)
and value rate. (``_t0`` itself is gone: the SEMANTIC prefixes it served —
``k`` kitchen, ``l`` living, … — became the declared ``usage:`` key in
§39.7, so no first-character test remains anywhere.) ``S`` (sahn)
belongs to both generic sets but takes the outside parameter families, so it
maps to ``"o"`` — exactly as ``get_space_params`` dispatches it.
"""
@ -308,11 +309,6 @@ def _generic_class(n: Node) -> str:
return ""
def _t0(n: Node) -> str:
"""First char of the type, lowercased ('' if untyped) — Urb's /^x/i tests."""
return n.type[0].lower() if n.type else ""
def _height(n: Node) -> float:
"""Floor-to-floor height of n's level; mirrors ``Urb::Quad::Height``."""
h = dom_mod._level_root(n).height
@ -406,6 +402,21 @@ class Fitness:
self._crinkliness_floor = float(
self.conf("crinkliness_floor") or 0.01)
def usages(self) -> dict[str, str]:
"""``{room code: usage}`` for this programme (homemaker-py-sel).
Keyed by CODE, never stamped on a leaf: a retype changes the code and
the usage follows automatically, exactly as size/width/adjacency do.
Generic ``C``/``O``/``S`` are absent — they are not programme rooms and
their behaviour comes from the generic type rule (§39.4).
"""
return {code: req.usage for code, req in (self._programme or {}).items()}
def usage_of(self, leaf: Node) -> str:
"""Access-requirement class of one leaf, ``""`` for a generic type."""
req = (self._programme or {}).get(leaf.type)
return req.usage if req else ""
# ------------------------------------------------------------------ #
# Type superposition + collapse (homemaker-py-9o5)
# ------------------------------------------------------------------ #
@ -899,8 +910,9 @@ class Fitness:
nbs = list(G.neighbors(lf))
if any(nb.type == "C" for nb in nbs):
continue # circulation neighbour keeps access invariant
usages = self.usages()
for nb in nbs:
if nb.type in room_codes and nb.type[0].lower() in ("l", "k"):
if usages.get(nb.type) in _programme.SOCIABLE_USAGES:
pins.add(id(nb))
break
return pins
@ -1169,11 +1181,12 @@ class Fitness:
def access(self, leaf: Node, G: nx.Graph) -> list[str]:
"""Useful circulation/access neighbour types; ``Urb::Dom::Access``."""
types = self.neighbour_types(leaf, G)
if _t0(leaf) == "k":
# "l" is the SEMANTIC living-room prefix (a programme code); C/S are
# generic circulation. Two different namespaces, two different tests.
if self.usage_of(leaf) == "kitchen":
# a kitchen is served by circulation OR by a living space (§39.7)
usages = self.usages()
return [t for t in types
if t in dom_mod.GENERIC_CIRCULATION or t[:1].lower() == "l"]
if t in dom_mod.GENERIC_CIRCULATION
or usages.get(t) == "living"]
if dom_mod.is_outside(leaf) or dom_mod.is_circulation(leaf):
return types
return [t for t in types if t in dom_mod.GENERIC_CIRCULATION]
@ -1554,9 +1567,9 @@ class Fitness:
if self._public_access(leaf, root) is None:
return False
for nb in G.neighbors(leaf):
# "l"/"k" are SEMANTIC programme-code prefixes; C is a generic
# circulation leaf. Two namespaces, two tests (§39.4).
if nb.type == "C" or (nb.type and nb.type[0].lower() in ("l", "k")):
# C is a generic circulation leaf; living/kitchen are DECLARED
# usages of programme rooms (§39.7). Two namespaces, two tests.
if nb.type == "C" or self.usage_of(nb) in _programme.SOCIABLE_USAGES:
return True
return False
@ -1860,7 +1873,7 @@ class Fitness:
self.preprocess_building(root)
_, graph_circ_pre = graph_mod.build_graphs_with_circ(
root, self.conf("door_width") or 1.2, failures.append
root, self.conf("door_width") or 1.2, failures.append, self.usages()
)
graph_base_pre = graph_mod.build_graphs(root, self.conf("door_width") or 1.2)
@ -1878,7 +1891,7 @@ class Fitness:
geometry.clear_cache() # mirror Perl Merge_Divided → Clean_Cache
_, graph_circ = graph_mod.build_graphs_with_circ(
root, self.conf("door_width") or 1.2, failures.append
root, self.conf("door_width") or 1.2, failures.append, self.usages()
)
graph_base = graph_mod.build_graphs(root, self.conf("door_width") or 1.2)
@ -1925,7 +1938,7 @@ class Fitness:
def _load_programme(self, conf: dict) -> None:
"""Populate ``_programme_cache`` from spaces section of conf dict."""
from .programme import SpaceReq, validate_codes
from .programme import SpaceReq, validate_codes, validate_usages
_DW = (4.0, 1.0)
_DP = (1.5, 0.5)
spaces = conf.get("spaces") or {}
@ -1937,6 +1950,7 @@ class Fitness:
# independently of programme._parse_spaces, so validating in only one
# of the two would leave the other door open.
validate_codes(spaces)
validate_usages(spaces)
reqs: dict = {}
for code, c in spaces.items():
sz = c.get("size") or [0.0, 1.0]
@ -1944,6 +1958,7 @@ class Fitness:
pr = c.get("proportion") or _DP
reqs[code] = SpaceReq(
code=code,
usage=c["usage"],
name=c.get("name", ""),
size=float(sz[0]),
size_sigma=float(sz[1]),

60
src/homemaker_layout/graph.py
View file

@ -26,6 +26,7 @@ import networkx as nx
from . import dom, geometry
from .dom import Node, is_generic, levels
from . import programme as _pr
from .programme import SpaceReq
DOOR_WIDTH = 1.2 # Urb::Dom::Fitness::Base default_params door_width
@ -50,6 +51,7 @@ def build_graphs_with_circ(
root: Node,
door_width: float,
fail,
usages: dict[str, str],
) -> tuple[list[nx.Graph], list[nx.Graph]]:
"""Build ``(graph_base, graph_circ)`` pairs; mirrors ``setup_storey_graphs``
in ``Base.pm:217-241``.
@ -69,7 +71,7 @@ def build_graphs_with_circ(
g = geometry.leaf_graph(lvl, door_width)
graph_base.append(g)
gc = g.copy()
if not has_circulation(gc):
if not has_circulation(gc, usages):
fail(f"{i} inaccessible usable space")
graph_circ.append(gc)
return graph_base, graph_circ
@ -93,9 +95,15 @@ def _avg_path_len_from(G: nx.Graph, node: Node) -> float:
return 0.0
def has_circulation(G: nx.Graph) -> bool:
def has_circulation(G: nx.Graph, usages: dict[str, str]) -> bool:
"""Port of ``Urb::Dom::Has_Circulation`` (modifies G in place).
``usages`` maps room code -> access-requirement class (homemaker-py-sel,
DESIGN.md §39.7); it decides which edges are trimmed. It used to be inferred
from a leaf type's first character, so `la1` "Laundry Room" was trimmed as a
living room and `tr1` "Treatment Room" as a toilet. Codes absent from the
map (the generic ``C``/``O``/``S``) have no usage and are never trimmed.
Replicates the Perl clone quirk: isolated vertices (degree 0) are removed
first since Perl's ``Graph::clone`` only copies vertices in edges. After
that, removes non-usable nodes, trims bedroom/toilet cross-connections, then
@ -110,40 +118,41 @@ def has_circulation(G: nx.Graph) -> bool:
non_usable = [v for v in list(G.nodes()) if not dom.is_usable(v)]
G.remove_nodes_from(non_usable)
# Remove b → [lkbt] edges (bedrooms only connect to circulation/outside)
def _usage(v: Node) -> str:
return usages.get(v.type, "")
# A TERMINAL room (bedroom/utility) is reachable from circulation or outside
# only — never a route through. Trim its edges to every other room.
for v in list(G.nodes()):
if not (v.type and v.type[0].lower() == "b"):
if _usage(v) not in _pr.PRIVATE_USAGES:
continue
to_remove = [
nb for nb in list(G.neighbors(v))
if nb.type and nb.type[0].lower() in ("l", "k", "b", "t")
]
to_remove = [nb for nb in list(G.neighbors(v))
if _usage(nb) in _pr.PRIVATE_STRIPS]
G.remove_edges_from((v, nb) for nb in to_remove)
# Remove t → [olkt] edges (toilets only connect to bedrooms/circulation)
# A toilet keeps its edge to a terminal room (the Brand adjacency, §39.6)
# and loses outside/living/kitchen/toilet.
for v in list(G.nodes()):
if not (v.type and v.type[0].lower() == "t"):
if _usage(v) != "toilet":
continue
to_remove = [
nb for nb in list(G.neighbors(v))
if (nb.type in dom.GENERIC_OUTSIDE
or (nb.type and nb.type[0].lower() in ("l", "k", "t")))
]
to_remove = [nb for nb in list(G.neighbors(v))
if nb.type in dom.GENERIC_OUTSIDE
or _usage(nb) in _pr.TOILET_STRIPS]
G.remove_edges_from((v, nb) for nb in to_remove)
# btlk nodes: keep only one circulation neighbour
# Any classified room keeps only one circulation neighbour.
for v in list(G.nodes()):
if not (v.type and v.type[0].lower() in ("b", "t", "l", "k")):
if _usage(v) not in _pr.PRIVATE_USAGES + ("toilet",) + _pr.SOCIABLE_USAGES:
continue
circ_nbs = [nb for nb in list(G.neighbors(v)) if dom.is_circulation(nb)]
if len(circ_nbs) <= 1:
continue
circ_nbs.sort(key=lambda nb: _avg_path_len_from(G, nb))
# b/t: keep least popular (last), remove most popular (first)
# l/k: keep most popular (first), remove least popular (last)
t0 = v.type[0].lower()
# terminal rooms and toilets keep their LEAST central circulation
# neighbour (privacy); sociable rooms keep their MOST central one.
sociable = _usage(v) in _pr.SOCIABLE_USAGES
while len(circ_nbs) > 1:
if t0 in ("b", "t"):
if not sociable:
G.remove_edge(v, circ_nbs.pop(0))
else:
G.remove_edge(v, circ_nbs.pop())
@ -155,9 +164,8 @@ def has_circulation(G: nx.Graph) -> bool:
# blkc nodes: keep only one outdoor neighbour per outdoor component
for v in list(G.nodes()):
# b/l/k are SEMANTIC programme-code prefixes; the fourth member is
# generic circulation, so it takes the generic test (§39.4).
if not ((v.type and v.type[0].lower() in ("b", "l", "k"))
# terminal rooms, sociable rooms, and generic circulation
if not (_usage(v) in _pr.PRIVATE_USAGES + _pr.SOCIABLE_USAGES
or dom.is_circulation(v)):
continue
out_nbs = [
@ -172,9 +180,9 @@ def has_circulation(G: nx.Graph) -> bool:
component_nbs = [nb for nb in out_nbs if nb in component]
if len(component_nbs) <= 1:
continue
t0 = v.type[0].lower()
terminal = _usage(v) in _pr.PRIVATE_USAGES
while len(component_nbs) > 1:
if t0 == "b":
if terminal:
nb = component_nbs.pop(0)
else:
nb = component_nbs.pop()

58
src/homemaker_layout/programme.py
View file

@ -22,6 +22,8 @@ _DEFAULT_PROPORTION = (1.5, 0.5)
class SpaceReq:
code: str
name: str = ""
# homemaker-py-sel: access-requirement class; mandatory in patterns.config.
usage: str = "none"
size: float = 0.0 # target floor area, m^2
size_sigma: float = 1.0
width: float = _DEFAULT_WIDTH[0]
@ -77,6 +79,32 @@ def _pair(d: dict, key: str, default: tuple[float, float]) -> tuple[float, float
# rule can resolve.
RESERVED_CODES = ("C", "O", "S")
# homemaker-py-sel (DESIGN.md §39.7) — the ACCESS-REQUIREMENT class of a room.
#
# Declared per space, mandatory, no fallback. This replaces the old
# first-character convention (b/t/l/k), under which a room silently inherited
# another room's connectivity rules from its spelling: `la1` "Laundry Room" was
# read as a living room, `tr1` "Treatment Room" as a toilet.
#
# The vocabulary is CONTROLLED because a value exists if and only if the engine
# treats it differently somewhere — config selects among behaviours, it cannot
# invent them. What a room is CALLED stays free text in ``name:``.
USAGES = ("living", "kitchen", "bedroom", "toilet", "utility", "none")
# Terminal rooms: reachable from circulation or outside, never a route through.
# ``utility`` shares ``bedroom``'s access requirements today; it is a separate
# value because it is a genuinely different use and because it gives
# ``derive_interchange_classes`` an axis to relax on (§39.7 note 1).
PRIVATE_USAGES = ("bedroom", "utility")
# What a terminal room's edges are stripped down to in ``graph.has_circulation``.
PRIVATE_STRIPS = ("living", "kitchen", "bedroom", "toilet", "utility")
# A toilet keeps its edge to a terminal room (the Brand adjacency, §39.6 note 2)
# and loses the rest.
TOILET_STRIPS = ("living", "kitchen", "toilet")
# Sociable rooms keep their MOST central circulation neighbour; terminal rooms
# and toilets keep their LEAST central one.
SOCIABLE_USAGES = ("living", "kitchen")
def validate_codes(codes) -> None:
"""Raise ``ValueError`` if a programme code IS a generic structural type.
@ -98,9 +126,38 @@ def validate_codes(codes) -> None:
)
def validate_usages(spaces: dict) -> None:
"""Every declared space must carry a known ``usage:``.
Missing or unrecognised is a load error naming the code, never a silent
default — a forgotten key would otherwise hand the room another room's
connectivity rules, which is the bug this key exists to remove.
"""
missing = sorted(c for c, spec in spaces.items()
if not (spec or {}).get("usage"))
if missing:
raise ValueError(
f"space(s) {missing} declare no `usage:`. Every room must state its "
f"access-requirement class, one of {USAGES}. This replaced the old "
"first-character convention, under which a room inherited another "
"room's connectivity rules from its spelling. See DESIGN.md §39.7 / "
"homemaker-py-sel."
)
unknown = sorted({(c, (spec or {})["usage"]) for c, spec in spaces.items()
if (spec or {})["usage"] not in USAGES})
if unknown:
raise ValueError(
f"unknown usage value(s) {unknown}; expected one of {USAGES}. The "
"vocabulary is closed on purpose: a usage exists only where the "
"engine treats it differently, so a new access class means new "
"code, not new config. What the room is CALLED belongs in `name:`."
)
def _parse_spaces(conf: dict) -> dict[str, SpaceReq]:
spaces = conf.get("spaces") or {}
validate_codes(spaces)
validate_usages(spaces)
out: dict[str, SpaceReq] = {}
for code, c in spaces.items():
size = _pair(c, "size", (0.0, 1.0))
@ -109,6 +166,7 @@ def _parse_spaces(conf: dict) -> dict[str, SpaceReq]:
out[code] = SpaceReq(
code=code,
name=c.get("name", ""),
usage=c["usage"],
size=size[0],
size_sigma=size[1],
width=width[0],

24
tests/_helpers.py Normal file
View file

@ -0,0 +1,24 @@
"""Shared helpers for the test suite."""
from __future__ import annotations
# The pre-§39.7 first-character convention, kept HERE and nowhere else so that
# synthetic fixtures keep exercising what they always did while the production
# code has no prefix rule left at all (homemaker-py-sel). Tests about a specific
# usage should state it explicitly rather than rely on this.
_LEGACY_PREFIX_USAGE = {"b": "bedroom", "t": "toilet", "l": "living", "k": "kitchen"}
def with_usage(spaces: dict) -> dict:
"""Fill in a mandatory ``usage:`` for a synthetic ``spaces`` fixture.
``usage`` is required in real ``patterns.config`` files, but most tests care
about size/width/collapse and not about access class. This supplies the class
the code's first letter used to imply, so those tests are unchanged by the
migration. An explicit ``usage`` in the fixture always wins.
"""
return {
code: {"usage": _LEGACY_PREFIX_USAGE.get(code[:1].lower(), "none"),
**(spec or {})}
for code, spec in spaces.items()
}

3
tests/test_collapse_global.py
View file

@ -7,6 +7,7 @@ Covers the contracts of Fitness.collapse_global / collapse_finish:
- no-op safety (no programme) and the keep-better wrapper
"""
from _helpers import with_usage
from homemaker_layout import geometry
from homemaker_layout.dom import Node, _link_subtree
from homemaker_layout.fitness import Fitness
@ -24,7 +25,7 @@ def _two_leaf_root(t_left: str, t_right: str, side: float = 6.0, div: float = 0.
def _conf(spaces, **extra):
return {"spaces": spaces, **extra}
return {"spaces": with_usage(spaces), **extra}
# --------------------------------------------------------------------------- #

5
tests/test_collapse_insearch.py
View file

@ -17,6 +17,7 @@ from unittest.mock import patch
import pytest
from _helpers import with_usage
from homemaker_layout import dom as dom_mod
from homemaker_layout.dom import Node, _link_subtree
from homemaker_layout.fitness import Fitness, load_config
@ -69,7 +70,7 @@ def test_collapse_insearch_iters_knob():
def test_evaluate_full_calls_collapse_global_when_on():
fit = Fitness(conf={"collapse_insearch": True, "collapse_insearch_iters": 2,
"spaces": {"b1": {"size": [16.0, 4.0], "count": 2}}})
"spaces": with_usage({"b1": {"size": [16.0, 4.0], "count": 2}})})
root = _two_leaf_root("b1", "b1")
with patch.object(Fitness, "collapse_global", wraps=fit.collapse_global) as m:
fit.score_with_fails(root)
@ -82,7 +83,7 @@ def test_evaluate_full_calls_collapse_global_when_on():
def test_evaluate_full_does_not_call_collapse_global_when_off():
fit = Fitness(conf={"spaces": {"b1": {"size": [16.0, 4.0], "count": 2}}})
fit = Fitness(conf={"spaces": with_usage({"b1": {"size": [16.0, 4.0], "count": 2}})})
root = _two_leaf_root("b1", "b1")
with patch.object(Fitness, "collapse_global", wraps=fit.collapse_global) as m:
fit.score_with_fails(root)

4
tests/test_dom_corpus.py
View file

@ -91,7 +91,7 @@ def _native_evaluate(src: Path):
check_f, missing = graph_mod.check_space_counts(root, programme)
failures.extend(check_f)
fit.preprocess_building(root)
_, gcpre = graph_mod.build_graphs_with_circ(root, fit.conf("door_width") or 1.2, failures.append)
_, gcpre = graph_mod.build_graphs_with_circ(root, fit.conf("door_width") or 1.2, failures.append, fit.usages())
gbpre = graph_mod.build_graphs(root, fit.conf("door_width") or 1.2)
failures.extend(graph_mod.check_adjacency(root, programme, gbpre, missing))
failures.extend(graph_mod.check_level_constraints(root, programme, missing))
@ -99,7 +99,7 @@ def _native_evaluate(src: Path):
dom.merge_divided(root)
geometry.clear_cache()
_, gc = graph_mod.build_graphs_with_circ(root, fit.conf("door_width") or 1.2, failures.append)
_, gc = graph_mod.build_graphs_with_circ(root, fit.conf("door_width") or 1.2, failures.append, fit.usages())
gb = graph_mod.build_graphs(root, fit.conf("door_width") or 1.2)
cost_v = fit.plot_cost(root)

11
tests/test_fitness.py
View file

@ -2,6 +2,7 @@
import pytest
from _helpers import with_usage
from homemaker_layout import dom, geometry
from homemaker_layout.dom import Node
from homemaker_layout.fitness import (
@ -101,7 +102,7 @@ def test_get_space_params_inside_falls_back_to_inside_defaults():
def test_get_space_params_named_space_overrides_default():
f = Fitness(conf={"spaces": {"k1": {"size": [20.0, 4.0]}}})
f = Fitness(conf={"spaces": with_usage({"k1": {"size": [20.0, 4.0]}})})
assert f.get_space_params("k1", "size") == [20.0, 4.0]
@ -348,14 +349,14 @@ def test_load_config_overrides_merge_last(tmp_path):
from homemaker_layout.fitness import load_config
(tmp_path / "patterns.config").write_text(
yaml.safe_dump({"spaces": {"b": {"size": [12.0, 1.0]}}}))
yaml.safe_dump({"spaces": with_usage({"b": {"size": [12.0, 1.0]}})}))
conf, _ = load_config(tmp_path)
assert "leaf_sharing" not in conf # absent on disk
conf2, _ = load_config(tmp_path, overrides={"leaf_sharing": True})
assert conf2["leaf_sharing"] is True
assert conf2["spaces"]["b"] == {"size": [12.0, 1.0]} # disk content preserved
assert conf2["spaces"]["b"] == with_usage({"b": {"size": [12.0, 1.0]}})["b"]
# None / empty overrides are a no-op (default-OFF parity).
assert "leaf_sharing" not in load_config(tmp_path, overrides=None)[0]
@ -370,10 +371,10 @@ def test_programme_parses_per_code_share(tmp_path):
from homemaker_layout.programme import load_programme
p = tmp_path / "patterns.config"
p.write_text(yaml.safe_dump({"spaces": {
p.write_text(yaml.safe_dump({"spaces": with_usage({
"b": {"size": [12.0, 1.0], "share": 3},
"k": {"size": [20.0, 1.0]}, # no share key
}}))
})}))
reqs = load_programme(str(p))
assert reqs["b"].share == 3 and reqs["b"].has_share is True
assert reqs["k"].share == 1 and reqs["k"].has_share is False

11
tests/test_multi_use.py
View file

@ -15,6 +15,7 @@ from pathlib import Path
import numpy as np
import pytest
from _helpers import with_usage
from homemaker_layout import dom, geometry, graph, operators, programme
from homemaker_layout.dom import Node, _link_subtree
from homemaker_layout.fitness import Fitness, gaussian
@ -117,10 +118,10 @@ def test_undeclared_pair_is_never_valid_even_if_interchangeable():
def test_co_locate_parsed_from_config():
conf = {"spaces": {
conf = {"spaces": with_usage({
"den": {"size": [9.0, 1.0], "co_locate": ["guest"]},
"guest": {"size": [12.0, 1.0]},
}}
})}
reqs = programme._parse_spaces(conf)
assert reqs["den"].co_locate == ["guest"]
assert reqs["guest"].co_locate == []
@ -255,7 +256,7 @@ def _multi_use_conf(pair=True):
}
if pair:
spaces["x"]["co_locate"] = ["y"]
return {"multi_use": True, "spaces": spaces}
return {"multi_use": True, "spaces": with_usage(spaces)}
def test_quality_size_combines_both_codes_area_additively():
@ -341,14 +342,14 @@ def test_load_config_multi_use_override_merges_last(tmp_path):
from homemaker_layout.fitness import load_config
(tmp_path / "patterns.config").write_text(
yaml.safe_dump({"spaces": {"x": {"size": [10.0, 1.0]}}}))
yaml.safe_dump({"spaces": with_usage({"x": {"size": [10.0, 1.0]}})}))
conf, _ = load_config(tmp_path)
assert "multi_use" not in conf
conf2, _ = load_config(tmp_path, overrides={"multi_use": True})
assert conf2["multi_use"] is True
assert conf2["spaces"]["x"] == {"size": [10.0, 1.0]}
assert conf2["spaces"]["x"] == with_usage({"x": {"size": [10.0, 1.0]}})["x"]
# --------------------------------------------------------------------------- #

58
tests/test_programme.py
View file

@ -39,7 +39,8 @@ def test_colliding_code_is_a_full_requirement_not_a_generic():
"""The §39.2 damage in one assertion: a c-prefixed code must keep its
declared targets and stay in the required set."""
conf = {"spaces": {"cr1": {"size": [80.0, 10.0], "width": [6.0, 1.5],
"proportion": [2.0, 0.5], "count": 1}}}
"proportion": [2.0, 0.5], "count": 1,
"usage": "living"}}}
fit = fitness.Fitness(conf=conf)
assert fit.get_space_params("cr1", "size") == [80.0, 10.0]
assert fit.get_space_params("cr1", "width") == [6.0, 1.5]
@ -52,14 +53,57 @@ def test_colliding_code_is_a_full_requirement_not_a_generic():
assert dom.is_outside(dom.Node(type="S")) and dom.is_circulation(dom.Node(type="S"))
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."""
def test_a_codes_first_letter_no_longer_decides_anything():
"""§39.7: usage is DECLARED, so a code's spelling carries no meaning at all.
`b1` was a bedroom purely because it started with "b"; here it declares
`utility` and that is what it is. This is the property the old prefix
convention could not offer, and the reason `la1` "Laundry Room" was being
trimmed as a living room.
"""
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]},
"l1": {"size": [20.0, 4.0], "usage": "utility"},
"k1": {"size": [12.0, 3.0], "usage": "none"},
"b1": {"size": [16.0, 4.0], "usage": "utility"},
"zzz": {"size": [3.0, 1.0], "usage": "bedroom"},
}})
assert sorted(reqs) == ["b1", "k1", "l1", "t1"]
assert reqs["l1"].usage == "utility"
assert reqs["k1"].usage == "none"
assert reqs["b1"].usage == "utility"
assert reqs["zzz"].usage == "bedroom"
def test_usage_is_mandatory_and_reported_by_code():
with pytest.raises(ValueError, match=r"declare no .usage.*\['b1'\]|\['b1'\].*declare no"):
programme._parse_spaces({"spaces": {"b1": {"size": [16.0, 4.0]}}})
def test_unknown_usage_is_rejected_not_silently_ignored():
with pytest.raises(ValueError, match="unknown usage value"):
programme._parse_spaces(
{"spaces": {"b1": {"size": [16.0, 4.0], "usage": "craft"}}})
def test_usage_is_rejected_by_both_parse_paths():
"""Fitness parses conf["spaces"] independently of programme._parse_spaces."""
conf = {"spaces": {"b1": {"size": [16.0, 4.0]}}}
with pytest.raises(ValueError, match="declare no"):
programme._parse_spaces(conf)
with pytest.raises(ValueError, match="declare no"):
fitness.Fitness(conf=conf)
def test_usage_survives_a_retype_because_it_is_code_level():
"""The mutation-safety property: usage is looked up from the CODE, so a
retype changes the class automatically and nothing can go stale."""
fit = fitness.Fitness(conf={"spaces": {
"b1": {"size": [16.0, 4.0], "usage": "bedroom"},
"s9": {"size": [16.0, 4.0], "usage": "utility"},
}})
leaf = dom.Node(type="b1")
assert fit.usage_of(leaf) == "bedroom"
leaf.type = "s9" # exactly what mutate_retype does
assert fit.usage_of(leaf) == "utility"
def test_corpus_programmes_are_namespace_clean():

11
tests/test_superposition.py
View file

@ -10,6 +10,7 @@ plus the default-OFF guarantee.
import pytest
from _helpers import with_usage
from homemaker_layout import dom, geometry, programme
from homemaker_layout.dom import Node, _link_subtree
from homemaker_layout.fitness import Fitness
@ -120,10 +121,10 @@ def test_interchange_veto_breaks_transitive_chain():
def test_interchange_veto_parsed_from_config():
conf = {"spaces": {
conf = {"spaces": with_usage({
"den": {"size": [9.0, 1.0]},
"guest": {"size": [12.0, 1.0], "interchange": False},
}}
})}
reqs = programme._parse_spaces(conf)
assert reqs["den"].interchange is True
assert reqs["guest"].interchange is False
@ -202,12 +203,12 @@ def _two_leaf_root(t_left: str, t_right: str, side: float = 6.0, div: float = 0.
def _bedroom_conf(superpose=True):
return {
"superpose": superpose,
"spaces": {
"spaces": with_usage({
"b1": {"size": [16.0, 4.0], "width": [4.0, 1.0],
"proportion": [1.5, 0.5], "count": 1},
"b2": {"size": [12.0, 3.0], "width": [3.5, 0.8],
"proportion": [1.5, 0.5], "count": 1},
},
}),
}
@ -230,7 +231,7 @@ def test_collapse_relabels_to_demand_set():
def test_collapse_is_noop_without_a_class():
# only one real code -> no interchange class -> collapse must not touch types
conf = {"superpose": True,
"spaces": {"b1": {"size": [16.0, 4.0], "count": 2}}}
"spaces": with_usage({"b1": {"size": [16.0, 4.0], "count": 2}})}
fit = Fitness(conf=conf)
root = _two_leaf_root("b1", "b1")
fit.collapse_superposition(root)