policyengine-uk 2.35.0__py3-none-any.whl → 2.36.0__py3-none-any.whl

policyengine_uk/__init__.py

@@ -13,5 +13,9 @@ from policyengine_uk.system import (
 from pathlib import Path
 import os
 from policyengine_core.taxbenefitsystems import TaxBenefitSystem
+from policyengine_uk.data.economic_assumptions import (
+    BASELINE_GROWFACTORS,
+    apply_growth_factors,
+)
 
 REPO = Path(__file__).parent

policyengine_uk/data/__init__.py

@@ -1,5 +1 @@
 from policyengine_uk.data.dataset_schema import UKDataset
-from policyengine_uk.data.economic_assumptions import (
-    BASELINE_GROWFACTORS,
-    apply_growth_factors,
-)

policyengine_uk/data/dataset_schema.py

@@ -1,5 +1,11 @@
 import pandas as pd
-from policyengine_uk import Microsimulation
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from policyengine_uk import Microsimulation
+
+from pathlib import Path
+import h5py
 
 
 class UKDataset:
@@ -7,6 +13,27 @@ class UKDataset:
     benunit: pd.DataFrame
     household: pd.DataFrame
 
+    @staticmethod
+    def validate_file_path(file_path: str):
+        if not file_path.endswith(".h5"):
+            raise ValueError("File path must end with '.h5' for UKDataset.")
+        if not Path(file_path).exists():
+            raise FileNotFoundError(f"File not found: {file_path}")
+
+        # Check if the file contains time_period, person, benunit, and household datasets
+        with h5py.File(file_path, "r") as f:
+            required_datasets = [
+                "time_period",
+                "person",
+                "benunit",
+                "household",
+            ]
+            for dataset in required_datasets:
+                if dataset not in f:
+                    raise ValueError(
+                        f"Dataset '{dataset}' not found in the file: {file_path}"
+                    )
+
     def __init__(
         self,
         file_path: str = None,
@@ -16,6 +43,7 @@ class UKDataset:
         fiscal_year: int = 2025,
     ):
         if file_path is not None:
+            self.validate_file_path(file_path)
             with pd.HDFStore(file_path) as f:
                 self.person = f["person"]
                 self.benunit = f["benunit"]
@@ -59,7 +87,9 @@ class UKDataset:
         )
 
     @staticmethod
-    def from_simulation(simulation: Microsimulation, fiscal_year: int = 2025):
+    def from_simulation(
+        simulation: "Microsimulation", fiscal_year: int = 2025
+    ):
         entity_dfs = {}
 
         for entity in ["person", "benunit", "household"]:

policyengine_uk/data/economic_assumptions.py

@@ -2,7 +2,7 @@ import pandas as pd
 from pathlib import Path
 from policyengine_uk.data.dataset_schema import UKDataset
 
-START_YEAR = 2020
+START_YEAR = 2022
 END_YEAR = 2029
 
 
@@ -13,40 +13,29 @@ def create_policyengine_uprating_factors_table(print_diff=True):
 
     variable_names = []
     years = []
-    index_values = []
+    yoy_values = []
 
     parameter_by_variable = {}
 
     for variable in system.variables.values():
         if variable.uprating is not None:
-            parameter = system.parameters.get_child(variable.uprating)
+            parameter = system.parameters.get_child(
+                variable.uprating.replace("indices", "yoy_growth")
+            )
             parameter_by_variable[variable.name] = parameter.name
-            start_value = parameter(START_YEAR)
             for year in range(START_YEAR, END_YEAR + 1):
                 variable_names.append(variable.name)
-                years.append(str(year))  # Convert to string here
-                growth = parameter(year) / start_value
-                index_values.append(round(growth, 3))
+                years.append(str(year))
+                yoy_values.append(round(parameter(year), 3))
 
     df["Variable"] = variable_names
     df["Year"] = years
-    df["Value"] = index_values
+    df["Value"] = yoy_values
 
     # Convert to there is a column for each year
     df = df.pivot(index="Variable", columns="Year", values="Value")
     df = df.sort_values("Variable")
 
-    # Create a table with growth factors by year
-
-    df_growth = df.copy()
-    for year in range(END_YEAR, START_YEAR, -1):
-        year_str = str(year)
-        prev_year_str = str(year - 1)
-        df_growth[year_str] = round(
-            df_growth[year_str] / df_growth[prev_year_str] - 1, 3
-        )
-    df_growth[str(START_YEAR)] = 0
-
     file_path = Path(__file__).parent / "uprating_growth_factors.csv"
 
     # Read old CSV if it exists
