mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-08 11:17:27 +00:00
removed stray comma causing bugs
This commit is contained in:
parent
5b32ac8aad
commit
9d26c94ae5
1 changed files with 28 additions and 4 deletions
|
|
@ -1526,14 +1526,40 @@ class DataLoader:
|
|||
asset_list["ECO Eligibility"] = np.where(
|
||||
(asset_list["ECO Eligibility"] == "gbis") & (
|
||||
asset_list["installation_status"].isin(
|
||||
["ECO4 - installed", "ECO4 - cancelled"]
|
||||
["ECO4 - installed", "ECO4 - cancelled", "ECO4 - in progress"]
|
||||
)
|
||||
),
|
||||
"eco4",
|
||||
asset_list["ECO Eligibility"]
|
||||
)
|
||||
# Update the cases where a property was marked as eligible for ECO4, but sold for GBIS
|
||||
asset_list["ECO Eligibility"] = np.where(
|
||||
(asset_list["ECO Eligibility"].isin(
|
||||
["eco4", "eco4 (subject to ciga)", "eco4 - passed ciga", "failed ciga"]
|
||||
)) & (
|
||||
asset_list["installation_status"].isin(
|
||||
["GBIS - installed", "GBIS - cancelled", "GBIS - in progress"]
|
||||
)
|
||||
),
|
||||
"gbis",
|
||||
asset_list["ECO Eligibility"]
|
||||
)
|
||||
# Update the cases where a property is marked as not eligible, but sold for GBIS
|
||||
if ((asset_list["ECO Eligibility"] == "not eligible") & (
|
||||
asset_list["installation_status"].isin(
|
||||
["GBIS - in progress", "GBIS - installed", "GBIS - cancelled"]
|
||||
))).sum():
|
||||
bah
|
||||
asset_list["ECO Eligibility"] = np.where(
|
||||
(asset_list["ECO Eligibility"] == "not eligible") & (
|
||||
asset_list["installation_status"].isin(
|
||||
["GBIS - in progress", "GBIS - installed", "GBIS - cancelled"]
|
||||
)),
|
||||
"gbis",
|
||||
asset_list["ECO Eligibility"]
|
||||
)
|
||||
|
||||
asset_list = asset_list.drop(columns=["has_a_survey_record"])
|
||||
asset_list = asset_list.drop(columns=["has_a_survey_record", "installation_status"])
|
||||
|
||||
# Update the survey list with installation status
|
||||
self.data[ha_name]["survey_list"] = survey_list
|
||||
|
|
@ -2897,8 +2923,6 @@ def forecast_remaining_sales(loader):
|
|||
|
||||
gbis_rate = 600
|
||||
eco4_rate = 1710
|
||||
# old_gbis_rate = 432
|
||||
# old_eco4_rate = 1456
|
||||
|
||||
# 1) Calculate the conversion rate from passed CIGA to actual sale
|
||||
converted_ciga_jobs = []
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue