junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

missing fuel on gas boiler

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-08-09 19:30:15 +01:00
parent ffc6f434d5
commit eb48b408dc
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
backend/Funding.py
View file

@ -341,20 +341,15 @@ class Funding:
return 'Biomass Boiler' return 'Biomass Boiler'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "lpg"): if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "lpg"):
return 'Bottled LPG Boiler' return 'Bottled LPG Boiler'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "mains gas") and ( if mainheating["has_boiler"] and (
mainheat_energy_eff in ["Good", "Very Good"] (main_fuel["fuel_type"] == "mains gas") or (
(main_fuel["fuel_type"] == "unknown") and (mainheating["has_mains_gas"]))
): ):
# Assume higher efficiency condensing boiler if mainheat_energy_eff in ["Good", "Very Good"]:
return 'Condensing Gas Boiler' # Assume higher efficiency condensing boiler
return 'Condensing Gas Boiler'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "mains gas") and ( if mainheat_energy_eff in ["Average", "Poor"]:
mainheat_energy_eff in ["Average", "Poor"] return 'Non Condensing Gas Boiler'
):
return 'Non Condensing Gas Boiler'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "mains gas") and (
mainheat_energy_eff in ["Very Poor"]
) and mainheating["has_radiators"]:
return 'Gas Back Boiler to Radiators' return 'Gas Back Boiler to Radiators'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "mains gas") and ( if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "mains gas") and (

2
backend/tests/test_funding.py
View file

@ -1076,7 +1076,7 @@ for _, x in tqdm(epc_df.iterrows(), total=len(epc_df)):
errored_epcs = epc_df[epc_df["LMK_KEY"].isin(errors)] errored_epcs = epc_df[epc_df["LMK_KEY"].isin(errors)]
unique_combs = errored_epcs[["MAINHEAT_ENERGY_EFF", "MAINHEAT_DESCRIPTION", "MAIN_FUEL"]].drop_duplicates() unique_combs = errored_epcs[["MAINHEAT_ENERGY_EFF", "MAINHEAT_DESCRIPTION", "MAIN_FUEL"]].drop_duplicates()
i = 1 i = 2
x = errored_epcs[ x = errored_epcs[
(errored_epcs["MAINHEAT_ENERGY_EFF"] == unique_combs["MAINHEAT_ENERGY_EFF"].values[i]) & (errored_epcs["MAINHEAT_ENERGY_EFF"] == unique_combs["MAINHEAT_ENERGY_EFF"].values[i]) &
(errored_epcs["MAINHEAT_DESCRIPTION"] == unique_combs["MAINHEAT_DESCRIPTION"].values[i]) & (errored_epcs["MAINHEAT_DESCRIPTION"] == unique_combs["MAINHEAT_DESCRIPTION"].values[i]) &