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

fixed gbis issues

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-08-26 18:12:42 +01:00
parent cd52d1b9e6
commit ef521c2df9
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/engine/engine.py
View file

@ -951,7 +951,8 @@ async def model_engine(body: PlanTriggerRequest):
funded_measures = optimal_solution["items"] if scheme != "none" else []
solution = optimal_solution["items"] + optimal_solution["unfunded_items"]
# This is the total amount of funding that the project will produce (including uplifts) (£)
project_funding = optimal_solution["full_project_funding"]
project_funding = optimal_solution["full_project_funding"] if scheme == "eco4" else \
optimal_solution["partial_project_funding"]
# This is the total amount of funding associated to the uplift (£)
total_uplift = optimal_solution["total_uplift"]
# This is the funding scheme selected

2
recommendations/optimiser/funding_optimiser.py
View file

@ -345,7 +345,7 @@ def optimise_with_funding_paths(p, input_measures, housing_type, funding: Fundin
total_picks = fixed_items + picked
if housing_type == "Private":
if not _prs_solution_ok(total_picks, p, funding):
if not _prs_solution_ok(total_picks, p, funding) and scheme == "eco4":
logger.error(
"Found a solution that does not meet the PRS requirements: %s - this shouldn't be happening",
total_picks