Owner's ruling, and it corrects the design not just the classification: the daylight requirement is already defined in the crinkliness. The gaussian's compact side IS "too little exposed wall per unit floor"; its exposed side is envelope cost. 38.9's proposed daylight: axis was redundant, and keying it off usage: was worse than redundant. What was actually missing: crinkliness is the only leaf quality factor with no per-space target. size, width and proportion are all declared by the space; crinkliness was one global number for every room in every building. crinkliness: none -> no minimum-exposure requirement, may be buried crinkliness: [t, s] -> this space's own target key absent -> the global uncrinkliness target, as today `none` clips the factor on the compact side, it does not switch it off: over-exposure is still penalised, because a crinkly leaf costs envelope whatever it holds. A store may be buried; a store may not be a starfish. The mechanism is backward compatible -- an absent key resolves to the global target, so shipping it changes no score. Behaviour changes only where a config declares something, which keeps the objective change visible per programme in config rather than hidden in a default. Owner's classification: everything a person occupies wants a window, WCs and reception/waiting/foyer included; only stores, plant, records and laundry do not. migrate_crinkliness_key.py declared crinkliness: none on 18 corpus spaces. Crinkliness fails 271 -> 243, of which not-defects 136 (50%) -> 108 (44%); the 28 that went are exactly the utility fails. usage_daylight and needs_daylight are removed as mis-keyed, and DAYLIGHT_USAGES with them -- a vocabulary value should exist only where the engine treats it differently. The historical crinkliness_mode modes stay, default off, so 38.6/38.8 remain reproducible. uncrinkliness_circulation is now settable to none like any space, but its default is left unchanged pending a ruling: corridors were not among the groups ruled on and are 63% of the remaining phantom fails. Lint at parity (46); tests 364 passed, same 7 pre-existing fixture failures. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MJ84Feep79Hhm3E4zZJmnB
500 lines
21 KiB
Python
500 lines
21 KiB
Python
"""Parse a ``patterns.config`` programme into per-code space requirements.
|
|
|
|
Only the ``spaces:`` section is read here. The generic structural types
|
|
(``C``/``O``/``S``) carry no explicit targets and are left unconstrained by the
|
|
solver (they absorb slack); they are never declared in ``spaces:``.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass, field
|
|
|
|
import yaml
|
|
|
|
from .dom import GENERIC_TYPES, is_generic
|
|
|
|
# Urb::Dom::Fitness defaults for optional params (ProgrammeDriven.default_params).
|
|
_DEFAULT_WIDTH = (4.0, 1.0)
|
|
_DEFAULT_PROPORTION = (1.5, 0.5)
|
|
|
|
|
|
@dataclass
|
|
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]
|
|
width_sigma: float = _DEFAULT_WIDTH[1]
|
|
proportion: float = _DEFAULT_PROPORTION[0] # max length/width ratio
|
|
proportion_sigma: float = _DEFAULT_PROPORTION[1]
|
|
# homemaker-py-ssz (DESIGN.md §38.10) — this space's own crinkliness target,
|
|
# i.e. how much exposed wall it wants per unit floor area. The COMPACT side
|
|
# of this gaussian IS the daylight requirement; there is no separate
|
|
# daylight attribute. Three states, matching how the key appears in
|
|
# patterns.config:
|
|
#
|
|
# key absent -> `crinkliness` is None and `has_crinkliness` False:
|
|
# fall back to the global `uncrinkliness` target
|
|
# `crinkliness: none` (or a YAML null)
|
|
# -> `crinkliness` is None and `has_crinkliness` True:
|
|
# NO minimum-exposure requirement. A store or a records
|
|
# room may be fully buried. Over-exposure is still
|
|
# penalised -- a crinkly leaf costs envelope whatever
|
|
# it holds -- so the factor is clipped, not switched off.
|
|
# `crinkliness: [t, s]`
|
|
# -> that gaussian, as size/width/proportion work.
|
|
crinkliness: float | None = None
|
|
crinkliness_sigma: float | None = None
|
|
adjacency: list[str] = field(default_factory=list)
|
|
level: int | None = None
|
|
requires_below: str | None = None
|
|
count: int = 1
|
|
# erc.3 §13.3 leaf-sharing grain (homemaker-py-x3b): how many rooms of this
|
|
# code may collapse into one shared leaf. Default 1 = not shareable. Under the
|
|
# global ``leaf_share_factor`` selector an explicit value overrides the global
|
|
# grain (share:1 opts a code OUT, share:N>=2 sets that code's grain to N).
|
|
share: int = 1
|
|
# 9o5 §7.5 veto hatch (homemaker-py-b3v): opt a code OUT of interchange-class
|
|
# derivation. Default True = eligible. Set ``interchange: false`` in
|
|
# patterns.config to let the architect suppress a harmful auto-derived
|
|
# grouping (e.g. harbor-house's transitive 8-code chain) without disabling
|
|
# superposition globally.
|
|
interchange: bool = True
|
|
# 1s3 §26 path b: codes this one may permanently co-locate on (fuse onto)
|
|
# one leaf with. Explicit, architect-declared (unlike the auto-derived
|
|
# interchange classes above) — a pair is only ever honoured if it *also*
|
|
# passes interchangeable()'s S1-S4 bounds (see derive_colocate_pairs).
|
|
co_locate: list[str] = field(default_factory=list)
|
|
# Whether each quality param was explicitly in the config (not a default)
|
|
has_size: bool = False
|
|
has_width: bool = False
|
|
has_proportion: bool = False
|
|
has_share: bool = False
|
|
has_crinkliness: bool = False
|
|
|
|
|
|
def _pair(d: dict, key: str, default: tuple[float, float]) -> tuple[float, float]:
|
|
v = d.get(key)
|
|
if v is None:
|
|
return default
|
|
return float(v[0]), float(v[1])
|
|
|
|
|
|
def _optional_pair(d: dict, key: str) -> tuple[float | None, float | None]:
|
|
"""A pair that may be explicitly declared absent.
|
|
|
|
Returns ``(None, None)`` both when the key is missing and when it is
|
|
present but null/``none``; the caller distinguishes the two by ``key in d``.
|
|
"""
|
|
if key not in d:
|
|
return None, None
|
|
v = d[key]
|
|
if v is None or (isinstance(v, str) and v.strip().lower() == "none"):
|
|
return None, None
|
|
return float(v[0]), float(v[1])
|
|
|
|
|
|
# homemaker-py-ju3 (DESIGN.md §39.4): Urb has exactly three GENERIC structural
|
|
# types — ``C`` circulation, ``O`` outside, ``S`` sahn — which are the leaves the
|
|
# SEARCH creates, canonically uppercase. Programme room codes are a separate,
|
|
# lowercase namespace.
|
|
#
|
|
# These used to overlap: every generic test matched ``type[0].lower()``, a
|
|
# case-insensitive PREFIX, so a programme code beginning with c/o/s was silently
|
|
# reinterpreted as a generic type (harbor-house's ``cr1`` "Common Room with
|
|
# Fireplace" was read as circulation, and 14% of the programme became optional).
|
|
# That is fixed at the source — see the GENERIC_* note in ``dom.py`` — so a room
|
|
# code may now start with ANY letter. The only remaining collision is a code
|
|
# spelled EXACTLY like a generic type, which is a genuine ambiguity no matching
|
|
# 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")
|
|
# There is deliberately NO daylight vocabulary here. Daylight is not a separate
|
|
# axis: the COMPACT side of the crinkliness gaussian -- too little exposed wall
|
|
# per unit floor -- IS the daylight requirement, so a space states it in its own
|
|
# `crinkliness:` target like it states `size:` or `width:` (DESIGN.md §38.10).
|
|
# An earlier attempt keyed daylight off `usage:` instead; that was wrong, since
|
|
# `usage:` is an ACCESS class and the two questions come apart (a waiting room
|
|
# has no special access requirement and very much wants a window). See §38.9.
|
|
|
|
|
|
def validate_codes(codes) -> None:
|
|
"""Raise ``ValueError`` if a programme code IS a generic structural type.
|
|
|
|
Only exact matches are rejected. Codes merely *starting* with c/o/s are fine
|
|
(§39.4) — that used to be the bug, not the rule. Called from both parse paths
|
|
(``_parse_spaces`` and ``fitness.Fitness._load_programme``), which read
|
|
``conf["spaces"]`` independently.
|
|
"""
|
|
bad = sorted(c for c in codes if c in RESERVED_CODES)
|
|
if not bad:
|
|
return
|
|
raise ValueError(
|
|
f"programme code(s) {bad} are Urb's generic structural types "
|
|
f"{RESERVED_CODES} (C=circulation, O=outside, S=sahn). These name the "
|
|
"leaves the search itself creates, so a programme room cannot also be "
|
|
"called one. Rename the room code (the name: field is free text and "
|
|
"need not change). See DESIGN.md §39.4 / homemaker-py-ju3."
|
|
)
|
|
|
|
|
|
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))
|
|
width = _pair(c, "width", _DEFAULT_WIDTH)
|
|
prop = _pair(c, "proportion", _DEFAULT_PROPORTION)
|
|
crink = _optional_pair(c, "crinkliness")
|
|
out[code] = SpaceReq(
|
|
code=code,
|
|
name=c.get("name", ""),
|
|
usage=c["usage"],
|
|
size=size[0],
|
|
size_sigma=size[1],
|
|
width=width[0],
|
|
width_sigma=width[1],
|
|
proportion=prop[0],
|
|
proportion_sigma=prop[1],
|
|
crinkliness=crink[0],
|
|
crinkliness_sigma=crink[1],
|
|
adjacency=list(c.get("adjacency") or []),
|
|
level=c.get("level"),
|
|
requires_below=c.get("requires_below"),
|
|
count=int(c.get("count") or 1),
|
|
share=int(c.get("share") or 1),
|
|
interchange=bool(c.get("interchange", True)),
|
|
co_locate=list(c.get("co_locate") or []),
|
|
has_size="size" in c,
|
|
has_width="width" in c,
|
|
has_proportion="proportion" in c,
|
|
has_share="share" in c,
|
|
has_crinkliness="crinkliness" in c,
|
|
)
|
|
return out
|
|
|
|
|
|
def load_programme(path: str) -> dict[str, SpaceReq]:
|
|
with open(path) as fh:
|
|
conf = yaml.safe_load(fh)
|
|
return _parse_spaces(conf)
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# Interchange equivalence classes (homemaker-py-9o5, type superposition)
|
|
# --------------------------------------------------------------------------- #
|
|
#
|
|
# A maximal group of codes whose leaf requirements are SIMILAR enough that one
|
|
# leaf is genuinely substitutable for any in-class usage. Derived as a pure
|
|
# function of the parsed programme (no hand-authored list on the happy path).
|
|
# Used by the superposition+collapse search relaxation: a leaf typed to any
|
|
# in-class code is left uncommitted during search and re-assigned to its best
|
|
# in-class usage at scoring time (fitness.collapse_superposition).
|
|
#
|
|
# Thresholds are LOCKED defaults (Bruno 2026-06-29); conservative on purpose —
|
|
# a missed grouping is cheap, a wrong one corrupts the relaxation.
|
|
R_SIZE = 1.5 # larger area target <= 1.5x smaller
|
|
R_WIDTH = 1.3 # clear-width targets vary less than areas; tighter band
|
|
R_PROP = 1.5 # max length/width aspect targets within 1.5x
|
|
CLASS_CAP = 4 # brute-force collapse <= C! assignments; beyond this use Hungarian
|
|
|
|
|
|
def _ratio(x: float, y: float) -> float:
|
|
"""max/min of two positive magnitudes (inf if either is non-positive)."""
|
|
lo, hi = min(abs(x), abs(y)), max(abs(x), abs(y))
|
|
return hi / lo if lo > 0 else float("inf")
|
|
|
|
|
|
def interchangeable(a: SpaceReq, b: SpaceReq) -> bool:
|
|
"""True iff codes ``a`` and ``b`` satisfy the S1-S4 interchange relation
|
|
(homemaker-py-9o5 §2). Symmetric."""
|
|
# S0 — architect veto (homemaker-py-b3v): either code opted out.
|
|
if not a.interchange or not b.interchange:
|
|
return False
|
|
# S1 — both sized; generic circulation/outside never participate.
|
|
if not (a.has_size and b.has_size) or a.size <= 0 or b.size <= 0:
|
|
return False
|
|
if is_generic(a.code) or is_generic(b.code):
|
|
return False
|
|
# S2 — requirement similarity within bounded ratios (ALL three).
|
|
if _ratio(a.size, b.size) > R_SIZE:
|
|
return False
|
|
if _ratio(a.width, b.width) > R_WIDTH:
|
|
return False
|
|
if _ratio(a.proportion, b.proportion) > R_PROP:
|
|
return False
|
|
# S3 — compatible level (equal or one None) and matching service stack.
|
|
if a.level is not None and b.level is not None and a.level != b.level:
|
|
return False
|
|
if (a.requires_below or None) != (b.requires_below or None):
|
|
return False
|
|
# S4 — no direct adjacency edge (an adjacency pair are coexisting rooms).
|
|
if b.code in a.adjacency or a.code in b.adjacency:
|
|
return False
|
|
return True
|
|
|
|
|
|
def derive_interchange_classes(reqs: dict[str, SpaceReq]) -> list[frozenset[str]]:
|
|
"""Connected components of the interchange relation, size >= 2
|
|
(homemaker-py-9o5 §2). Each class is a set of mutually-substitutable codes.
|
|
"""
|
|
codes = [
|
|
c for c, r in reqs.items()
|
|
if r.interchange
|
|
and r.has_size and r.size > 0 and c[0].lower() not in ("c", "o", "s")
|
|
]
|
|
edges: dict[str, set[str]] = {c: set() for c in codes}
|
|
for i, a in enumerate(codes):
|
|
for b in codes[i + 1:]:
|
|
if interchangeable(reqs[a], reqs[b]):
|
|
edges[a].add(b)
|
|
edges[b].add(a)
|
|
|
|
seen: set[str] = set()
|
|
classes: list[frozenset[str]] = []
|
|
for c in codes:
|
|
if c in seen:
|
|
continue
|
|
comp: set[str] = set()
|
|
stack = [c]
|
|
while stack:
|
|
x = stack.pop()
|
|
if x in comp:
|
|
continue
|
|
comp.add(x)
|
|
seen.add(x)
|
|
stack.extend(edges[x] - comp)
|
|
if len(comp) >= 2:
|
|
classes.append(frozenset(comp))
|
|
return classes
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# Co-location pairs (homemaker-py-1s3, §26 path b: permanent multi-use leaves)
|
|
# --------------------------------------------------------------------------- #
|
|
#
|
|
# Unlike interchange classes (auto-derived, soft substitution), fusing two
|
|
# codes onto one permanent leaf is architect-declared per-code (``co_locate``)
|
|
# — but a declared pair is only ever honoured if it ALSO passes the existing
|
|
# interchangeable() S1-S4 relation. This reuses the already-validated bounds
|
|
# (size/width/proportion similarity, compatible level/service stack, no direct
|
|
# adjacency edge) instead of inventing a second relation, and — because pairs
|
|
# are kept individually rather than folded into connected components — sidesteps
|
|
# the b3v transitive-chain failure mode (a nonsensical A-C fusion can never be
|
|
# smuggled in via a declared A-B, B-C chain the way interchange classes could).
|
|
|
|
def derive_colocate_pairs(reqs: dict[str, SpaceReq]) -> list[frozenset[str]]:
|
|
"""Valid co-location pairs: architect-declared AND interchangeable().
|
|
|
|
A code may declare ``co_locate: [other_code, ...]``; declaration is
|
|
symmetric (either side declaring is sufficient). Returns one frozenset per
|
|
valid pair (size always 2); an entry with no interchangeable() partner is
|
|
silently dropped, never merged into a larger group.
|
|
"""
|
|
pairs: list[frozenset[str]] = []
|
|
seen: set[frozenset[str]] = set()
|
|
for code, req in reqs.items():
|
|
for other in req.co_locate:
|
|
if other not in reqs or other == code:
|
|
continue
|
|
key = frozenset((code, other))
|
|
if key in seen:
|
|
continue
|
|
seen.add(key)
|
|
if interchangeable(reqs[code], reqs[other]):
|
|
pairs.append(key)
|
|
return pairs
|
|
|
|
|
|
def n_storeys_required(reqs: dict[str, SpaceReq]) -> int:
|
|
"""Number of storeys the programme implies, from the highest ``level:`` key.
|
|
|
|
Level-free rooms (no ``level``) do not force extra storeys — they are
|
|
distributed across whatever storeys the level-constrained rooms require.
|
|
"""
|
|
levels = [r.level for r in reqs.values() if r.level is not None]
|
|
return (max(levels) + 1) if levels else 1
|
|
|
|
|
|
def partition_rooms_by_storey(
|
|
reqs: dict[str, SpaceReq], n_storeys: int, rng,
|
|
) -> list[dict[str, int]]:
|
|
"""Per-storey required-room multisets (DESIGN.md §11.3 staging).
|
|
|
|
Level-constrained rooms land on their required storey; level-free rooms are
|
|
distributed round-robin over a shuffled order across all storeys. Generic
|
|
circulation/outside/sahn codes are excluded (they are added per storey at
|
|
construction time). Mirrors the inline partition in
|
|
``operators.constructive_topology`` so Stage 1 (base) and Stage 2 (upper
|
|
deltas) draw from one consistent partition.
|
|
|
|
Returns a list of length ``n_storeys``; each entry maps room code -> count.
|
|
"""
|
|
buckets: list[dict[str, int]] = [{} for _ in range(n_storeys)]
|
|
|
|
def _add(li: int, code: str) -> None:
|
|
buckets[li][code] = buckets[li].get(code, 0) + 1
|
|
|
|
free: list[str] = []
|
|
for code, req in reqs.items():
|
|
if is_generic(code):
|
|
continue
|
|
for _ in range(req.count):
|
|
if req.level is not None and req.level < n_storeys:
|
|
_add(req.level, code)
|
|
else:
|
|
free.append(code)
|
|
free = [free[i] for i in rng.permutation(len(free))]
|
|
for i, code in enumerate(free):
|
|
_add(i % n_storeys, code)
|
|
return buckets
|
|
|
|
|
|
def write_stage1_programme(
|
|
full_dir: str | Path, out_dir: str | Path, base_codes: dict[str, int],
|
|
) -> Path:
|
|
"""Derive a single-storey base-floor programme (DESIGN.md §11.3 Stage 1).
|
|
|
|
Filters the full merged ``patterns.config`` down to the rooms assigned to the
|
|
base floor (``base_codes``: code -> count), drops their ``level:`` keys,
|
|
prunes each kept space's ``adjacency`` to references that survive (retained
|
|
codes or generic c/o/s), and forces single-storey building constraints. The
|
|
result is written as a *self-contained* ``patterns.config`` in ``out_dir`` so
|
|
``fitness.load_config``'s parent-dir merge contributes nothing — keep
|
|
``out_dir`` outside the corpus tree (e.g. a tempdir).
|
|
|
|
Returns ``out_dir`` as a ``Path``.
|
|
"""
|
|
from pathlib import Path as _Path
|
|
|
|
from . import fitness as _fit
|
|
|
|
out_dir = _Path(out_dir)
|
|
out_dir.mkdir(parents=True, exist_ok=True)
|
|
conf, _cost = _fit.load_config(full_dir)
|
|
|
|
keep = set(base_codes)
|
|
src_spaces = conf.get("spaces") or {}
|
|
new_spaces: dict = {}
|
|
for code, count in base_codes.items():
|
|
if code not in src_spaces:
|
|
continue
|
|
spec = dict(src_spaces[code])
|
|
spec.pop("level", None)
|
|
spec["count"] = count
|
|
adj = spec.get("adjacency")
|
|
if adj is not None:
|
|
spec["adjacency"] = [
|
|
# generic adjacency references (lowercase "c"/"o"/"s" in
|
|
# patterns.config) always survive the stage-1 filter (§39.4)
|
|
r for r in adj if r in keep or r.upper() in GENERIC_TYPES
|
|
]
|
|
new_spaces[code] = spec
|
|
|
|
new_conf = {k: v for k, v in conf.items() if k != "spaces"}
|
|
new_conf["spaces"] = new_spaces
|
|
new_conf.update(
|
|
storey_minimum=1, storey_limit=1, staircase_min=1, staircase_max=1,
|
|
)
|
|
|
|
with open(out_dir / "patterns.config", "w") as fh:
|
|
yaml.safe_dump(new_conf, fh, sort_keys=False, default_flow_style=False)
|
|
return out_dir
|
|
|
|
|
|
def _load_merged_conf(directory: "str | Path") -> dict:
|
|
"""Merge ``../patterns.config`` then the local one (mirrors load_config)."""
|
|
from pathlib import Path as _Path
|
|
directory = _Path(directory)
|
|
conf: dict = {}
|
|
for p in (directory.parent / "patterns.config", directory / "patterns.config"):
|
|
if p.is_file():
|
|
with open(p) as fh:
|
|
conf.update(yaml.safe_load(fh) or {})
|
|
return conf
|
|
|
|
|
|
def load_programme_dir(directory: str | Path) -> dict[str, SpaceReq]:
|
|
"""Load programme from a directory, merging parent patterns.config as base.
|
|
|
|
Mirrors urb-evolve.pl: ../patterns.config loaded first, then the local
|
|
file's top-level keys override it (same shallow-merge as fitness.load_config).
|
|
"""
|
|
return _parse_spaces(_load_merged_conf(directory))
|
|
|
|
|
|
def storey_minimum(directory: str | Path) -> int:
|
|
"""Minimum storey count the programme requires (``storey_minimum`` key).
|
|
|
|
Independent of ``level:`` keys: a programme can demand N storeys via
|
|
``storey_minimum`` without pinning any room to an upper floor (e.g.
|
|
programme-house: ``storey_minimum: 2`` but all rooms ``level: 0``). The
|
|
constructive seeder and the staged/plain dispatch must honour it, else the
|
|
seed is built one storey short and fitness fires a ``storey minimum`` fail the
|
|
search has to repair structurally (DESIGN.md §12.2).
|
|
"""
|
|
return int(_load_merged_conf(directory).get("storey_minimum") or 1)
|
|
|
|
|
|
def n_storeys_for(directory: str | Path) -> int:
|
|
"""Storeys the programme implies: the max of level-derived and storey_minimum."""
|
|
reqs = load_programme_dir(directory)
|
|
return max(n_storeys_required(reqs), storey_minimum(directory))
|