fixed ha34, completed 30

This commit is contained in:
Khalim Conn-Kowlessar 2024-03-10 17:25:07 +00:00
parent 2810316e22
commit e15b977930

View file

@ -2550,7 +2550,8 @@ class DataLoader:
"AFFORDABLE WARMTH / REMEDIAL": "ECO4",
"AFF0RDALE WARMTH": "ECO4",
"ECO 4 RdSAP CL": "ECO4",
"Affordable Warmth (R) ": "ECO4"
"Affordable Warmth (R) ": "ECO4",
"Affordable Warmth ": "ECO4"
}
# Since it seems like "subject to archetype check" has some failure conditions, for simplicity, we
@ -4175,9 +4176,6 @@ def calculate_eco4_post_ciga(
def forecast_remaining_sales(loader):
# TODO: Skip HA34 for the moment
loader.data = {k: v for k, v in loader.data.items() if k != "HA34"}
# Assumptions:
# We cap the ciga conversion rate at 75% because I expect future HAs to have a lower CIGA conversion rate
# and I don't want the numbers to change too much, depenent on the CIGA conversation rate
@ -5066,18 +5064,15 @@ def app():
# Add in:
priority_has = [
"HA1", "HA2", "HA6", "HA7", "HA9", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18",
"HA19", "HA24", "HA25", "HA27", "HA28", "HA30", "HA32",
# "HA34",
"HA35", "HA39", "HA41", "HA48", "HA50", "HA56", "HA63", "HA107", "HA117"
"HA1", "HA2", "HA6", "HA7", "HA9", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18", "HA19", "HA24", "HA25",
"HA27", "HA28", "HA30", "HA32", "HA34", "HA35", "HA39", "HA41", "HA48", "HA50", "HA56", "HA63", "HA107", "HA117"
]
# Next HAs to do: 14 [DONE], 15[DONE], 32 [DONE], 33 [Input format is 4 parts and no eco4 jobs identified - come
# back on this], 28 [DONE], 41 [DONE], 50 [DONE], 48 [DONE], 2 [DONE], 63 [DONE], 12 [DONE], 117 [DONE], 13 [DONE],
# 35 [DONE], 56 [DONE], 19 [DONE], 18 [DONE], 9 [DONE], 27 DONE
# 35 [DONE], 56 [DONE], 19 [DONE], 18 [DONE], 9 [DONE], 27 [DONE], 34 [DONE], 30 [DONE]
#
# Consider for ECO4:
# Consider for GBIS:
# 34 [bug in the results so leaving out for the moment]
# Ignore for now:
# 38 [problematic, but no ECO4], 10 problematic (no eligibility), 20 has barely any in
# Filter down the directories to only the priority HAs