junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor modifications to enable vectis portfolio

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-09-09 22:34:45 +01:00
parent 316a42bacb
commit 910d8a5f38
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
etl/customers/vectis/outputs.py
View file

@ -220,7 +220,7 @@ def app():
"patches_file_path": "", "patches_file_path": "",
"non_invasive_recommendations_file_path": non_invasive_recommendations_filename, "non_invasive_recommendations_file_path": non_invasive_recommendations_filename,
"inclusions": [ "inclusions": [
"draught_proofing", "mixed_glazing", "trickle_vents", "low_energy_lighting", "draught_proofing", "mixed_glazing", "trickle_vents", "low_energy_lighting", "windows"
], ],
"budget": None, "budget": None,
"scenario_name": "Quick wins - do now while tenanted", "scenario_name": "Quick wins - do now while tenanted",
@ -244,7 +244,8 @@ def app():
"low_energy_lighting", "low_energy_lighting",
"suspended_floor_insulation", "suspended_floor_insulation",
"internal_wall_insulation", "internal_wall_insulation",
"room_roof_insulation" "room_roof_insulation",
"windows"
], ],
"budget": None, "budget": None,
"scenario_name": "Do when void", "scenario_name": "Do when void",

5
recommendations/Costs.py
View file

@ -168,9 +168,8 @@ class Costs:
# https://www.greenmatch.co.uk/windows/double-glazing/cost # https://www.greenmatch.co.uk/windows/double-glazing/cost
SASH_WINDOW_INFLATION_FACTOR = 1.5 SASH_WINDOW_INFLATION_FACTOR = 1.5
# Typically, secondary glazing can be installed for 25% of the cost of double glazed windows - to be conservative, # Based on relative costs from SCIS
# we scale the cost by half SECONDARY_GLAZING_SCALING_FACTOR = 0.85
SECONDARY_GLAZING_SCALING_FACTOR = 0.5
def __init__(self, property_instance): def __init__(self, property_instance):
""" """

6
recommendations/Recommendations.py
View file

@ -102,6 +102,7 @@ class Recommendations:
property_recommendations = [] property_recommendations = []
phase = 0 phase = 0
measures = self.find_included_measures() measures = self.find_included_measures()
non_invasive_recommendation_types = [r["type"] for r in self.property_instance.non_invasive_recommendations]
# Building Fabric # Building Fabric
self.wall_recomender.recommend(phase=phase, measures=measures) self.wall_recomender.recommend(phase=phase, measures=measures)
@ -149,7 +150,8 @@ class Recommendations:
property_recommendations.append(self.floor_recommender.recommendations) property_recommendations.append(self.floor_recommender.recommendations)
phase += 1 phase += 1
if "windows" in measures: if "windows" in measures and "mixed_glazing" not in non_invasive_recommendation_types:
# If we have a mixed glazing recommendation, we prioritise this over the windows recommendation
self.windows_recommender.recommend(phase=phase) self.windows_recommender.recommend(phase=phase)
if self.windows_recommender.recommendation: if self.windows_recommender.recommendation:
property_recommendations.append(self.windows_recommender.recommendation) property_recommendations.append(self.windows_recommender.recommendation)
@ -529,7 +531,7 @@ class Recommendations:
# For the moment, we cap the number of SAP points that can be achieved by LEDs at 2 # For the moment, we cap the number of SAP points that can be achieved by LEDs at 2
if rec["type"] == "low_energy_lighting": if rec["type"] == "low_energy_lighting":
if property_instance.data["low-energy-lighting"] < 50: if property_instance.data["low-energy-lighting"] < 50:
lighting_sap_limit = LightingRecommendations.SAP_LIMIT lighting_sap_limit = LightingRecommendations.SAP_LIMIT
else: else: