mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-07-19 17:03:02 +00:00
Add the first boiler-upgrade option to the single "Heating & Hot Water" Recommendation (ADR-0024 expansion): a dwelling whose existing wet boiler heats a hot-water cylinder is offered a new gas condensing boiler, with the cylinder jacketed when under-insulated and given a thermostat when absent. One competing Option (the Optimiser picks <=1), folded into one composite Plan line. The end-state is read from the Elmhurst before/after re-lodgements (cert 001431, gas boiler upgrade - with cylinder), which REVISE ADR-0024: - Target is always a gas condensing boiler, not fuel-preserving: every after lodges fuel 26. Gas->gas always; a non-gas wet boiler ->gas only with a mains-gas connection; electric boilers are left alone (electrification is the upgrade path). Eligibility = wet-boiler SAP code (Table 4a/4b 101-141 / 151-161 / 191-196) + not an electric boiler + mains gas present. - End-state is a Table 4b SAP code, not a PCDB index: code 102 (regular boiler + cylinder). The calculator derives the condensing seasonal efficiency from the code, so no efficiency input exists or is needed. - A modern condensing boiler has a fanned flue: the after flips `fan_flue_present` False->True on every cert (SAP 10.2 Table 4f flue-fan + the Table 4b condensing-efficiency basis). Added as a new HeatingOverlay field, routed to main_heating_details[0]. - Cylinder thermostat is always added when absent (user-locked); the jacket is the 80 mm `cylinder_insulation_type=2` end-state, applied only when the cylinder is below 80 mm (never downgrading a better one). Both are conditional per-dwelling components, not a frozen overlay. Cascade-pinned delta-0 (SAP/CO2/PE) against the relodged after via `_assert_overlay_reproduces_after`. NB the absolute SAP on this dwelling is subject to a separate Summary-path mapper roof-fidelity gap (we read the roof better-insulated than Elmhurst, scoring ~75 vs the printed 56); the gap is identical on before+after (the boiler measure never touches the roof) so it cancels and the pin still proves the exact heating field-delta. Tracked on the calculator branch. Wires the new `gas_boiler_upgrade` MeasureType through contingencies (0.26), the offline sample catalogue, the catalogue-coverage list, and the ARA first-run integration seed (the option fires on any mains-gas boiler+cylinder dwelling). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
193 lines
8 KiB
Python
193 lines
8 KiB
Python
"""The Overlay Applicator — folds an ordered set of Simulation Overlays onto
|
|
a baseline EpcPropertyData and returns a new one for the calculator.
|
|
|
|
Sequential fold: overlays are applied in order and a later overlay wins on a
|
|
field it shares with an earlier one. The baseline is never mutated; the
|
|
returned EpcPropertyData is throwaway (handed to the calculator for scoring,
|
|
then discarded). See ADR-0016.
|
|
"""
|
|
|
|
import copy
|
|
from dataclasses import fields
|
|
from typing import Optional, Sequence
|
|
|
|
from datatypes.epc.domain.epc_property_data import (
|
|
EpcPropertyData,
|
|
SapVentilation,
|
|
SapWindow,
|
|
WindowTransmissionDetails,
|
|
)
|
|
from domain.modelling.simulation import (
|
|
EpcSimulation,
|
|
HeatingOverlay,
|
|
LightingOverlay,
|
|
SolarOverlay,
|
|
VentilationOverlay,
|
|
WindowOverlay,
|
|
)
|
|
|
|
|
|
def apply_simulations(
|
|
baseline: EpcPropertyData, simulations: Sequence[EpcSimulation]
|
|
) -> EpcPropertyData:
|
|
"""Return a copy of ``baseline`` with every Simulation Overlay's non-``None``
|
|
fields written onto the building part it targets, applied in order. A
|
|
whole-dwelling ``ventilation`` overlay folds onto ``sap_ventilation``
|
|
(creating one if the baseline lodged none)."""
|
|
result: EpcPropertyData = copy.deepcopy(baseline)
|
|
parts_by_id = {part.identifier: part for part in result.sap_building_parts}
|
|
|
|
for simulation in simulations:
|
|
for identifier, overlay in simulation.building_parts.items():
|
|
part = parts_by_id[identifier]
|
|
for overlay_field in fields(overlay):
|
|
value = getattr(overlay, overlay_field.name)
|
|
if value is not None:
|
|
setattr(part, overlay_field.name, value)
|
|
for index, window_overlay in simulation.windows.items():
|
|
_fold_window(result.sap_windows[index], window_overlay)
|
|
if simulation.ventilation is not None:
|
|
result.sap_ventilation = _fold_ventilation(
|
|
result.sap_ventilation, simulation.ventilation
|
|
)
|
|
if simulation.lighting is not None:
|
|
_fold_lighting(result, simulation.lighting)
|
|
if simulation.heating is not None:
|
|
_fold_heating(result, simulation.heating)
|
|
if simulation.solar is not None:
|
|
_fold_solar(result, simulation.solar)
|
|
|
|
return result
|
|
|
|
|
|
# `HeatingOverlay` fields grouped by the object they target — the deepest fold,
|
|
# spanning the primary `MainHeatingDetail`, `sap_heating`, the top-level
|
|
# `EpcPropertyData`, and `sap_energy_source` (ADR-0024).
|
|
_MAIN_HEATING_FIELDS: tuple[str, ...] = (
|
|
"main_fuel_type",
|
|
"heat_emitter_type",
|
|
"main_heating_control",
|
|
"sap_main_heating_code",
|
|
"main_heating_index_number",
|
|
"main_heating_category",
|
|
"fan_flue_present",
|
|
)
|
|
_SAP_HEATING_FIELDS: tuple[str, ...] = (
|
|
"water_heating_code",
|
|
"water_heating_fuel",
|
|
"cylinder_size",
|
|
"cylinder_insulation_type",
|
|
"cylinder_insulation_thickness_mm",
|
|
"cylinder_thermostat",
|
|
)
|
|
_ENERGY_SOURCE_FIELDS: tuple[str, ...] = ("meter_type", "mains_gas")
|
|
|
|
|
|
def _fold_heating(epc: EpcPropertyData, overlay: HeatingOverlay) -> None:
|
|
"""Write a `HeatingOverlay`'s non-``None`` fields onto the (copied) dwelling,
|
|
routing each to its home: the primary ``main_heating_details[0]``, the
|
|
``sap_heating`` hot-water fields, the top-level ``has_hot_water_cylinder``,
|
|
and the ``sap_energy_source`` meter/mains-gas fields. The bundle targets the
|
|
primary system only (index 0)."""
|
|
main = epc.sap_heating.main_heating_details[0]
|
|
for field_name in _MAIN_HEATING_FIELDS:
|
|
value = getattr(overlay, field_name)
|
|
if value is not None:
|
|
setattr(main, field_name, value)
|
|
# `main_heating_index_number` (PCDB-resolved, e.g. a heat pump) and
|
|
# `sap_main_heating_code` (Table 4a-resolved, e.g. storage heaters) are
|
|
# mutually-exclusive efficiency anchors: a whole-system replacement to one
|
|
# must clear the other, else a stale code from the old system wins the
|
|
# calculator's dispatch (e.g. a gas-boiler code 104 left beside a heat-pump
|
|
# index makes hot water use boiler efficiency, not the HP SCOP).
|
|
if overlay.main_heating_index_number is not None:
|
|
main.sap_main_heating_code = None
|
|
elif overlay.sap_main_heating_code is not None:
|
|
main.main_heating_index_number = None
|
|
for field_name in _SAP_HEATING_FIELDS:
|
|
value = getattr(overlay, field_name)
|
|
if value is not None:
|
|
setattr(epc.sap_heating, field_name, value)
|
|
if overlay.has_hot_water_cylinder is not None:
|
|
epc.has_hot_water_cylinder = overlay.has_hot_water_cylinder
|
|
for field_name in _ENERGY_SOURCE_FIELDS:
|
|
value = getattr(overlay, field_name)
|
|
if value is not None:
|
|
setattr(epc.sap_energy_source, field_name, value)
|
|
|
|
|
|
# `SolarOverlay` fields all live on `sap_energy_source` (the home of the SAP
|
|
# Appendix M PV inputs) — the sixth overlay surface (ADR-0026).
|
|
_ENERGY_SOURCE_SOLAR_FIELDS: tuple[str, ...] = (
|
|
"photovoltaic_arrays",
|
|
"pv_diverter_present",
|
|
"pv_connection",
|
|
"is_dwelling_export_capable",
|
|
"pv_batteries",
|
|
)
|
|
|
|
|
|
def _fold_solar(epc: EpcPropertyData, overlay: SolarOverlay) -> None:
|
|
"""Write a `SolarOverlay`'s non-``None`` fields onto the (copied) dwelling's
|
|
``sap_energy_source`` — the PV arrays, diverter, connection, export
|
|
capability and battery a Solar PV Measure Option installs (ADR-0026). The
|
|
arrays are an absolute target: they replace the dwelling's existing
|
|
``photovoltaic_arrays`` (empty for a non-PV dwelling)."""
|
|
for field_name in _ENERGY_SOURCE_SOLAR_FIELDS:
|
|
value = getattr(overlay, field_name)
|
|
if value is not None:
|
|
setattr(epc.sap_energy_source, field_name, value)
|
|
|
|
|
|
def _fold_lighting(epc: EpcPropertyData, overlay: LightingOverlay) -> None:
|
|
"""Write a `LightingOverlay`'s non-``None`` bulb counts onto the (copied)
|
|
dwelling's top-level fields by name — the four counts live directly on
|
|
`EpcPropertyData`, so the fold writes onto it, not a nested object."""
|
|
for overlay_field in fields(overlay):
|
|
value = getattr(overlay, overlay_field.name)
|
|
if value is not None:
|
|
setattr(epc, overlay_field.name, value)
|
|
|
|
|
|
def _fold_window(window: SapWindow, overlay: WindowOverlay) -> None:
|
|
"""Write a `WindowOverlay`'s non-``None`` fields onto a (copied) window:
|
|
``glazing_type`` flat on the window, ``u_value`` / ``solar_transmittance``
|
|
into its `WindowTransmissionDetails` (where the cascade reads them), starting
|
|
a fresh one when the window lodged none."""
|
|
if overlay.glazing_type is not None:
|
|
window.glazing_type = overlay.glazing_type
|
|
if overlay.u_value is None and overlay.solar_transmittance is None:
|
|
return
|
|
details: Optional[WindowTransmissionDetails] = window.window_transmission_details
|
|
if details is None:
|
|
# data_source 1 = manufacturer-lodged (the case the cascade's per-window
|
|
# U path keys on); both values must be present to start fresh.
|
|
window.window_transmission_details = WindowTransmissionDetails(
|
|
u_value=overlay.u_value if overlay.u_value is not None else 0.0,
|
|
data_source=1,
|
|
solar_transmittance=(
|
|
overlay.solar_transmittance
|
|
if overlay.solar_transmittance is not None
|
|
else 0.0
|
|
),
|
|
)
|
|
return
|
|
if overlay.u_value is not None:
|
|
details.u_value = overlay.u_value
|
|
if overlay.solar_transmittance is not None:
|
|
details.solar_transmittance = overlay.solar_transmittance
|
|
|
|
|
|
def _fold_ventilation(
|
|
baseline: Optional[SapVentilation], overlay: VentilationOverlay
|
|
) -> SapVentilation:
|
|
"""Write the overlay's non-``None`` fields onto a (copied) ``SapVentilation``,
|
|
starting a fresh one when the baseline lodged none."""
|
|
folded: SapVentilation = (
|
|
copy.deepcopy(baseline) if baseline is not None else SapVentilation()
|
|
)
|
|
for overlay_field in fields(overlay):
|
|
value = getattr(overlay, overlay_field.name)
|
|
if value is not None:
|
|
setattr(folded, overlay_field.name, value)
|
|
return folded
|