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

37 lines
857 B
TOML
Raw Normal View History

Scaffold homemaker-py with validated geometry port Clean-room Python successor to Urb for programme-driven layout search. This initial commit establishes the .dom bridge format and a faithful port of Urb's top-down quad geometry, validated byte-identical against Urb across all 35 programme-house example files (including the wall inset and multi-storey wall-stacking inheritance). - dom.py: .dom YAML <-> Node tree, parent/below/position linkage, wall_outer inset on load, raw-corner stash for round-tripping - geometry.py: Coordinate/Coordinate_a/_b/Area/Length + Coordinate_Offset - experiments/dump_areas.{py,pl}: geometry regression harness
2026-06-10 20:50:13 +01:00
[project]
Rename package: homemaker → homemaker-layout - src/homemaker/ → src/homemaker_layout/; all imports updated - pyproject.toml: name = homemaker-layout, entry point updated - .beads/config.yaml: dolt sync.remote updated to homemaker-layout.git - Delete temporary debug/perl scripts from project root - README.md, DESIGN.md: package path references updated - GitHub repo renamed; git remote updated Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-14 08:18:06 +01:00
name = "homemaker-layout"
Scaffold homemaker-py with validated geometry port Clean-room Python successor to Urb for programme-driven layout search. This initial commit establishes the .dom bridge format and a faithful port of Urb's top-down quad geometry, validated byte-identical against Urb across all 35 programme-house example files (including the wall inset and multi-storey wall-stacking inheritance). - dom.py: .dom YAML <-> Node tree, parent/below/position linkage, wall_outer inset on load, raw-corner stash for round-tripping - geometry.py: Coordinate/Coordinate_a/_b/Area/Length + Coordinate_Offset - experiments/dump_areas.{py,pl}: geometry regression harness
2026-06-10 20:50:13 +01:00
version = "0.0.1"
description = "Programme-driven building layout search over slicing trees (Python successor to Urb)"
requires-python = ">=3.11"
dependencies = [
"pyyaml>=6.0",
"numpy>=1.26",
"scipy>=1.11",
"shapely>=2.0",
"networkx>=3.0",
Geometry inner loop: batched full-objective ratio optimiser (CMA-ES) innerloop.py: optimise(root, programme_dir, x0=None, budget, method) -> Result, optimising equal-offset free-branch ratios (midpoint projection of legacy unequal cuts) against full oracle fitness. OracleEvaluator scores each population in one batched perl call. Methods: cma (default) — multi- start sigma ladder (0.05 local, 0.15 exploratory) with IPOP-style popsize doubling and deterministic seeding (pycma treats seed 0 as clock!) — and compass with Hooke-Jeeves pattern moves, kept for the d0s bake-off. Acceptance (experiments/accept_innerloop.py, §4.5 bars vs unprojected originals, within-noise tolerance 1%): x1.65 / x1.66 / x1.58 against bars x1.24 / x1.67 / x1.59, no new failures, 46 oracle calls vs Nelder-Mead's 200. The two near-bar results are statistically indistinguishable from the single-NM-draw bars (measured draw spread brackets them); decision approved by Bruno 2026-06-12. Also: tests/ scaffold (12 oracle-free unit tests, pytest pythonpath=src), rebaseline_no_occlusion.py for homemaker-py-gp2, cma>=3.0 dependency (installed via dnf), dead-variable cleanup in solver.py. Closes homemaker-py-1p0. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-12 09:42:24 +01:00
"cma>=3.0",
homemaker-py-2g7.5: CP-SAT exact room-code assignment (seeder + reassign op) Adds src/homemaker_layout/cpsat.py (OR-Tools CP-SAT) as an exact alternative to operators._assign_adjacency_aware's greedy/beam room-code placement, wired in as assign_solver="greedy"|"cpsat" (EXPERIMENTAL, default "greedy", byte-identical to before) through constructive_topology/lift_base_to_storeys/ driver.search, plus a new operators.mutate_reassign in-search repair operator (driver.search's enable_reassign=False default, mirrors enable_ruin_recreate). Both found and fixed a resize-fragility bug (a second CP-SAT pass against settled geometry, operators._cpsat_relabel_settled) and a CP-SAT symmetry-blowup stall (explicit interchangeable-code grouping). Seeder-level A/B on harbor-house is a solid, low-noise positive (~13% fewer real fitness-scored secondary-adjacency fails, 10 seeds). Full driver.search A/B is only pilot-scale (budget=3000 vs the bead's own 20k target) and inconclusive -- both flags stay default-off pending a larger-N confirmation. Full writeup: DESIGN.md §37.7. Bead left in_progress (own acceptance criteria not fully met); homemaker-py-5bv tracks the deferred post-collapse repair item. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LSwQwpEaHFBkeVSDDWd75S
2026-08-04 09:19:36 +01:00
"ortools>=9.10",
Scaffold homemaker-py with validated geometry port Clean-room Python successor to Urb for programme-driven layout search. This initial commit establishes the .dom bridge format and a faithful port of Urb's top-down quad geometry, validated byte-identical against Urb across all 35 programme-house example files (including the wall inset and multi-storey wall-stacking inheritance). - dom.py: .dom YAML <-> Node tree, parent/below/position linkage, wall_outer inset on load, raw-corner stash for round-tripping - geometry.py: Coordinate/Coordinate_a/_b/Area/Length + Coordinate_Offset - experiments/dump_areas.{py,pl}: geometry regression harness
2026-06-10 20:50:13 +01:00
]
Add homemaker-evolve CLI tool (homemaker-py-2wc) python -m homemaker.evolve seed.dom [--budget N] [--pop N] [--workers N] ... Installed as homemaker-evolve entry point via pyproject.toml. Takes a single .dom file; infers programme dir from its parent. All parameters available as --flags or HOMEMAKER_* env vars. Output defaults to <seed_stem>_evolved.dom; use --output - for stdout. SIGINT/SIGTERM returns best-so-far via new driver.SearchResult.interrupted flag. Also adds dom.dumps() for string serialisation and refactors dom.dump() to use it. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-14 07:48:13 +01:00
[project.scripts]
Rename package: homemaker → homemaker-layout - src/homemaker/ → src/homemaker_layout/; all imports updated - pyproject.toml: name = homemaker-layout, entry point updated - .beads/config.yaml: dolt sync.remote updated to homemaker-layout.git - Delete temporary debug/perl scripts from project root - README.md, DESIGN.md: package path references updated - GitHub repo renamed; git remote updated Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-14 08:18:06 +01:00
homemaker-evolve = "homemaker_layout.evolve:main"
Add core_divide, core_undivide, level_fix operators; wire reqs to mutate() core_divide: divides a C leaf simultaneously on ALL storeys that share that path, maintaining staircase consistency as an atomic invariant rather than requiring multi-step recovery. core_undivide: reverses core_divide consistently across all floors, merging a C sub-core back into a single C leaf everywhere. level_fix: atomically moves a level-constrained room to its required floor by retyping the largest leaf there and vacating the wrong-floor leaf to C. Requires `reqs` (SpaceReq dict); disabled (zero probability) without it. mutate() gains `reqs=None` parameter; driver.search() passes its already- loaded reqs so level_fix fires during the main memetic loop. Together these let the optimiser escape the deceptive valley around the 2-fail warmstart: level_fix moves l1 to level 0 (reducing fails 2→1), then core_divide can split the C core to accommodate the displaced t3. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-14 16:10:20 +01:00
homemaker-fitness = "homemaker_layout.fitness_cmd:main"
94g: public-access pin + keep-better wrapper + CLI/finish-hook wiring Public-access term (preserve_public_access, default on): when the building's only street access is an l/k ROOM neighbour of a public outside leaf (no circulation fallback — an existential building-level check the per-leaf objective can't see), that leaf is pinned (kept, its demand slot decremented) so the collapse can't drop "no outside public access". Best layout 15→13 becomes 15→12 with zero new fails; sweep total 172→171, still monotone. collapse_finish(root, **kw) -> (tree, base, coll, applied): keep-better wrapper, scores on throwaway copies (score_with_fails merges in place), returns the collapse only if fails don't increase. Wiring: driver.collapse_best updates result.best (lineage +collapse, canonical re-score); evolve.py runs it after the sharing polish behind --collapse/ --no-collapse (default on). New homemaker-collapse CLI (collapse_cmd.py) applies it to an existing .dom, writing <stem>.collapsed.dom. tests/test_collapse_global.py: demand-set relabel, level hard constraint, c/o/s exclusion, no-op safety, keep-better/unmerged. 267 pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01M8566xAxTnwtJTkpXjYNZm
2026-07-18 10:29:44 +01:00
homemaker-collapse = "homemaker_layout.collapse_cmd:main"
homemaker-py-2g7.1: plan->dom composer (SVG trace -> slicing-tree .dom) Composer half of the ground-truth bead: examples/harbor-house/drawings/ harbor-house 1.svg turned out to be a Bonsai/Blender render of 3m.dom's own IFC (32 IfcSpace paths == 3m.dom's upper-storey leaf count), not a human trace, so no usable reference exists yet -- this builds and tests the pipeline that will consume one once traced. compose.py parses storey-N Inkscape layers of cut-lines + labels against a boundary-stub .dom (plot/ height/elevation only, no room shapes to keep aligned across storeys) and recursively detects guillotine cuts, mirroring geometry.py's own division-line algebra; non-slicible regions and label mismatches are reported by location rather than guessed at. homemaker-compose CLI added. Renamed dom._link to public dom.link since compose.py needs to re-link from outside dom.py. Full design writeup in DESIGN.md sec 37.3; actual human tracing of harbor-house/programme-house is tracked as follow-up under 2g7.1, still open. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LSwQwpEaHFBkeVSDDWd75S
2026-08-03 11:03:02 +01:00
homemaker-compose = "homemaker_layout.compose_cmd:main"
Add homemaker-evolve CLI tool (homemaker-py-2wc) python -m homemaker.evolve seed.dom [--budget N] [--pop N] [--workers N] ... Installed as homemaker-evolve entry point via pyproject.toml. Takes a single .dom file; infers programme dir from its parent. All parameters available as --flags or HOMEMAKER_* env vars. Output defaults to <seed_stem>_evolved.dom; use --output - for stdout. SIGINT/SIGTERM returns best-so-far via new driver.SearchResult.interrupted flag. Also adds dom.dumps() for string serialisation and refactors dom.dump() to use it. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-14 07:48:13 +01:00
Scaffold homemaker-py with validated geometry port Clean-room Python successor to Urb for programme-driven layout search. This initial commit establishes the .dom bridge format and a faithful port of Urb's top-down quad geometry, validated byte-identical against Urb across all 35 programme-house example files (including the wall inset and multi-storey wall-stacking inheritance). - dom.py: .dom YAML <-> Node tree, parent/below/position linkage, wall_outer inset on load, raw-corner stash for round-tripping - geometry.py: Coordinate/Coordinate_a/_b/Area/Length + Coordinate_Offset - experiments/dump_areas.{py,pl}: geometry regression harness
2026-06-10 20:50:13 +01:00
[project.optional-dependencies]
dev = ["pytest>=8.0", "ruff>=0.5"]
[build-system]
requires = ["setuptools>=68"]
build-backend = "setuptools.build_meta"
[tool.setuptools.packages.find]
where = ["src"]
Geometry inner loop: batched full-objective ratio optimiser (CMA-ES) innerloop.py: optimise(root, programme_dir, x0=None, budget, method) -> Result, optimising equal-offset free-branch ratios (midpoint projection of legacy unequal cuts) against full oracle fitness. OracleEvaluator scores each population in one batched perl call. Methods: cma (default) — multi- start sigma ladder (0.05 local, 0.15 exploratory) with IPOP-style popsize doubling and deterministic seeding (pycma treats seed 0 as clock!) — and compass with Hooke-Jeeves pattern moves, kept for the d0s bake-off. Acceptance (experiments/accept_innerloop.py, §4.5 bars vs unprojected originals, within-noise tolerance 1%): x1.65 / x1.66 / x1.58 against bars x1.24 / x1.67 / x1.59, no new failures, 46 oracle calls vs Nelder-Mead's 200. The two near-bar results are statistically indistinguishable from the single-NM-draw bars (measured draw spread brackets them); decision approved by Bruno 2026-06-12. Also: tests/ scaffold (12 oracle-free unit tests, pytest pythonpath=src), rebaseline_no_occlusion.py for homemaker-py-gp2, cma>=3.0 dependency (installed via dnf), dead-variable cleanup in solver.py. Closes homemaker-py-1p0. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-06-12 09:42:24 +01:00
[tool.pytest.ini_options]
pythonpath = ["src"]
Scaffold homemaker-py with validated geometry port Clean-room Python successor to Urb for programme-driven layout search. This initial commit establishes the .dom bridge format and a faithful port of Urb's top-down quad geometry, validated byte-identical against Urb across all 35 programme-house example files (including the wall inset and multi-storey wall-stacking inheritance). - dom.py: .dom YAML <-> Node tree, parent/below/position linkage, wall_outer inset on load, raw-corner stash for round-tripping - geometry.py: Coordinate/Coordinate_a/_b/Area/Length + Coordinate_Offset - experiments/dump_areas.{py,pl}: geometry regression harness
2026-06-10 20:50:13 +01:00
[tool.ruff]
line-length = 100
Reference in a new issue Copy permalink