From 691fc4927f8741597b165f598eb414bf3a52967e Mon Sep 17 00:00:00 2001
From: Nikhil Woodruff <35577657+nikhilwoodruff@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:20:22 +0000
Subject: [PATCH] Update carbon tax intensities for 2024 data

---
 .../data/datasets/frs/enhanced_frs.py         |  6 ++---
 .../class_1/rates/employee/main.yaml          |  2 +-
 .../consumption/total_by_category.yaml        | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/policyengine_uk/data/datasets/frs/enhanced_frs.py b/policyengine_uk/data/datasets/frs/enhanced_frs.py
index cfc20b892..9a536c413 100644
--- a/policyengine_uk/data/datasets/frs/enhanced_frs.py
+++ b/policyengine_uk/data/datasets/frs/enhanced_frs.py
@@ -64,8 +64,8 @@ def generate(self):
         i = 0
         frs_household_weight = simulation.calculate("household_weight").values
         for imputation_model, targets in zip(
-            [wealth, vat, consumption],
-            [wealth_targets, {}, consumption_targets],
+            [consumption, vat, wealth],
+            [consumption_targets, {}, wealth_targets],
         ):
             i += 1
             predictors = imputation_model.X_columns
@@ -86,7 +86,7 @@ def generate(self):
                     target_values,
                     X_input,
                     frs_household_weight,
-                    max_iterations=3,
+                    max_iterations=5,
                 )
             else:
                 quantiles = None
diff --git a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/rates/employee/main.yaml b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/rates/employee/main.yaml
index a91d8e455..96d4aec0e 100644
--- a/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/rates/employee/main.yaml
+++ b/policyengine_uk/parameters/gov/hmrc/national_insurance/class_1/rates/employee/main.yaml
@@ -13,7 +13,7 @@ values:
       reference:
         - title: Health and Social Care Levy Act (Repeal) 2022
           href: https://www.legislation.gov.uk/ukpga/2022/43/section/2
-  2024-01-06:
+  2024-01-01:
     value: 0.1
     metadata:
       reference:
diff --git a/policyengine_uk/parameters/household/consumption/total_by_category.yaml b/policyengine_uk/parameters/household/consumption/total_by_category.yaml
index 2dc66fdff..18d0b178f 100644
--- a/policyengine_uk/parameters/household/consumption/total_by_category.yaml
+++ b/policyengine_uk/parameters/household/consumption/total_by_category.yaml
@@ -1,28 +1,28 @@
 description: Total spending by category.
 food_and_non_alcoholic_beverages_consumption:
-  2022-01-01: 130_649_491_805
+  2022-01-01: 101_271_123_550
 alcohol_and_tobacco_consumption:
-  2022-01-01: 26_900_823_901
+  2022-01-01: 20_649_078_205
 clothing_and_footwear_consumption:
-  2022-01-01: 47_939_291_284
+  2022-01-01: 20_963_698_388
 housing_water_and_electricity_consumption:
-  2022-01-01: 171_767_919_484
+  2022-01-01: 124_038_611_201
 household_furnishings_consumption:
-  2022-01-01: 73_508_139_437
+  2022-01-01: 50_520_352_855
 health_consumption:
-  2022-01-01: 15_460_766_406
+  2022-01-01: 9_779_703_006
 transport_consumption:
-  2022-01-01: 172_250_717_486
+  2022-01-01: 89_217_063_076
 communication_consumption:
-  2022-01-01: 22_904_123_327
+  2022-01-01: 16_271_643_314
 recreation_consumption:
-  2022-01-01: 151_928_011_577
+  2022-01-01: 65_969_989_193
 education_consumption:
-  2022-01-01: 9_911_078_382
+  2022-01-01: 12_218_834_005
 restaurants_and_hotels_consumption:
-  2022-01-01: 108_086_118_119
+  2022-01-01: 26_464_397_527
 miscellaneous_consumption:
-  2022-01-01: 92_156_823_484
+  2022-01-01: 54_415_069_696
 metadata:
   unit: currency-GBP
   period: year