@@ -57,16 +46,16 @@ def create_policyengine_uprating_factors_table(print_diff=True):
         old_df.columns = old_df.columns.astype(str)
 
     # Prepare new dataframe
-    df_growth["Parameter"] = df.index.map(parameter_by_variable)
-    df_growth = df_growth[
+    df["Parameter"] = df.index.map(parameter_by_variable)
+    df = df[
         ["Parameter"] + [str(year) for year in range(START_YEAR, END_YEAR + 1)]
     ]
 
     # Print diff if old CSV existed and print_diff is True
     if old_df is not None and print_diff:
-        print_csv_diff(old_df, df_growth)
+        print_csv_diff(old_df, df)
         # Save new CSV
-        df_growth.to_csv(file_path)
+        df.to_csv(file_path)
 
     return pd.read_csv(file_path)
 

policyengine_uk/data/uprating_growth_factors.csv

@@ -1,83 +1,83 @@
-Variable,Parameter,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029
-afcs_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-alcohol_and_tobacco_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-attendance_allowance_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-bsp_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-capital_gains,gov.obr.non_labour_income,0,0.072,0.138,0.066,0.08,0.068,0.056,0.045,0.034,0.035
-capital_gains_before_response,gov.obr.non_labour_income,0,0.072,0.138,0.066,0.08,0.068,0.056,0.045,0.034,0.035
-carers_allowance_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-child_benefit_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-child_tax_credit_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-childcare_expenses,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-clothing_and_footwear_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-communication_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-corporate_wealth,household.wealth.corporate_wealth,0,0.0,-0.109,0.004,0.03,0.031,0.035,0.035,0.035,0.0
-council_tax,gov.obr.council_tax,0,0.0,0.0,0.0,0.064,0.046,0.045,0.046,0.045,0.045
-diesel_spending,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-dividend_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-dla_m_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-dla_sc_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-domestic_energy_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-education_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-employee_pension_contributions,gov.obr.average_earnings,0,0.058,0.065,0.068,0.047,0.038,0.021,0.021,0.023,0.025
-employer_pension_contributions,gov.obr.average_earnings,0,0.058,0.065,0.068,0.047,0.038,0.021,0.021,0.023,0.025
-employment_income,gov.obr.average_earnings,0,0.058,0.065,0.068,0.047,0.038,0.021,0.021,0.023,0.025
-employment_income_before_lsr,gov.obr.average_earnings,0,0.058,0.065,0.068,0.047,0.038,0.021,0.021,0.023,0.025
-esa_contrib_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-esa_income_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-food_and_non_alcoholic_beverages_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-free_school_fruit_veg,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-free_school_meals,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-free_school_milk,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-gross_financial_wealth,household.wealth.financial_assets,0,0.014,-0.108,0.004,0.03,0.032,0.034,0.034,0.036,0.0
-health_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-household_furnishings_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-household_weight,gov.ons.population,0,0.004,0.003,0.014,0.01,0.011,0.007,0.008,0.004,0.005
-housing_benefit_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-housing_water_and_electricity_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-iidb_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-incapacity_benefit_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-income_support_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-jsa_contrib_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-jsa_income_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-lump_sum_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-main_residence_value,household.wealth.financial_assets,0,0.014,-0.108,0.004,0.03,0.032,0.034,0.034,0.036,0.0
-maintenance_expenses,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-maintenance_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-maternity_allowance_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-miscellaneous_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-miscellaneous_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-mortgage_capital_repayment,gov.obr.house_prices,0,0.082,0.083,-0.01,0.027,0.024,0.025,0.026,0.023,0.024
-mortgage_interest_repayment,gov.obr.mortgage_interest,0,0.003,0.262,0.485,0.221,0.136,0.126,0.082,0.042,0.047
-net_financial_wealth,household.wealth.financial_assets,0,0.014,-0.108,0.004,0.03,0.032,0.034,0.034,0.036,0.0
-non_residential_property_value,household.wealth.financial_assets,0,0.014,-0.108,0.004,0.03,0.032,0.034,0.034,0.036,0.0
-other_investment_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-other_residential_property_value,household.wealth.financial_assets,0,0.014,-0.108,0.004,0.03,0.032,0.034,0.034,0.036,0.0
-owned_land,household.wealth.financial_assets,0,0.014,-0.108,0.004,0.03,0.032,0.034,0.034,0.036,0.0
-pension_credit_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-pension_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-personal_pension_contributions,gov.obr.average_earnings,0,0.058,0.065,0.068,0.047,0.038,0.021,0.021,0.023,0.025
-petrol_spending,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-pip_dl_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-pip_m_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-private_pension_income,gov.obr.per_capita.non_labour_income,0,0.068,0.134,0.052,0.069,0.057,0.049,0.038,0.029,0.03
-private_transfer_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-property_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-recreation_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-rent,gov.obr.rent,0,0.018,0.04,0.063,0.074,0.057,0.036,0.027,0.023,0.024
-restaurants_and_hotels_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-savings,household.wealth.financial_assets,0,0.014,-0.108,0.004,0.03,0.032,0.034,0.034,0.036,0.0
-savings_interest_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-sda_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-self_employment_income,gov.obr.per_capita.mixed_income,0,0.06,0.063,0.024,0.048,0.047,0.031,0.031,0.036,0.038
-state_pension,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-state_pension_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-statutory_maternity_pay,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-statutory_paternity_pay,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-statutory_sick_pay,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-student_loan_repayments,gov.obr.average_earnings,0,0.058,0.065,0.068,0.047,0.038,0.021,0.021,0.023,0.025
-sublet_income,gov.obr.per_capita.gdp,0,0.125,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
-transport_consumption,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-universal_credit_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-winter_fuel_allowance_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
-working_tax_credit_reported,gov.obr.consumer_price_index,0,0.039,0.101,0.057,0.023,0.032,0.02,0.02,0.02,0.02
+Variable,Parameter,2022,2023,2024,2025,2026,2027,2028,2029
+afcs_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+alcohol_and_tobacco_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+attendance_allowance_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+bsp_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+capital_gains,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+capital_gains_before_response,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+carers_allowance_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+child_benefit_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+child_tax_credit_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+childcare_expenses,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+clothing_and_footwear_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+communication_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+corporate_wealth,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+council_tax,gov.economic_assumptions.yoy_growth.obr.council_tax,0.053,0.056,0.064,0.046,0.045,0.046,0.045,0.045
+diesel_spending,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+dividend_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+dla_m_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+dla_sc_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+domestic_energy_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+education_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+employee_pension_contributions,gov.economic_assumptions.yoy_growth.obr.average_earnings,0.064,0.069,0.047,0.037,0.022,0.021,0.023,0.025
+employer_pension_contributions,gov.economic_assumptions.yoy_growth.obr.average_earnings,0.064,0.069,0.047,0.037,0.022,0.021,0.023,0.025
+employment_income,gov.economic_assumptions.yoy_growth.obr.average_earnings,0.064,0.069,0.047,0.037,0.022,0.021,0.023,0.025
+employment_income_before_lsr,gov.economic_assumptions.yoy_growth.obr.average_earnings,0.064,0.069,0.047,0.037,0.022,0.021,0.023,0.025
+esa_contrib_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+esa_income_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+food_and_non_alcoholic_beverages_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+free_school_fruit_veg,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+free_school_meals,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+free_school_milk,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+gross_financial_wealth,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+health_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+household_furnishings_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+household_weight,gov.economic_assumptions.yoy_growth.ons.population,0.003,0.014,0.01,0.011,0.007,0.008,0.004,0.005
+housing_benefit_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+housing_water_and_electricity_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+iidb_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+incapacity_benefit_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+income_support_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+jsa_contrib_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+jsa_income_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+lump_sum_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+main_residence_value,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+maintenance_expenses,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+maintenance_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+maternity_allowance_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+miscellaneous_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+miscellaneous_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+mortgage_capital_repayment,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+mortgage_interest_repayment,gov.economic_assumptions.yoy_growth.obr.mortgage_interest,0.262,0.485,0.221,0.136,0.126,0.082,0.042,0.047
+net_financial_wealth,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+non_residential_property_value,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+other_investment_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+other_residential_property_value,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+owned_land,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+pension_credit_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+pension_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+personal_pension_contributions,gov.economic_assumptions.yoy_growth.obr.average_earnings,0.064,0.069,0.047,0.037,0.022,0.021,0.023,0.025
+petrol_spending,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+pip_dl_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+pip_m_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+private_pension_income,gov.economic_assumptions.yoy_growth.obr.private_pension_index,0.05,0.05,0.05,0.047,0.037,0.022,0.021,0.023
+private_transfer_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+property_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+recreation_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+rent,gov.economic_assumptions.yoy_growth.obr.rent,0.04,0.063,0.074,0.057,0.036,0.027,0.023,0.024
+restaurants_and_hotels_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+savings,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+savings_interest_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+sda_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+self_employment_income,gov.economic_assumptions.yoy_growth.obr.per_capita.mixed_income,0.063,0.024,0.048,0.047,0.031,0.031,0.036,0.038
+state_pension,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+state_pension_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+statutory_maternity_pay,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+statutory_paternity_pay,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+statutory_sick_pay,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+student_loan_repayments,gov.economic_assumptions.yoy_growth.obr.average_earnings,0.064,0.069,0.047,0.037,0.022,0.021,0.023,0.025
+sublet_income,gov.economic_assumptions.yoy_growth.obr.per_capita.gdp,0.092,0.05,0.038,0.028,0.028,0.031,0.033,0.033
+transport_consumption,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+universal_credit_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+winter_fuel_allowance_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02
+working_tax_credit_reported,gov.economic_assumptions.yoy_growth.obr.consumer_price_index,0.1,0.057,0.023,0.032,0.019,0.02,0.02,0.02

policyengine_uk/parameters/gov/benefit_uprating_cpi.yaml

@@ -1,6 +1,7 @@
 description: Most recent September CPIH index value, updated for each uprating occurrence (2005=100)
 values:
   2005-01-01: 100
+  2010-01-01: 114.48
 metadata:
   label: Benefit uprating index
-  uprating: gov.obr.consumer_price_index
+  uprating: gov.economic_assumptions.indices.obr.consumer_price_index

policyengine_uk/parameters/gov/contrib/create_private_pension_uprating.py

@@ -3,28 +3,24 @@ from policyengine_core.parameters import (
     Parameter,
 )
 
-YEARS = list(range(2010, 2035))
+YEARS = list(range(2020, 2035))
 
 
 def add_private_pension_uprating_factor(
     parameters: ParameterNode,
 ) -> ParameterNode:
     values = {}
-    rpi = parameters.gov.obr.rpi
-    last_value = rpi(2008)
+    rpi = parameters.gov.economic_assumptions.yoy_growth.obr.rpi
     for year in YEARS:
-        value = rpi(year - 1)
-        rel_change = value / rpi(year - 2)
-        rel_change = min(rel_change, 1.05)
-        new_index = last_value * rel_change
-        last_value = new_index
-        values[f"{year}-01-01"] = new_index
+        values[f"{year}-01-01"] = min(rpi(year - 1), 0.05)
     new_parameter = Parameter(
-        "gov.obr.private_pension_index",
+        "gov.economic_assumptions.yoy_growth.obr.private_pension_index",
         data={
             "values": values,
         },
     )
 
-    parameters.gov.obr.add_child("private_pension_index", new_parameter)
+    parameters.gov.economic_assumptions.yoy_growth.obr.add_child(
+        "private_pension_index", new_parameter
+    )
     return parameters

policyengine_uk/parameters/gov/dwp/IIDB/maximum.yaml

@@ -6,7 +6,7 @@ metadata:
   label: Industrial Injuries Disablement Benefit maximum
   reference: https://www.gov.uk/industrial-injuries-disablement-benefit/what-youll-get
   unit: currency-GBP
-  uprating: gov.obr.consumer_price_index
+  uprating: gov.economic_assumptions.indices.obr.consumer_price_index
 values:
   2015-04-01: 182
   2025-04-01: 

policyengine_uk/parameters/gov/dwp/state_pension/basic_state_pension/amount.yaml

@@ -27,7 +27,7 @@ values:
 metadata:
   unit: currency-GBP
   label: basic State Pension amount
-  uprating: gov.dwp.state_pension.triple_lock.index
+  uprating: gov.economic_assumptions.indices.triple_lock
   reference:
     - title: House of Commons Library
       href: https://researchbriefings.files.parliament.uk/documents/SN05649/SN05649.pdf

policyengine_uk/parameters/gov/dwp/state_pension/new_state_pension/amount.yaml

@@ -13,7 +13,7 @@ values:
 metadata:
   unit: currency-GBP
   label: New State Pension amount
-  uprating: gov.dwp.state_pension.triple_lock.index
+  uprating: gov.economic_assumptions.indices.triple_lock
   reference:
     - title: House of Commons Library
       href: https://researchbriefings.files.parliament.uk/documents/SN05649/SN05649.pdf

policyengine_uk/parameters/gov/dwp/state_pension/triple_lock/create_triple_lock.py

@@ -8,29 +8,37 @@ YEARS = list(range(2022, 2035))
 
 
 def add_triple_lock(parameters: ParameterNode) -> ParameterNode:
-    average_earnings = parameters.gov.obr.average_earnings
-    cpi = parameters.gov.obr.consumer_price_index
-    min_rate = parameters.gov.dwp.state_pension.triple_lock.minimum_rate
+    obr = parameters.gov.economic_assumptions.yoy_growth.obr
+    average_earnings = obr.average_earnings
+    cpi = obr.consumer_price_index
+    triple_lock = parameters.gov.dwp.state_pension.triple_lock
+    min_rate = triple_lock.minimum_rate
 
     values = {}
 
-    index = 1
-
     for year in YEARS:
-        earnings_increase = average_earnings(year - 1) / average_earnings(
-            year - 2
-        )
-        cpi_increase = cpi(year - 1) / cpi(year - 2)
+        earnings_increase = average_earnings(year - 1)
+        cpi_increase = cpi(year - 1)
         min_rate_y = min_rate(year)
-        triple_lock_increase = max(earnings_increase, cpi_increase, min_rate_y)
-        index *= triple_lock_increase
-        values[f"{year}-01-01"] = round(index, 3)
+        if triple_lock.include_earnings(
+            year
+        ) and triple_lock.include_inflation(year):
+            triple_lock_increase = max(
+                earnings_increase, cpi_increase, min_rate_y
+            )
+        elif triple_lock.include_earnings(year):
+            triple_lock_increase = max(earnings_increase, min_rate_y)
+        elif triple_lock.include_inflation(year):
+            triple_lock_increase = max(cpi_increase, min_rate_y)
+        else:
+            triple_lock_increase = min_rate_y
+        values[f"{year}-01-01"] = round(triple_lock_increase, 3)
 
     new_parameter = Parameter(
-        "gov.dwp.state_pension.triple_lock.index",
+        "gov.economic_assumptions.yoy_growth.triple_lock",
         data={"values": values, "metadata": {"unit": "/1"}},
     )
-    parameters.gov.dwp.state_pension.triple_lock.add_child(
-        "index", new_parameter
+    parameters.gov.economic_assumptions.yoy_growth.add_child(
+        "triple_lock", new_parameter
     )
     return parameters

policyengine_uk/parameters/gov/dwp/state_pension/triple_lock/include_earnings.yaml

@@ -0,0 +1,8 @@
+description: Whether the triple lock should include average earnings.
+values:
+  2012-01-01: true
+  2022-01-01: false
+  2023-01-01: true
+metadata:
+  unit: bool
+  label: include average earnings in triple lock

policyengine_uk/parameters/gov/dwp/state_pension/triple_lock/include_inflation.yaml

@@ -0,0 +1,6 @@
+description: Whether the triple lock should include inflation.
+values:
+  2012-01-01: true
+metadata:
+  unit: bool
+  label: include inflation in triple lock

policyengine_uk/parameters/gov/economic_assumptions/create_economic_assumption_indices.py

@@ -0,0 +1,64 @@
+from policyengine_core.parameters import (
+    ParameterNode,
+    Parameter,
+    get_parameter,
+)
+
+
+def create_economic_assumption_indices(
+    parameters: ParameterNode,
+) -> ParameterNode:
+    econ_assumptions: ParameterNode = parameters.gov.economic_assumptions
+    yoy_growth: ParameterNode = econ_assumptions.yoy_growth
+    indices = ParameterNode(
+        name="gov.economic_assumptions.indices",
+        data={},
+    )
+    econ_assumptions.add_child(
+        "indices",
+        indices,
+    )
+
+    for descendant in yoy_growth.get_descendants():
+        parent_node = parameters.get_child(
+            descendant.parent.name.replace("yoy_growth", "indices")
+        )
+        full_name = descendant.name
+        child_name = full_name.split(".")[-1]
+        if isinstance(descendant, ParameterNode):
+            mirror_node = ParameterNode(
+                name=descendant.name.replace("yoy_growth", "indices"),
+                data={},
+            )
+            parent_node.add_child(
+                child_name,
+                mirror_node,
+            )
+        else:
+            start_year = int(descendant.values_list[-1].instant_str[:4])
+            values = {start_year: 1.0}
+
+            for year in range(start_year + 1, 2030):
+                yoy_growth = descendant(year)
+                indices_value = round(
+                    values[year - 1] * (1 + yoy_growth),
+                    5,
+                )
+                values[year] = indices_value
+
+            mirror_parameter = Parameter(
+                name=descendant.name.replace("yoy_growth", "indices"),
+                data={
+                    "values": {
+                        f"{year}-01-01": value
+                        for year, value in values.items()
+                    },
+                },
+            )
+
+            parent_node.add_child(
+                child_name,
+                mirror_parameter,
+            )
+
+    return parameters