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 b30k boiler

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-08-09 19:26:44 +01:00
parent b26071e8fc
commit ffc6f434d5
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
backend/Funding.py
View file

@ -363,13 +363,10 @@ class Funding:
# Doesnt have radiators
return 'Gas Fire with Back Boiler'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "oil") and (
mainheat_energy_eff in ["Good", "Very Good"]
):
return 'Condensing Oil Boiler'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "oil") and (
mainheat_energy_eff in ["Average", "Very Poor", "Poor"]
):
if mainheating["has_boiler"] and (main_fuel["fuel_type"] in ["oil", "b30k"]):
# b30k - kerosene
if mainheat_energy_eff in ["Good", "Very Good"]:
return 'Condensing Oil Boiler'
return 'Non Condensing Oil Boiler'
if mainheating["has_boiler"] and (main_fuel["fuel_type"] == "lpg") 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)]
unique_combs = errored_epcs[["MAINHEAT_ENERGY_EFF", "MAINHEAT_DESCRIPTION", "MAIN_FUEL"]].drop_duplicates()
i = 0
i = 1
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]) &