junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-08 11:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle smokeless coal boiler

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-08-09 19:24:16 +01:00
parent 0988fb7d6d
commit b26071e8fc
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend/Funding.py
View file

@ -384,12 +384,13 @@ class Funding:
if mainheating["has_boiler"] and (
main_fuel["fuel_type"] in [
"dual fuel appliance mineral and wood", "manufactured smokeless fuel", "dual fuel mineral wood"
"dual fuel appliance mineral and wood", "manufactured smokeless fuel", "dual fuel mineral wood",
"smokeless coal"
]
) and (mainheat_energy_eff in ["Average", "Very Poor", "Poor"]):
return 'Solid Fossil Boiler'
if mainheating["has_ground_source_heat_pump"]:
if mainheating["has_ground_source_heat_pump"] or mainheating["has_water_source_heat_pump"]:
return 'GSHP'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] in ["electric", "electricity"]):

7
backend/tests/test_funding.py
View file

@ -1075,3 +1075,10 @@ for _, x in tqdm(epc_df.iterrows(), total=len(epc_df)):
errors.append(x["LMK_KEY"])
errored_epcs = epc_df[epc_df["LMK_KEY"].isin(errors)]
unique_combs = errored_epcs[["MAINHEAT_ENERGY_EFF", "MAINHEAT_DESCRIPTION", "MAIN_FUEL"]].drop_duplicates()
i = 0
x = errored_epcs[
(errored_epcs["MAINHEAT_ENERGY_EFF"] == unique_combs["MAINHEAT_ENERGY_EFF"].values[i]) &
(errored_epcs["MAINHEAT_DESCRIPTION"] == unique_combs["MAINHEAT_DESCRIPTION"].values[i]) &
(errored_epcs["MAIN_FUEL"] == unique_combs["MAIN_FUEL"].values[i])
].head(1).squeeze()