mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-08 11:17:27 +00:00
FULL CLOSURE. Cascade 768/768 + e2e 72/72 across all 6 Elmhurst fixtures. Adds Table 12d (p.194) monthly CO2 emission factors for electricity to `tables/table_12.py` + `co2_monthly_factors_kg_per_kwh(fuel_code)` helper. Per the spec text: "Where electricity is the fuel used, the relevant set of factors in the table below should be used to calculate the monthly CO2 emissions INSTEAD the annual average factor given in Table 12." Calculator now consumes per-end-use CO2 factors on `CalculatorInputs` (`main_heating_co2_factor_kg_per_kwh`, `secondary_heating_co2_factor_ kg_per_kwh`, `hot_water_co2_factor_kg_per_kwh`, `pumps_fans_co2_factor_ kg_per_kwh`, `lighting_co2_factor_kg_per_kwh`, `electric_shower_kwh_ per_yr`, `electric_shower_co2_factor_kg_per_kwh`). Defaults to None → falls back to the global `co2_factor_kg_per_kwh` (legacy synthetic path); cert_to_inputs supplies real values. `_effective_monthly_co2_factor(monthly_kwh, fuel_code)` translates the Table 12d monthly cascade into the calculator's annual×factor shape: effective = Σ(kWh_m × CO2_m) / Σ(kWh_m). Used for the 4 electricity end-uses (secondary, pumps/fans, lighting, electric shower). Gas end- uses keep the annual Table 12 factor. Adds `environmental_section_from_cert(epc) -> EnvironmentalSection` exposing (261)..(274) line refs. Worksheet display conventions: - (265) excludes (264a) — electric shower CO2 contributes to (272) total but not the "space + water heating" subtotal. - (273) is rounded to 2 d.p. half-up — the PDF displays with trailing zeros to 4 d.p. but precision is 2 d.p. throughout. §12 LINE_ constants added to all 6 fixtures: (261), (262), (263), (264), (264a), (265), (266), (267), (268), (269), (272), (273), EI continuous, (274). 000487 (electric shower) has non-zero (264a). FINAL SCOREBOARD: - Cascade pins: 684/684 → 768/768 (§7..§12 all closed, 100%) - e2e SapResult: 66/66 → 72/72 (all CO2 + sap + ecf + fuel cost) - Wider regression: 1490/1490 PASS — zero failures anywhere 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/.