mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-08 11:17:27 +00:00
1f8a070f66
Surfaces the lodged shower multiplicity from the Elmhurst Summary §16
on the EPC. Previously `_map_elmhurst_sap_heating` hardcoded:
electric_shower_count = 1 if has_electric_shower else None
mixer_shower_count = 0 if has_electric_shower else None
losing the count for any cert with ≥ 2 outlets. Cert
7800-1501-0922-7127-3563 lodges TWO instantaneous electric showers
("Shower 01" + "Shower 11") but the mapper produced
`electric_shower_count=1`. After this slice:
electric_shower_count = Σ(s for s in showers if s.outlet_type
== "Electric shower")
mixer_shower_count = Σ(s for s in showers if s.outlet_type
!= "Electric shower")
**Cascade SAP effect:** None on cert 7800. Appendix J's eq J16
(`N_ES,per_outlet = N_shower / N_outlets`) and eq J18 (Σ_j E_ES,j)
are symmetric in N_electric_showers when there are no mixer outlets,
so the lodged (64a) kWh and (247a) cost are unchanged. The fix is
correctness-by-construction, not a delta-closer for the negative-band
certs (their +0.69 GBP total-cost gap traces to the gas hot-water
kWh path — separate slice).
**Hand-built fixture updates (5):** the cohort-1 hand-builts at
`domain/sap10_calculator/worksheet/tests/_elmhurst_worksheet_*.py`
previously omitted `electric_shower_count` / `mixer_shower_count`
(implicitly None), which matched the mapper's pre-slice None
sentinel. Updated each to the lodged counts the mapper now surfaces:
000474: 1 mixer → (0, 1)
000477: 1 mixer → (0, 1)
000480: 1 mixer → (0, 1)
000490: 1 mixer → (0, 1)
000516: 1 mixer → (0, 1)
000487 (already at (1, 0) for an electric-shower lodging) unchanged.
Tests:
- `test_summary_7800_two_electric_showers_count_as_two_not_one` —
pins the multi-shower mapping for cert 7800 (Summary_000890.pdf).
- 5 hand-built field-parity tests
(`test_from_elmhurst_site_notes_matches_hand_built_*`) now pass at
the new integer counts instead of None.
Pyright net-zero per file:
- datatypes/epc/domain/mapper.py: 32 (baseline 32)
- backend/documents_parser/tests/test_summary_pdf_mapper_chain.py: 0
Regression baseline: 699 pass + 10 fail (= prior 698 + 10 + 1 new).
Spec refs:
- SAP 10.2 Appendix J §1a — outlet counting drives `N_outlets` used
in eq J6/J7 (mixer shower water draw) and eq J16/J17/J18 (electric
shower energy).
- Cert 7800-1501-0922-7127-3563 Summary §16 "Showers" lodgement.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
||
|---|---|---|
| .. | ||
| elmhurst_site_notes_1_text.json | ||
| elmhurst_site_notes_2_text.json | ||
| ElmhurstSiteNotes.pdf | ||
| ElmhurstSiteNotes_2.pdf | ||
| pashub_site_notes_1_text.json | ||
| pashub_site_notes_2_text.json | ||
| pashub_site_notes_3_text.json | ||
| pashub_site_notes_4_text.json | ||
| pashub_site_notes_5_text.json | ||
| pashub_site_notes_6_text.json | ||
| pashub_site_notes_7_text.json | ||
| PasHubSiteNotes_1.pdf | ||
| PasHubSiteNotes_2.pdf | ||
| PasHubSiteNotes_3.pdf | ||
| PasHubSiteNotes_4.pdf | ||
| PasHubSiteNotes_5.pdf | ||
| PasHubSiteNotes_6.pdf | ||
| PasHubSiteNotes_7.pdf | ||
| Summary_000474.pdf | ||
| Summary_000477.pdf | ||
| Summary_000480.pdf | ||
| Summary_000487.pdf | ||
| Summary_000490.pdf | ||
| Summary_000516.pdf | ||
| Summary_000784.pdf | ||
| Summary_000884.pdf | ||
| Summary_000888.pdf | ||
| Summary_000889.pdf | ||
| Summary_000890.pdf | ||
| Summary_000897.pdf | ||
| Summary_000898.pdf | ||
| Summary_000899.pdf | ||
| Summary_000900.pdf | ||
| Summary_000901.pdf | ||
| Summary_000902.pdf | ||
| Summary_000903.pdf | ||
| Summary_000904.pdf | ||
| Summary_000910.pdf | ||
| Summary_001479.pdf | ||