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 adjusted_heat_demand to Recommnendations model

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-02-16 13:02:15 +00:00
parent 5d45243e99
commit 4fb479d3c1
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/app/db/models/recommendations.py
View file

@ -22,6 +22,7 @@ class Recommendation(Base):
new_u_value = Column(Float) new_u_value = Column(Float)
sap_points = Column(Float) sap_points = Column(Float)
heat_demand = Column(Float) heat_demand = Column(Float)
adjusted_heat_demand = Column(Float)
co2_equivalent_savings = Column(Float) co2_equivalent_savings = Column(Float)
energy_savings = Column(Float) energy_savings = Column(Float)
energy_cost_savings = Column(Float) energy_cost_savings = Column(Float)

8
recommendations/Recommendations.py
View file

@ -221,12 +221,6 @@ class Recommendations:
expected_heat_demand = property_instance.floor_area * ( expected_heat_demand = property_instance.floor_area * (
heat_phase_impact[heat_phase_impact["phase"] == max(heat_phase_impact["phase"])]["predictions"].values[0] heat_phase_impact[heat_phase_impact["phase"] == max(heat_phase_impact["phase"])]["predictions"].values[0]
) )
expected_carbon = (
carbon_phase_impact[carbon_phase_impact["phase"] == max(carbon_phase_impact["phase"])][
"predictions"].values[0]
)
starting_heat_demand = ( starting_heat_demand = (
float(property_instance.data["energy-consumption-current"]) * property_instance.floor_area float(property_instance.data["energy-consumption-current"]) * property_instance.floor_area
) )
@ -234,8 +228,6 @@ class Recommendations:
# This is the unadjusted resulting heat demand # This is the unadjusted resulting heat demand
predicted_heat_demand_change = starting_heat_demand - expected_heat_demand predicted_heat_demand_change = starting_heat_demand - expected_heat_demand
starting_carbon = float(property_instance.data["co2-emissions-current"])
# We don't want to adjust the heat demand for mechanical ventilation so we add it back on # We don't want to adjust the heat demand for mechanical ventilation so we add it back on
# We adjust the heat demand figures to align to the UCL paper # We adjust the heat demand figures to align to the UCL paper