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

added description_simulation to hot water recommendation

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-07-09 19:39:37 +01:00
parent 3bdc4db92a
commit a28c94c18b
2 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
recommendations/HotwaterRecommendations.py
View file

@ -62,7 +62,10 @@ class HotwaterRecommendations:
"sap_points": None, "sap_points": None,
"already_installed": already_installed, "already_installed": already_installed,
**recommendation_cost, **recommendation_cost,
"simulation_config": {"hot_water_energy_eff_ending": "Average"} "simulation_config": {"hot_water_energy_eff_ending": "Average"},
"description_simulation": {
"hot-water-energy-eff": "Average"
}
} }
) )
return return

41
recommendations/Recommendations.py
View file

@ -337,9 +337,10 @@ class Recommendations:
sap_phase_impact = property_sap_predictions.groupby("phase")["predictions"].median().reset_index() sap_phase_impact = property_sap_predictions.groupby("phase")["predictions"].median().reset_index()
heat_phase_impact = property_heat_predictions.groupby("phase")["predictions"].median().reset_index() heat_phase_impact = property_heat_predictions.groupby("phase")["predictions"].median().reset_index()
carbon_phase_impact = property_carbon_predictions.groupby("phase")["predictions"].median().reset_index() carbon_phase_impact = property_carbon_predictions.groupby("phase")["predictions"].median().reset_index()
lighting_cost_phase_impact = ( # lighting_cost_phase_impact = (
property_lighting_cost_predictions.groupby("phase")[["adjusted_cost", "predictions"]].median().reset_index() # property_lighting_cost_predictions.groupby("phase")[["adjusted_cost", "predictions"]].median(
) # ).reset_index()
# )
heating_cost_phase_impact = ( heating_cost_phase_impact = (
property_heating_cost_predictions.groupby("phase")[["adjusted_cost", "predictions"]].median().reset_index() property_heating_cost_predictions.groupby("phase")[["adjusted_cost", "predictions"]].median().reset_index()
) )
@ -349,32 +350,6 @@ class Recommendations:
].median().reset_index() ].median().reset_index()
) )
# The heat demand change is the difference between the starting heat demand and the value at the final phase
# expected_heat_demand = property_instance.floor_area * (
# heat_phase_impact[heat_phase_impact["phase"] == max(heat_phase_impact["phase"])]["predictions"].values[0]
# )
# starting_heat_demand = (
# float(property_instance.data["energy-consumption-current"]) * property_instance.floor_area
# )
#
# # This is the unadjusted resulting heat demand
# predicted_heat_demand_change = starting_heat_demand - expected_heat_demand
#
# # TODO: This isn't quite right as this is based on EVERY possible measure, not just the ones that are
# # actually implemented
# expected_adjusted_energy = AnnualBillSavings.adjust_energy_to_metered(
# epc_energy_consumption=expected_heat_demand,
# current_epc_rating=property_instance.data["current-energy-rating"],
# total_floor_area=property_instance.floor_area
# )
#
# adjusted_heat_demand_change = (
# property_instance.current_adjusted_energy - expected_adjusted_energy
# )
#
# # TODO: We should determine if the home is gas & electricity or just electricity
# expected_energy_bill = AnnualBillSavings.calculate_annual_bill(expected_adjusted_energy)
phase_lighting_costs = {} phase_lighting_costs = {}
phase_kwh_figures = {} phase_kwh_figures = {}
for recommendations_by_type in property_recommendations: for recommendations_by_type in property_recommendations:
@ -752,6 +727,14 @@ class Recommendations:
rec["heat_demand"] is None) or (rec["energy_cost_savings"] is None): rec["heat_demand"] is None) or (rec["energy_cost_savings"] is None):
raise ValueError("sap points, co2 or heat demand is missing") raise ValueError("sap points, co2 or heat demand is missing")
# We sum up the total savings for the property and that is our expected energy bill
# expected_energy_bill = sum(
# [
# rec["energy_cost_savings"] for rec in property_recommendations
# if rec["type"] != "mechanical_ventilation"
# ]
# )
return ( return (
property_recommendations, property_recommendations,
expected_adjusted_energy, expected_adjusted_energy,