From 4fb479d3c1936d5fbb108d9f0676392f6c2d3397 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 16 Feb 2024 13:02:15 +0000 Subject: [PATCH] Added adjusted_heat_demand to Recommnendations model --- backend/app/db/models/recommendations.py | 1 + recommendations/Recommendations.py | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/backend/app/db/models/recommendations.py b/backend/app/db/models/recommendations.py index ff7aa642..42ecbddf 100644 --- a/backend/app/db/models/recommendations.py +++ b/backend/app/db/models/recommendations.py @@ -22,6 +22,7 @@ class Recommendation(Base): new_u_value = Column(Float) sap_points = Column(Float) heat_demand = Column(Float) + adjusted_heat_demand = Column(Float) co2_equivalent_savings = Column(Float) energy_savings = Column(Float) energy_cost_savings = Column(Float) diff --git a/recommendations/Recommendations.py b/recommendations/Recommendations.py index 06d98a69..7bdfbdea 100644 --- a/recommendations/Recommendations.py +++ b/recommendations/Recommendations.py @@ -221,12 +221,6 @@ class Recommendations: expected_heat_demand = property_instance.floor_area * ( 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 = ( float(property_instance.data["energy-consumption-current"]) * property_instance.floor_area ) @@ -234,8 +228,6 @@ class Recommendations: # This is the unadjusted resulting 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 adjust the heat demand figures to align to the UCL paper