junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-08 11:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #497 from Hestia-Homes/funding-engine

Browse source 
fixe bug with violates min insulation constraints
This commit is contained in:
KhalimCK 2025-08-29 15:50:34 +01:00 • committed by GitHub
commit 78b4aeef63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
recommendations/optimiser/funding_optimiser.py
View file

@ -77,8 +77,12 @@ def _sum_cost_gain_with_scheme(items, scheme):
return total_cost, total_gain return total_cost, total_gain
def violates_min_insulation(fixed): def violates_min_insulation(fixed, optimisation_input_measures):
"""Return True if fixed selection includes a heating/PV measure but no required insulation.""" """
Return True if fixed selection includes a heating/PV measure but no required insulation.
It should *only* violate min insulation if the fixed selection excldes insulation but the
property needs insulation
"""
picked_types = {opt["type"] for (_, _, opt) in fixed} picked_types = {opt["type"] for (_, _, opt) in fixed}
def has_any(substrs): def has_any(substrs):
@ -106,7 +110,22 @@ def violates_min_insulation(fixed):
"room_roof_insulation", "room_roof_insulation",
]) ])
return is_heating and not has_insul def _needs_insulation(measures, t):
return _find_measure(measures, t) and not has_any({t})
needs_insul = any(
_needs_insulation(optimisation_input_measures, t)
for t in [
"external_wall_insulation",
"internal_wall_insulation",
"cavity_wall_insulation",
"loft_insulation",
"flat_roof_insulation",
"room_roof_insulation",
]
)
return is_heating and not has_insul and needs_insul
# Treat "type" like "external_wall_insulation+mechanical_ventilation" → "external_wall_insulation" # Treat "type" like "external_wall_insulation+mechanical_ventilation" → "external_wall_insulation"
@ -278,10 +297,11 @@ def optimise_with_funding_paths(p, input_measures, housing_type, funding: Fundin
for fixed in fixed_selections: for fixed in fixed_selections:
if violates_min_insulation(fixed): if violates_min_insulation(fixed, optimisation_input_measures):
# We log an error and skip this - we should not see any errors but we can probably get a reasonable # We log an error and skip this - we should not see any errors but we can probably get a reasonable
# outcome for the end user without a complete termination of the process # outcome for the end user without a complete termination of the process
logger.error("Skipping fixed selection due to minimum insulation violation: %s", fixed) logger.error("Skipping fixed selection due to minimum insulation violation: %s", fixed)
blah
continue continue
scheme = _path_scheme(path_spec) scheme = _path_scheme(path_spec)