mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-08 11:17:27 +00:00
6be8fdb7b6
SAP 10.2 §3.2 applies the 0.04 m²K/W curtain resistance per window;
the worksheet's (27) column shows it that way. Our calc had been
applying it ONCE to the area-weighted-avg raw U across all windows.
That's correct when all windows share a U but biased when a dwelling
has mixed glazing types (typical Elmhurst fixture lodges 2 types):
U_eff(weighted_avg(U_i)) ≠ weighted_avg(U_eff(U_i))
because 1/(1/U + 0.04) is non-linear. The drift was ~0.05-0.10 W/K
on `windows_w_per_k` for 000474, 000477, 000487 (mixed-glazing
fixtures).
Fix: when sap_windows have per-window u_value lodged (the spec-
faithful path), iterate them computing per-window U_eff × area and
sum. Falls back to the legacy single-avg-U path when window U isn't
lodged (back-compat for synthetic tests that pass
`window_avg_u_value=...` directly).
Per-window LINE_27 numbers now match PDF exactly:
fixture | windows W/K calc → PDF | LINE_33 Δ before → after
--------|------------------------|---------------------------
000474 | 25.4243 → 25.3674 ✓ | +0.0864 → +0.0296 (-66%)
000477 | 17.8550 → 17.8349 ✓ | -0.1045 → -0.1246 (small
widening — exposes
upstream floor-U drift)
000487 | (cascading) | +37.88 (RR defect, slice 23)
000480 | unchanged | -0.0168 → -0.0168 (single U)
000490 | unchanged | +0.0282 → +0.0282 (single U)
000516 | (cascading) | -6.75 (RR defect, slice 23)
Total cascade pin failure count unchanged at 83 (pins still above
abs=1e-4 floor by 0.03-0.13 W/K — sub-display-precision drift left
in floor-U cascades + the two RR fixture defects).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
||
|---|---|---|
| .. | ||
| src/domain | ||
| pyproject.toml | ||
| README.md | ||
domna-domain
Shared domain types — Property, Properties, BaselinePerformance, Plan, PlanPhase, Scenario, ScenarioPhase, ScenarioSnapshot, Recommendation, OptimisedPackage, EpcPropertyData, etc.
Boundary: types only. No persistence, no IO, no business logic. Other packages and services depend on domna-domain; this package depends on nothing internal.
Domain definitions live in ../../CONTEXT.md. New types added here must match the glossary terms.
Layout
src/domain/
├── __init__.py
├── property.py # Property, Properties, PropertyIdentity
├── site_notes.py
├── landlord_overrides.py
├── baseline_performance.py # lodged + effective pair (ADR-0004)
├── plan.py # Plan, PlanPhase, OptimisedPackage
├── scenario.py # Scenario, ScenarioPhase, ScenarioSnapshot (ADR-0005)
├── recommendation.py
├── geospatial.py
├── solar.py
├── anomaly_flags.py
└── ml/
├── __init__.py
├── transform.py # EpcMlTransform (versioned per §8.3)
└── schema.py
When datatypes/epc/domain/ folds in, the EPC schema types move under src/domain/epc/.