From d60918b77113a82b1d37077f020c4608787bc781 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Mon, 19 Feb 2024 18:43:10 +0000 Subject: [PATCH] updating simulation of heating --- backend/Property.py | 4 ++-- recommendations/HeatingRecommender.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/Property.py b/backend/Property.py index 1dc94331..a8c8664c 100644 --- a/backend/Property.py +++ b/backend/Property.py @@ -341,9 +341,9 @@ class Property: if is_secondary_glazing: output["glazed_type_ending"] = "secondary glazing" else: - output["glazed_type_ending"] = "double glazing installed during or after 2002 " + output["glazed_type_ending"] = "double glazing installed during or after 2002" - if recommendation["type"] == "heating_control": + if recommendation["type"] in ["heating", "heating_control"]: # We update the data, as defined in the recommendaton simulation_config = recommendation["simulation_config"] diff --git a/recommendations/HeatingRecommender.py b/recommendations/HeatingRecommender.py index 71d5e381..19374316 100644 --- a/recommendations/HeatingRecommender.py +++ b/recommendations/HeatingRecommender.py @@ -77,10 +77,7 @@ class HeatingRecommender: "new_u_value": None, "sap_points": None, **self.costs.electric_storage_heaters(number_heated_rooms=self.property.data["number-heated-rooms"]), - "simulation_config": { - "TODO" # TODO - "mainheat_energy_eff_ending": "Average" - } + "simulation_config": simulation_config } self.recommendations.extend(