From a5eb42794e5044478f7d26cc1163d265fd36014d Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Mon, 19 Feb 2024 13:16:18 +0000 Subject: [PATCH] added heating to main recommender --- recommendations/Recommendations.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/recommendations/Recommendations.py b/recommendations/Recommendations.py index ed9917ef..1d0fdab6 100644 --- a/recommendations/Recommendations.py +++ b/recommendations/Recommendations.py @@ -57,8 +57,8 @@ class Recommendations: property_recommendations = [] phase = 0 - # Wall recommendations - self.wall_recomender.recommend(phase=phase) + + # Building Fabric if self.wall_recomender.recommendations: property_recommendations.append(self.wall_recomender.recommendations) phase += 1 @@ -73,43 +73,38 @@ class Recommendations: if self.ventilation_recomender.recommendation: property_recommendations.append(self.ventilation_recomender.recommendation) - # Roof recommendations self.roof_recommender.recommend(phase=phase) if self.roof_recommender.recommendations: property_recommendations.append(self.roof_recommender.recommendations) phase += 1 - # Floor recommendations self.floor_recommender.recommend(phase=phase) if self.floor_recommender.recommendations: property_recommendations.append(self.floor_recommender.recommendations) phase += 1 - # Windows recommendations self.windows_recommender.recommend(phase=phase) if self.windows_recommender.recommendation: property_recommendations.append(self.windows_recommender.recommendation) phase += 1 - # Heating controls recommendations - self.heating_recommender.recommend(phase=phase) - if self.heating_recommender.recommendation: - property_recommendations.append(self.heating_recommender.recommendation) - phase += 1 - - # Fireplace sealing recommendations self.fireplace_recommender.recommend(phase=phase) if self.fireplace_recommender.recommendation: property_recommendations.append(self.fireplace_recommender.recommendation) phase += 1 - # Lighting recommendations + # Heating and Electical systems + self.heating_recommender.recommend(phase=phase) + if self.heating_recommender.recommendations: + property_recommendations.append(self.heating_recommender.recommendations) + phase += 1 + self.lighting_recommender.recommend(phase=phase) if self.lighting_recommender.recommendation: property_recommendations.append(self.lighting_recommender.recommendation) phase += 1 - # Solar recommendations + # Renewables self.solar_recommender.recommend(phase=phase) if self.solar_recommender.recommendation: property_recommendations.append(self.solar_recommender.recommendation)