From f9957a55d066a294e79efdf196b72e79d82689fb Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Sat, 9 Mar 2024 16:19:54 +0000 Subject: [PATCH] fixed bug in gbis variance 2? --- etl/eligibility/ha_15_32/ha_analysis_batch_3.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py index aca2ce43..a25f98c6 100644 --- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py +++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py @@ -4172,7 +4172,8 @@ def forecast_remaining_sales(loader): gbis_remaining = int(np.round(gbis_remaining_pre_cancellations * ha_gbis_sale_conversion)) gbis_remaining_revenue = int(gbis_remaining * gbis_rate) # This is the number we expect to cancel - gbis_remaining_expected_cancellations = int(gbis_remaining_pre_cancellations - gbis_remaining) * gbis_rate + gbis_remaining_expected_cancellations = int(gbis_remaining_pre_cancellations - gbis_remaining) + gbis_remaining_expected_cancellations_revenue = gbis_remaining_expected_cancellations * gbis_rate # GBIS delta if original_warmfront_remaining_gbis == 0: @@ -4313,7 +4314,7 @@ def forecast_remaining_sales(loader): ) if gbis_variance_2 != 0: - raise ValueError("Something went wrong in gbis_variance") + raise ValueError("Something went wrong in gbis_variance2") to_append = { ("", "", "", "HA Name"): ha_name, @@ -4414,7 +4415,7 @@ def forecast_remaining_sales(loader): "GBIS Postcode list", "Of which expected sales - £", "Remaining - £", "GBIS total"): gbis_remaining_revenue, ("GBIS Postcode list", "Of which expected cancellations -£", "Remaining - £", "GBIS total"): - gbis_remaining_expected_cancellations + gbis_remaining_expected_cancellations_revenue } # Make sure nothing is forgotten due to duplicate multi-index keys