From 77b5c87fbeb932e19df6143096da5c6fd315fa14 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Mon, 26 Jun 2023 18:44:54 +0100 Subject: [PATCH] slight restructure of floor recommendations, removing repeated code --- .../recommendations/FloorRecommendations.py | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/model_data/recommendations/FloorRecommendations.py b/model_data/recommendations/FloorRecommendations.py index 8cb2ba6b..885602b2 100644 --- a/model_data/recommendations/FloorRecommendations.py +++ b/model_data/recommendations/FloorRecommendations.py @@ -201,20 +201,23 @@ class FloorRecommendations(BaseUtility): # The floor is already compliant return - # For these methods, we need to know the wall material + # For these methods, we need to know the additional details about the property if self.property.walls["is_solid_brick"]: wall_type = "solid brick" else: raise NotImplementedError("Implement me") - if is_suspended: - total_floor_area = float(self.property.data["total-floor-area"]) - number_of_rooms = float(self.property.data["number-habitable-rooms"]) + total_floor_area = float(self.property.data["total-floor-area"]) + number_of_rooms = float(self.property.data["number-habitable-rooms"]) - if self.property.data["property-type"] == "House": - num_floors = self._estimate_floors(total_floor_area, number_of_rooms) - else: - raise NotImplementedError("Implement me") + if self.property.data["property-type"] == "House": + num_floors = self._estimate_floors(total_floor_area, number_of_rooms) + elif self.property.data["property-type"] == "Flat": + num_floors = 1 + else: + raise NotImplementedError("Implement me") + + if is_suspended: if insulation_thickness == "none": @@ -238,15 +241,6 @@ class FloorRecommendations(BaseUtility): self.recommend_floor_insulation(u_value=u_value, parts=suspended_floor_insulation_parts) if is_solid: - total_floor_area = float(self.property.data["total-floor-area"]) - number_of_rooms = float(self.property.data["number-habitable-rooms"]) - - if self.property.data["property-type"] == "House": - num_floors = self._estimate_floors(total_floor_area, number_of_rooms) - elif self.property.data["property-type"] == "Flat": - num_floors = 1 - else: - raise NotImplementedError("Implement me") if insulation_thickness == "none":