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

fixed bug with adjusted predictions

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-08-12 10:38:00 +01:00
parent 2cb5308711
commit 30c28754b7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
recommendations/Recommendations.py
View file

@ -650,7 +650,7 @@ class Recommendations:
for k in ["heating", "hotwater"]:
kwh_impact_table[f"{k}_cost"] = kwh_impact_table.apply(
lambda x: AnnualBillSavings.calculate_recommendation_fuel_cost(
x[f"adjusted_{k}"], x[f"{k}_fuel_type"], x[f"{k}_cop"]
x[f"predictions_{k}"], x[f"{k}_fuel_type"], x[f"{k}_cop"]
), axis=1
)
@ -672,14 +672,14 @@ class Recommendations:
continue
heating_kwh_savings = (
previous_phase_impact["adjusted_heating"].mean() - rec_impact["adjusted_heating"].values[0]
previous_phase_impact["predictions_heating"].mean() - rec_impact["predictions_heating"].values[0]
)
heating_cost_savings = (
previous_phase_impact["heating_cost"].mean() - rec_impact["heating_cost"].values[0]
)
hotwater_kwh_savings = (
previous_phase_impact["adjusted_hotwater"].mean() - rec_impact["adjusted_hotwater"].values[0]
previous_phase_impact["predictions_hotwater"].mean() - rec_impact["predictions_hotwater"].values[0]
)
hotwater_host = (
previous_phase_impact["hotwater_cost"].mean() - rec_impact["hotwater_cost"].values[0]
@ -707,11 +707,12 @@ class Recommendations:
electricity_standing_charge = AnnualBillSavings.DAILY_STANDARD_CHARGE_ELECTRICITY * 365
current_energy_bill = (
starting_figures["heating_cost"].values[0] +
starting_figures["hotwater_cost"].values[0] +
starting_figures["heating_cost"] +
starting_figures["hotwater_cost"] +
property_instance.energy_cost_estimates["unadjusted"]["lighting"] +
property_instance.energy_cost_estimates["unadjusted"]["appliances"] +
gas_standing_charge + electricity_standing_charge
gas_standing_charge +
electricity_standing_charge
)
return current_energy_bill