From 89241f9ae3f009ae1640d7651ebb997979ed0207 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Tue, 13 Aug 2024 16:14:20 +0100 Subject: [PATCH] remove old xposed floor recommendation handling --- etl/customers/newhaven/newhaven_study.py | 2 +- recommendations/FloorRecommendations.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etl/customers/newhaven/newhaven_study.py b/etl/customers/newhaven/newhaven_study.py index 58edf578..9cda3d29 100644 --- a/etl/customers/newhaven/newhaven_study.py +++ b/etl/customers/newhaven/newhaven_study.py @@ -270,7 +270,7 @@ def make_asset_list(): "multi_plan": True, "exclusions": [ "internal_wall_insulation", "external_wall_insulation", "floor_insulation", "heating", "solar_pv", - "lighting", "windows" + "lighting", "windows", "secondary_heating" ], "budget": None, } diff --git a/recommendations/FloorRecommendations.py b/recommendations/FloorRecommendations.py index 5a8ad242..74be7d41 100644 --- a/recommendations/FloorRecommendations.py +++ b/recommendations/FloorRecommendations.py @@ -119,7 +119,11 @@ class FloorRecommendations(Definitions): if u_value < self.BUILDING_REGULATIONS_PART_L_MAX_U_VALUE: return - if self.property.floor["is_suspended"] or self.property.floor["is_to_unheated_space"]: + if ( + self.property.floor["is_suspended"] or + self.property.floor["is_to_unheated_space"] or + self.property.floor["is_to_external_air"] + ): # Given the U-value, we recommend underfloor insulation self.recommend_floor_insulation( phase=phase, @@ -139,10 +143,6 @@ class FloorRecommendations(Definitions): ) return - if self.property.floor["is_to_unheated_space"] or self.property.floor["is_to_external_air"]: - self.recommend_floor_insulation(u_value=u_value, parts=self.exposed_floor_insulation_parts) - return - raise NotImplementedError("Implement me!") @staticmethod