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

Merge pull request #516 from Hestia-Homes/main

Browse source 
added new measure, fixed error with package selection
This commit is contained in:
KhalimCK 2025-10-28 14:42:40 +00:00 • committed by GitHub
commit 0cf2ce9a3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/app/db/models/materials.py
View file

@ -19,6 +19,7 @@ class MaterialType(enum.Enum):
flat_roof_insulation = "flat_roof_insulation" flat_roof_insulation = "flat_roof_insulation"
room_roof_insulation = "room_roof_insulation" room_roof_insulation = "room_roof_insulation"
windows_glazing = "windows_glazing" windows_glazing = "windows_glazing"
secondary_glazing = "secondary_glazing"
cavity_wall_extraction = "cavity_wall_extraction" cavity_wall_extraction = "cavity_wall_extraction"
iwi_wall_demolition = "iwi_wall_demolition" iwi_wall_demolition = "iwi_wall_demolition"

16
backend/engine/engine.py
View file

@ -959,15 +959,19 @@ async def model_engine(body: PlanTriggerRequest):
) )
# Given the solutions we select the optimal one # Given the solutions we select the optimal one
# 1) If the scheme is ECO4, the full project funding and uplift are deducted from the cost
# 2) If the sheme is GBIS, the partial project funding and uplift are deducted from the cost
# 3) Otherwise, no funding is deducted from the cost
solutions["cost_less_full_project_funding"] = np.where( solutions["cost_less_full_project_funding"] = np.where(
solutions["scheme"] == "eco4", solutions["scheme"] == "none",
solutions["total_cost"] - solutions["full_project_funding"] - solutions["total_uplift"], solutions["total_cost"],
solutions["total_cost"] - solutions["partial_project_funding"] - solutions["total_uplift"] np.where(
solutions["scheme"] == "eco4",
solutions["total_cost"] - solutions["full_project_funding"] - solutions["total_uplift"],
solutions["total_cost"] - solutions["partial_project_funding"] - solutions["total_uplift"]
)
) )
solutions["cost_less_full_project_funding"] = (
solutions["total_cost"] - solutions["full_project_funding"] - solutions["total_uplift"]
)
solutions = solutions.sort_values("cost_less_full_project_funding", ascending=True) solutions = solutions.sort_values("cost_less_full_project_funding", ascending=True)
if solutions["meets_upgrade_target"].any(): if solutions["meets_upgrade_target"].any():