policyengine-uk 2.45.4__py3-none-any.whl → 2.47.2__py3-none-any.whl

policyengine_uk/tests/microsimulation/update_reform_impacts.py

@@ -8,6 +8,18 @@ from pathlib import Path
 from policyengine_uk import Microsimulation
 import argparse
 from datetime import datetime
+from rich.console import Console
+from rich.table import Table
+from rich.progress import (
+    Progress,
+    SpinnerColumn,
+    TextColumn,
+    BarColumn,
+    TaskProgressColumn,
+)
+from rich.panel import Panel
+from rich import print as rprint
+import traceback
 
 baseline = Microsimulation()
 
@@ -40,57 +52,97 @@ def update_impacts(
         dry_run: If True, show changes without writing to file
         verbose: If True, show detailed output
     """
+    console = Console()
+
     # Load current configuration
     with open(config_path, "r") as f:
         config = yaml.safe_load(f)
 
     if verbose:
-        print(f"Loaded configuration from {config_path}")
-        print(f"Found {len(config['reforms'])} reforms to update\n")
+        console.print(
+            Panel.fit(
+                f"[bold cyan]Loaded configuration from {config_path}[/bold cyan]\n"
+                f"[green]Found {len(config['reforms'])} reforms to update[/green]",
+                title="Configuration loaded",
+            )
+        )
 
     # Track changes
     changes = []
 
-    # Update each reform's expected impact
-    for reform in config["reforms"]:
-        print(f"Processing reform: {reform['name']}") if verbose else None
-        old_impact = reform["expected_impact"]
-        new_impact = round(get_fiscal_impact(reform["parameters"]), 1)
-
-        if (
-            abs(old_impact - new_impact) > 0.01
-        ):  # Only record meaningful changes
-            changes.append(
-                {
-                    "name": reform["name"],
-                    "old": old_impact,
-                    "new": new_impact,
-                    "diff": new_impact - old_impact,
-                }
-            )
-
-        reform["expected_impact"] = new_impact
+    # Update each reform's expected impact with progress bar
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        BarColumn(),
+        TaskProgressColumn(),
+        console=console,
+    ) as progress:
+        task = progress.add_task(
+            "[cyan]Processing reforms...", total=len(config["reforms"])
+        )
 
-        if verbose:
-            print(f"Reform: {reform['name']}")
-            print(f"  Old impact: {old_impact:.1f} billion")
-            print(f"  New impact: {new_impact:.1f} billion")
-            if abs(old_impact - new_impact) > 0.01:
-                print(f"  Change: {new_impact - old_impact:+.1f} billion")
-            print()
+        for reform in config["reforms"]:
+            progress.update(
+                task, description=f"[cyan]Processing: {reform['name'][:40]}..."
+            )
+            old_impact = reform["expected_impact"]
+            new_impact = round(get_fiscal_impact(reform["parameters"]), 1)
+
+            if (
+                abs(old_impact - new_impact) > 0.01
+            ):  # Only record meaningful changes
+                changes.append(
+                    {
+                        "name": reform["name"],
+                        "old": old_impact,
+                        "new": new_impact,
+                        "diff": new_impact - old_impact,
+                    }
+                )
+
+            reform["expected_impact"] = new_impact
+            progress.advance(task)
+
+    # Show detailed output if verbose
+    if verbose and changes:
+        console.print("\n[bold]Detailed changes:[/bold]")
+        for change in changes:
+            color = "red" if change["diff"] < 0 else "green"
+            console.print(
+                f"  [yellow]{change['name']}[/yellow]\n"
+                f"    Old impact: [dim]{change['old']:.1f} billion[/dim]\n"
+                f"    New impact: [bold]{change['new']:.1f} billion[/bold]\n"
+                f"    Change: [{color}]{change['diff']:+.1f} billion[/{color}]\n"
+            )
 
     # Show summary of changes
     if changes:
-        print("\nSummary of changes:")
-        print("-" * 70)
+        table = Table(
+            title="Summary of changes",
+            show_header=True,
+            header_style="bold magenta",
+        )
+        table.add_column("Reform", style="cyan", no_wrap=False)
+        table.add_column("Old impact (£bn)", justify="right")
+        table.add_column("New impact (£bn)", justify="right")
+        table.add_column("Change (£bn)", justify="right")
+
         for change in changes:
-            print(
-                f"{change['name']:<50} {change['old']:>6.1f} → {change['new']:>6.1f} ({change['diff']:+.1f})"
+            color = "red" if change["diff"] < 0 else "green"
+            table.add_row(
+                change["name"],
+                f"{change['old']:.1f}",
+                f"{change['new']:.1f}",
+                f"[{color}]{change['diff']:+.1f}[/{color}]",
             )
-        print("-" * 70)
-        print(f"Total changes: {len(changes)}")
+
+        console.print("\n", table)
+        console.print(
+            f"\n[bold cyan]Total changes: {len(changes)}[/bold cyan]"
+        )
     else:
-        print("\nNo significant changes detected.")
+        console.print("\n[green]✓ No significant changes detected.[/green]")
 
     # Write updated configuration
     if not dry_run:
@@ -109,13 +161,22 @@ def update_impacts(
         with open(config_path, "w") as f:
             yaml.dump(config, f, default_flow_style=False, sort_keys=False)
 
-        print(f"\nConfiguration updated successfully!")
-        print(f"Backup saved to: {backup_path}")
+        console.print(
+            Panel.fit(
+                f"[green]✓ Configuration updated successfully![/green]\n"
+                f"[dim]Backup saved to: {backup_path}[/dim]",
+                title="Success",
+                border_style="green",
+            )
+        )
     else:
-        print("\nDry run - no changes written to file.")
+        console.print(
+            "\n[yellow]⚠ Dry run - no changes written to file.[/yellow]"
+        )
 
 
 def main():
+    console = Console()
     parser = argparse.ArgumentParser(
         description="Update reform impact expectations with current model values"
     )
@@ -143,14 +204,17 @@ def main():
     args = parser.parse_args()
 
     if not args.config.exists():
-        print(f"Error: Configuration file '{args.config}' not found!")
+        console.print(
+            f"[bold red]Error:[/bold red] Configuration file '{args.config}' not found!"
+        )
         return 1
 
     try:
         update_impacts(args.config, dry_run=args.dry_run, verbose=args.verbose)
         return 0
     except Exception as e:
-        print(f"Error updating impacts: {e}")
+        console.print(f"[bold red]Error updating impacts:[/bold red] {e}")
+        console.print(traceback.format_exc())
         return 1
 
 

policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement.yaml

@@ -1,6 +1,6 @@
 - name: Eligible for 30 hours - All conditions met
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 3
   input:
     people:
       child1:
@@ -14,7 +14,7 @@
 
 - name: Eligible for 15 hours - All first conditions met
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 2
   input:
     people:
       child1:
@@ -42,7 +42,7 @@
 
 - name: Eligible for mixed hours - Family with multiple children
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 4
   input:
     people:
       child1:
@@ -74,7 +74,7 @@
 
 - name: Eligible with one working parent and one disabled parent
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 6
   input:
     people:
       child1:
@@ -107,7 +107,7 @@
 
 - name: Child using fewer hours than maximum entitlement
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 2
   input:
     people:
       child1:
@@ -122,7 +122,7 @@
 
 - name: Child using fewer hours than maximum entitlement - multiple children
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 2
   input:
     people:
       child1:
@@ -140,7 +140,7 @@
 
 - name: Benefit unit maximum hours cap applied
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 5
   input:
     people:
       child1:
@@ -177,7 +177,7 @@
 
 - name: Benefit unit without maximum hours cap applied with 3 years old child
   period: 2025
-  absolute_error_margin: 1
+  absolute_error_margin: 2
   input:
     people:
       child1:

policyengine_uk/utils/__init__.py

@@ -0,0 +1 @@
+from .compare import compare_simulations

policyengine_uk/utils/compare.py

@@ -0,0 +1,28 @@
+import pandas as pd
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from policyengine_uk.simulation import Microsimulation
+
+
+def compare_simulations(
+    simulations: list["Microsimulation"],
+    names: list[str],
+    year: int,
+    variables: list[str],
+):
+    dfs = [
+        sim.calculate_dataframe(variables, year).rename(
+            columns=lambda x: f"{x}_{name}"
+        )
+        for sim, name in zip(simulations, names)
+    ]
+
+    df = pd.concat(dfs, axis=1).reset_index().rename(columns={"index": "id"})
+
+    # Sort columns by variable
+    columns = []
+    for var in variables:
+        columns.extend([col for col in df.columns if col.startswith(var)])
+
+    return df[columns]

policyengine_uk/utils/solve_private_school_attendance_factor.py

@@ -1,4 +1,4 @@
-from policyengine import Simulation
+from policyengine_uk import Microsimulation
 from policyengine_core.reforms import Reform
 from tqdm import tqdm
 
@@ -19,11 +19,9 @@ for factor in tqdm([round(x * 0.01, 2) for x in range(70, 91)]):
     }
 
     # Run the reformed microsimulation
-    reformed = Simulation(
-        scope="macro",
-        baseline=reform,
-        country="uk",
-    ).baseline_simulation
+    reformed = Microsimulation(
+        reform=reform,
+    )
     reformed.baseline_simulation.get_holder(
         "attends_private_school"
     ).delete_arrays()

policyengine_uk/variables/gov/dwp/additional_state_pension.py

@@ -13,7 +13,7 @@ class additional_state_pension(Variable):
         if simulation.dataset is None:
             return 0
 
-        data_year = simulation.dataset.time_period
+        data_year = 2023
         reported = person("state_pension_reported", data_year) / WEEKS_IN_YEAR
         type = person("state_pension_type", data_year)
         maximum_basic_sp = parameters(

policyengine_uk/variables/gov/dwp/basic_state_pension.py

@@ -13,7 +13,7 @@ class basic_state_pension(Variable):
         if simulation.dataset is None:
             return 0
 
-        data_year = simulation.dataset.time_period
+        data_year = 2023
         reported = person("state_pension_reported", data_year) / WEEKS_IN_YEAR
         type = person("state_pension_type", period)
         maximum_basic_sp = parameters(

policyengine_uk/variables/household/demographic/benunit/benunit_count_adults.py

@@ -0,0 +1,11 @@
+from policyengine_uk.model_api import *
+
+
+class benunit_count_adults(Variable):
+    value_type = int
+    entity = BenUnit
+    label = "number of adults in the benefit unit"
+    definition_period = YEAR
+
+    def formula(benunit, period, parameters):
+        return add(benunit, period, ["is_adult"])

policyengine_uk/variables/input/consumption/property/council_tax.py

@@ -9,38 +9,3 @@ class council_tax(Variable):
     definition_period = YEAR
     unit = GBP
     quantity_type = FLOW
-
-    def formula(household, period, parameters):
-        if period.start.year < 2023:
-            # We don't have growth rates for council tax by nation before this.
-            return 0
-
-        if household.simulation.dataset is None:
-            return 0
-
-        data_year = household.simulation.dataset.time_period
-
-        original_ct = household("council_tax", data_year)
-
-        ct = parameters.gov.economic_assumptions.indices.obr.council_tax
-
-        def get_growth(country):
-            param = getattr(ct, country)
-            return param(period.start.year) / param(data_year)
-
-        country = household("country", period).decode_to_str()
-
-        return select(
-            [
-                country == "ENGLAND",
-                country == "WALES",
-                country == "SCOTLAND",
-                True,
-            ],
-            [
-                original_ct * get_growth("england"),
-                original_ct * get_growth("wales"),
-                original_ct * get_growth("scotland"),
-                original_ct,
-            ],
-        )

policyengine_uk/variables/input/rent.py

@@ -11,43 +11,3 @@ class rent(Variable):
     value_type = float
     unit = GBP
     quantity_type = FLOW
-
-    def formula(household, period, parameters):
-        if period.start.year < 2023:
-            # We don't have growth rates for rent before this.
-            return 0
-
-        if household.simulation.dataset is None:
-            return 0
-
-        data_year = household.simulation.dataset.time_period
-        original_rent = household("rent", data_year)
-        tenure_type = household("tenure_type", period).decode_to_str()
-
-        is_social_rent = (tenure_type == "RENT_FROM_COUNCIL") | (
-            tenure_type == "RENT_FROM_HA"
-        )
-
-        is_private_rent = tenure_type == "RENT_PRIVATELY"
-
-        obr = parameters.gov.economic_assumptions.indices.obr
-
-        private_rent_uprating = obr.lagged_average_earnings(
-            period
-        ) / obr.lagged_average_earnings(data_year)
-        social_rent_uprating = obr.social_rent(period) / obr.social_rent(
-            data_year
-        )
-
-        return select(
-            [
-                is_social_rent,
-                is_private_rent,
-                True,
-            ],
-            [
-                original_rent * social_rent_uprating,
-                original_rent * private_rent_uprating,
-                original_rent,
-            ],
-        )

{policyengine_uk-2.45.4.dist-info → policyengine_uk-2.47.2.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: policyengine-uk
-Version: 2.45.4
-Summary: PolicyEngine tax and benefit system for the UK
+Version: 2.47.2
+Summary: PolicyEngine tax and benefit system for the UK.
 Project-URL: Homepage, https://github.com/PolicyEngine/policyengine-uk
 Project-URL: Repository, https://github.com/PolicyEngine/policyengine-uk
 Project-URL: Issues, https://github.com/PolicyEngine/policyengine-uk/issues
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
-Requires-Python: >=3.10
+Requires-Python: >=3.13
 Requires-Dist: microdf-python>=1.0.2
 Requires-Dist: policyengine-core>=3.19.3
 Requires-Dist: pydantic>=2.11.7
@@ -28,10 +28,11 @@ Provides-Extra: dev
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: coverage; extra == 'dev'
 Requires-Dist: furo<2023; extra == 'dev'
-Requires-Dist: jupyter-book; extra == 'dev'
+Requires-Dist: jupyter-book>=2.0.0a0; extra == 'dev'
 Requires-Dist: linecheck; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
+Requires-Dist: rich; extra == 'dev'
 Requires-Dist: setuptools; extra == 'dev'
 Requires-Dist: snowballstemmer<3,>=2; extra == 'dev'
 Requires-Dist: sphinx-argparse<1,>=0.3.2; extra == 'dev'

{policyengine_uk-2.45.4.dist-info → policyengine_uk-2.47.2.dist-info}/RECORD

@@ -1,15 +1,18 @@
-policyengine_uk/__init__.py,sha256=ud1uvjBep-lcZKBWUd0eo-PAT_FM92_PqUlDp5OYl4g,355
+policyengine_uk/__init__.py,sha256=unX9Z-eloDZK6yQJKXRRDL31k1ItKP-gpMl0AY6xZZU,380
 policyengine_uk/entities.py,sha256=9yUbkUWQr3WydNE-gHhUudG97HGyXIZY3dkgQ6Z3t9A,1212
-policyengine_uk/microsimulation.py,sha256=k2u8v6TlHiu8hO5gCjd8-qOsfzorCnjrKfnvs8cbGOc,2676
+policyengine_uk/microsimulation.py,sha256=WskrrDrLGfDYwS1CzFk5rJkQSQlTknLkxFufStKRpxc,3379
 policyengine_uk/model_api.py,sha256=KdwJCL2HkXVxDpL6fCsCnQ9Sub6Kqp7Hyxlis3MNIx4,241
 policyengine_uk/modelled_policies.yaml,sha256=TLhvmkuI9ip-Fjq63n66RzDErCkN8K4BzY6XLxLMtFg,463
-policyengine_uk/simulation.py,sha256=laMnITFnpWqrx1h6F_0WTfjKOiNAsrH9d9obQmrQ0k8,15215
+policyengine_uk/simulation.py,sha256=GaN8ZC7bZVTRzP7Np-PfUiX60F6dKszdTrNhXe_OLuU,21186
 policyengine_uk/system.py,sha256=Z-ax_ImUq5k4tycuThczTxQNW5iTE6ikBJIBQdKfIzU,91
-policyengine_uk/tax_benefit_system.py,sha256=7d5zITUezBcVw9AGvwXsE2Tb_AN-3HY4jMcueFRFaD4,5096
+policyengine_uk/tax_benefit_system.py,sha256=CjX1lERyOm_vlgHQcQO92HZtJiwItLH-MxJveJqk6iM,5165
 policyengine_uk/data/__init__.py,sha256=J0bZ3WnvPzZ4qfVLYcwOc4lziMUMdbcMqJ3xwjoekbM,101
-policyengine_uk/data/dataset_schema.py,sha256=e4ST_kHSdlwX7Fd8rO5MRr2kXMejIJGXb0mUlKlVnEE,9912
-policyengine_uk/data/economic_assumptions.py,sha256=A0lJpaAORE3fyBHAo2CbKRuio6HYlnq3KyFvypqvIfg,6239
+policyengine_uk/data/dataset_schema.py,sha256=781beGVnPWJhw2FzcG6he-LtmgxtwS1h6keAz7TPoXI,10036
+policyengine_uk/data/economic_assumptions.py,sha256=U3wyBs4zVI5-bcMB-GivELC1qG-895l5NPds3cuWb90,6239
 policyengine_uk/data/uprating_indices.yaml,sha256=kQtfeGWyqge4dbJhs0iF4kTMqovuegill_Zfs8orJi4,2394
+policyengine_uk/dynamics/labour_supply.py,sha256=0yVMDWjq8fUxHVuhL51zjrz0Ac69T8g69OoVLrJQ8sA,10785
+policyengine_uk/dynamics/participation.py,sha256=g5xUqg-Nj2lQny9GrUfI2D_swLx0-9k-486NXtcWwbM,23238
+policyengine_uk/dynamics/progression.py,sha256=4Wl3ZE-bYxNTMVGeOGFh22lYtHGPCarrhp8JzuLQs7I,13738
 policyengine_uk/parameters/gov/README.md,sha256=bHUep1_2pLHD3Or8SwjStOWXDIbW9OuYxOd4ml8IXcM,13
 policyengine_uk/parameters/gov/benefit_uprating_cpi.yaml,sha256=2zOSdJeUhDZYYsKE2vLkcK-UbKNoOSVwfac0QIAp02g,250
 policyengine_uk/parameters/gov/contrib/README.md,sha256=b282dmUFAmj7cXSfiMLyE81q5Y0Gnehy-6atLus-ESs,70
@@ -316,10 +319,11 @@ policyengine_uk/parameters/gov/dwp/winter_fuel_payment/eligibility/require_benef
 policyengine_uk/parameters/gov/dwp/winter_fuel_payment/eligibility/state_pension_age_requirement.yaml,sha256=8wXlC5wX-ceoZ-s2kOk4IhAiomsXSCM-vnRRbL2kChA,356
 policyengine_uk/parameters/gov/dwp/winter_fuel_payment/eligibility/taxable_income_test/maximum_taxable_income.yaml,sha256=vtXLTgcLg1tmvnsbmJUv45maVEzzKQTWK-lFYTGzuVk,280
 policyengine_uk/parameters/gov/dwp/winter_fuel_payment/eligibility/taxable_income_test/use_maximum_taxable_income.yaml,sha256=MKnXmHJaDJbpO-mLemudo5n-yQMCByuVwUtlxItOvjg,280
+policyengine_uk/parameters/gov/dynamic/obr_labour_supply_assumptions.yaml,sha256=lD3jXWlRh39SCms6pRto51OhWT2YiUeMMI2_gi7SUJg,316
 policyengine_uk/parameters/gov/economic_assumptions/create_economic_assumption_indices.py,sha256=uxJy4X30P8NRSL7dH757bgpPANMdf5efar8Bu7uR78w,1937
 policyengine_uk/parameters/gov/economic_assumptions/lag_average_earnings.py,sha256=ksHcyUQkLAJmKizCeSg8j0hzPc7ajgIvbExWLgCra4U,701
 policyengine_uk/parameters/gov/economic_assumptions/lag_cpi.py,sha256=IdtaMLN1_OSu-RFZsQV8vBlbOvXsPlnNlsOuinRHrxg,642
-policyengine_uk/parameters/gov/economic_assumptions/yoy_growth.yaml,sha256=k2xxY4YvioJ0agEOHwebcEWVwQbgePrnXO1dvogGWCs,17673
+policyengine_uk/parameters/gov/economic_assumptions/yoy_growth.yaml,sha256=hZtw6qxYnvvk51a050q9rKBvstjbmpN4azh5HEZkP_E,23714
 policyengine_uk/parameters/gov/hmrc/README.md,sha256=nkHVZl6lsjI93sR8uC7wAbul3_61wJrsP08iaW8f5lk,7
 policyengine_uk/parameters/gov/hmrc/minimum_wage.yaml,sha256=1oMbevU0ESHR51mcAG39POd1DA1FgPUep4hL6ojj-P4,2049
 policyengine_uk/parameters/gov/hmrc/business_rates/README.md,sha256=9ud50i_gMjGj6VymF-nzFDTzkFRMMJx6ybpLwbWzvpI,17
@@ -539,10 +543,10 @@ policyengine_uk/scenarios/uc_reform.py,sha256=WPYKGBY_V7A0pQPxDM0lOYTR9GoLrF-iEm
 policyengine_uk/tests/test_parameter_metadata.py,sha256=_2w2dSokAf5Jskye_KIL8eh80N7yIrUszlmqnZtwQws,450
 policyengine_uk/tests/code_health/test_variables.py,sha256=9Y-KpmzhyRGy9eEqocK9z91NXHX5QIF3mDMNGvegb7Q,1398
 policyengine_uk/tests/microsimulation/README.md,sha256=1toB1Z06ynlUielTrsAaeo9Vb-c3ZrB3tbbR4E1xUGk,3924
-policyengine_uk/tests/microsimulation/reforms_config.yaml,sha256=QShPK-XzuTQcyxc4j16RCUJYPV--BCe_-AyRNQfyvPY,1086
+policyengine_uk/tests/microsimulation/reforms_config.yaml,sha256=Kh1WlLAEmYbYgpiyrfD7VkT0oMf8a9lsCHLAa8mGuKY,1086
 policyengine_uk/tests/microsimulation/test_reform_impacts.py,sha256=xM3M2pclEhA9JIFpnuiPMy1fEBFOKcSzroRPk73FPls,2635
-policyengine_uk/tests/microsimulation/test_validity.py,sha256=RWhbSKrnrZCNQRVmGYlM8hnpe1_Blo5_xP8vr8u3kV0,694
-policyengine_uk/tests/microsimulation/update_reform_impacts.py,sha256=2pxp2RNLWxV4CesGKKHmg3qBs79Jq2Jcq3GJIBk4euU,4824
+policyengine_uk/tests/microsimulation/test_validity.py,sha256=_mHgrNu-hKzVd9V2GSg_yPQgJctxRzdQM7lM2bUvqNY,636
+policyengine_uk/tests/microsimulation/update_reform_impacts.py,sha256=4m5EpPu4SXTE3qOPkx3eIZnlaOzprfm6GmMCXETZuLk,6890
 policyengine_uk/tests/policy/baseline/consumption/rent/benunit_is_rent_liable.yaml,sha256=-PzGFSa2eY5Q7cWUUeqVhXosPDnbAemLN8AUZqcfP2I,210
 policyengine_uk/tests/policy/baseline/consumption/rent/rent.yaml,sha256=s_tB77yXF-cn6G0FtIRtsGI9bW6kraLd4qZAesqX9Uw,130
 policyengine_uk/tests/policy/baseline/contrib/labour/attends_private_school.yaml,sha256=YuZY1R3jMdnKbBR9j613RsapE20ukcEJuaxoEklpuBw,1011
@@ -609,7 +613,7 @@ policyengine_uk/tests/policy/baseline/gov/dcms/bbc/tv_licence_discount.yaml,sha2
 policyengine_uk/tests/policy/baseline/gov/dcms/bbc/tv-licence/tv_licence.yaml,sha256=cYAZlmmoAxWymv7L0lDzPcX6dexNAERQnVQMOB0HVzE,562
 policyengine_uk/tests/policy/baseline/gov/dfe/care_to_learn/care_to_learn.yaml,sha256=i5RIghjT2T7uWn_xvaeYb2dIJ7JsreSr_f12UPtFqpg,508
 policyengine_uk/tests/policy/baseline/gov/dfe/care_to_learn/care_to_learn_eligible.yaml,sha256=XPeMlYk3ibEpT6GgVzVk_IPnsTHLDzM4mlcru1jwA-k,3745
-policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement.yaml,sha256=y7FkeyrU7NQQbA_JZAkuGflWmyM4Cbh1a_fIQhXHQxM,4727
+policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement.yaml,sha256=ZjA7nN4-sAI3GtM7jxBOgl0qU9_e-cRWz_I6IlhjU2M,4727
 policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_eligible.yaml,sha256=fE6Cm9K0xQsTWrFS90lrVa8pgwC8gdpGtmttBgLsZhw,4305
 policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_income_condition.yaml,sha256=5PihH858DmLIkWZTrDMuqF9X9PXCzejffjbKc_LhZPI,1250
 policyengine_uk/tests/policy/baseline/gov/dfe/extended_childcare_entitlement/extended_childcare_entitlement_work_condition.yaml,sha256=7KmrVQddB70kbtn2TbdJ8q2ER58H9GhAJmeak0sODoE,2300
@@ -693,13 +697,14 @@ policyengine_uk/tests/policy/reforms/parametric/two_child_limit/__init__.py,sha2
 policyengine_uk/tests/policy/reforms/parametric/two_child_limit/age_exemption.yaml,sha256=mlNyZewO9LCsVoKCFnhvLVWKaROnaD5TvStmN9ugfUI,3382
 policyengine_uk/tests/policy/reforms/parametric/two_child_limit/ctc_age_exemption.yaml,sha256=xOgctFi4eLVW7agHdRPUU9szoRzt4p0R9eiMvPqwv_s,3577
 policyengine_uk/tests/policy/reforms/parametric/winter_fuel_allowance/taxable_income_test.yaml,sha256=QY3LYJ92VzYH9mXU54XD_6PhefwHNK80kGYQ0R5I0SM,6289
-policyengine_uk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+policyengine_uk/utils/__init__.py,sha256=3c4PdgyrexqRqqkACZxyNNbhKduhuYZmzUWm6t1CkLc,41
+policyengine_uk/utils/compare.py,sha256=mhHOiwYoj_lteA0uActRtO9y_Zd7cqUPVgVmBfx4u5o,697
 policyengine_uk/utils/create_ahc_deflator.py,sha256=7GvhywFiUMSsh0syBd-A2MVBr-HU6t4RIuqSgMTyZEw,5463
 policyengine_uk/utils/create_triple_lock.py,sha256=-LpKwztjcDaNYd3RpnMiwxAm48RWsvw0NY9wG6gXIYw,952
 policyengine_uk/utils/dependencies.py,sha256=8epKWmZBeHnxqh3j0sb-Wl3Of_OdKNX-p1syLowUcWs,8197
 policyengine_uk/utils/parameters.py,sha256=OQTzTkHMdwbphCo0mV7_n_FJT0rdwIKNFTsk_lsdETE,1301
 policyengine_uk/utils/scenario.py,sha256=snA0HNfHqMQGjB35vo0hns4dPduCImGPvlGVAXxx85M,6751
-policyengine_uk/utils/solve_private_school_attendance_factor.py,sha256=LUZCgHKAQTY5qHlGJutn7pOFUWT0AP16YcJy-YUjQ3Q,1609
+policyengine_uk/utils/solve_private_school_attendance_factor.py,sha256=RIpxsT6OKhLlNCX5ielTRr2ZkPQOfPpg9AbP062iWh4,1555
 policyengine_uk/utils/water/README.md,sha256=sdBI-JZ-jcRoSUfwNx5wjv5Ig_nM8OPvvjSsSMs_Wh8,443
 policyengine_uk/utils/water/forecast_water_bills.py,sha256=B4vtfJuR8XfBP-KHGyhRp2Oo7X7buN-lDH6tBIXqE2U,2788
 policyengine_uk/variables/contrib/cec/non_primary_residence_wealth_tax.py,sha256=Hx5HCHc9ioK6InqTgTt6fX9JwI0sroTLgPB5N5YCJz0,668
@@ -793,7 +798,7 @@ policyengine_uk/variables/gov/dwp/WTC_severely_disabled_element.py,sha256=2dbYIc
 policyengine_uk/variables/gov/dwp/WTC_worker_element.py,sha256=c1Lm5Ke8Gr30gXV2x-HCAwlcMO1aqy989kiZOMm5QlQ,595
 policyengine_uk/variables/gov/dwp/aa_category.py,sha256=mY_cgi6Sq4yROsop0Pix024Go6bMWAeYbN4xT5DrN1U,1032
 policyengine_uk/variables/gov/dwp/access_fund.py,sha256=A5qKLeuwBsvPVrNfQi9grBb-dFSX8XtnE-RB9heCnug,245
-policyengine_uk/variables/gov/dwp/additional_state_pension.py,sha256=l-0avxdT7pvqhn42nc-Fi3SZM4DSvpHvmTQKhAS0Vp4,872
+policyengine_uk/variables/gov/dwp/additional_state_pension.py,sha256=R_U1r3nA__kMTpBwWSl2UTAS1kpJVDhLgwmOi_KdK1Q,846
 policyengine_uk/variables/gov/dwp/adult_ema.py,sha256=M3VfIALFbILPhaOb6NeY3ffBg4HR-ASBuECvDRQPoVE,247
 policyengine_uk/variables/gov/dwp/afcs.py,sha256=rReaIh1KfrsZUyKRYFElTB_eLAge6zee1Yc5DRoBT7w,228
 policyengine_uk/variables/gov/dwp/afcs_reported.py,sha256=JueDBWlD1hhSedf8q54EdpqFDEgFdMpBwGWwrMTVDNE,293
@@ -803,7 +808,7 @@ policyengine_uk/variables/gov/dwp/attendance_allowance_reported.py,sha256=6RD4Nq
 policyengine_uk/variables/gov/dwp/baseline_ctc_entitlement.py,sha256=Z6aAfyDCvaepEX6PPfTdjQPwGgFnMhP4lpQjZ8P8AkE,445
 policyengine_uk/variables/gov/dwp/baseline_income_support_entitlement.py,sha256=TvcCQjTPbtvrbwWTUhaBPqZSiu93ys6qcoNU7S4kqRU,232
 policyengine_uk/variables/gov/dwp/baseline_wtc_entitlement.py,sha256=0BKhLGQAPlJBR6P7Yk28XFlyrFojCsVsFkJC00FMgkc,436
-policyengine_uk/variables/gov/dwp/basic_state_pension.py,sha256=g_HMjratM1DRmQH-Ys5EpdoeFXPR84y5BUnaKAfFsVc,1040
+policyengine_uk/variables/gov/dwp/basic_state_pension.py,sha256=FQbEQPDakKwTwnrQ3g9b6OWv29a_GNWK8kdkJtK34ek,1014
 policyengine_uk/variables/gov/dwp/benefit_cap.py,sha256=x6ad7zFYKX6jaNoXV8xj0Hql5O3HraXKZlFFmxYGuSU,1287
 policyengine_uk/variables/gov/dwp/benefit_cap_reduction.py,sha256=lbRftEtfkQQOt5ojhNnRYlinnDGiqTH9XwAd2fdR7Kg,777
 policyengine_uk/variables/gov/dwp/bsp.py,sha256=D8WzwacEe789RHAIvB5RYQ1NOq9nsoFMNhDPrvb4qM0,221
@@ -1240,6 +1245,7 @@ policyengine_uk/variables/household/demographic/severe_disability_premium.py,sha
 policyengine_uk/variables/household/demographic/tenure_type.py,sha256=9V40d4ihG6lQ1dZXFKNjVTwChDXvKGTOR3tUGkaMhEg,522
 policyengine_uk/variables/household/demographic/youngest_adult_age.py,sha256=_T_8VEyKCSq31Ho70SZZBpkqbeFBNFDeJ6G6Edrn_y0,425
 policyengine_uk/variables/household/demographic/youngest_child_age.py,sha256=6Tmhbiu8puCBQDYlWwxbpVRuddd7HkraDNyg1tuV5PE,425
+policyengine_uk/variables/household/demographic/benunit/benunit_count_adults.py,sha256=D82SiPCWFFQSYppWH5CPU6yfQVQ7h1SS4hYeAeYNeww,299
 policyengine_uk/variables/household/demographic/benunit/benunit_count_children.py,sha256=dvOsBE_tCtaWtsjY1NfOw29OvXgfFWTk1hhlLIdfgJE,303
 policyengine_uk/variables/household/income/base_net_income.py,sha256=9WcVGU3QbCJcIiSvVP65c0-fwhiiDKviqMGD-XKZvBQ,282
 policyengine_uk/variables/household/income/baseline_hbai_excluded_income.py,sha256=qlLnaZIPuX1n14HbsDOhUo5hHYFTFBoTp-qlUUj83Z0,638
@@ -1338,7 +1344,7 @@ policyengine_uk/variables/input/pip_m_category.py,sha256=UfgnVrg5p5bR5n1jdcJb8qo
 policyengine_uk/variables/input/private_pension_income.py,sha256=nquIdGsghUZtXY8nWCJM6qsd9zg9jCsuwiXPf3khYQk,473
 policyengine_uk/variables/input/private_transfer_income.py,sha256=gS8QXT__YKCHAqQWrupujXTre-INgJftup4Y_IpZIqw,329
 policyengine_uk/variables/input/property_income.py,sha256=o0JeFu77h9N8LWjlLDw55c8fRBrdcY5lWW_w0tGgnNA,413
-policyengine_uk/variables/input/rent.py,sha256=fUEjF0qkDfvniAPaT6FgoWlEVgH3fmIZuWcZlrYjVIQ,1521
+policyengine_uk/variables/input/rent.py,sha256=yurkmlodw9KB50FRGA0vCMS_hZ4hgNRjTgNg4IrVs5Q,296
 policyengine_uk/variables/input/savings_interest_income.py,sha256=B8AXrGGPl4MI9nvBaOKI-QYdm35qwNSVQxtpNWEosHA,448
 policyengine_uk/variables/input/self_employment_income.py,sha256=66eqP3jk3czOpmxA6wQOtsWM0Ll9lU2cw4_kuc7SgUA,492
 policyengine_uk/variables/input/state_pension.py,sha256=o4LrBumOYadV-lZ6NC5-3lvafkLVJ_RNKjTrclQA0N4,957
@@ -1362,7 +1368,7 @@ policyengine_uk/variables/input/consumption/recreation_consumption.py,sha256=47I
 policyengine_uk/variables/input/consumption/restaurants_and_hotels_consumption.py,sha256=plke30Xdy_zFvjqkXOhWtVdYqE8NfwMKnWaOD5n4IdM,464
 policyengine_uk/variables/input/consumption/transport_consumption.py,sha256=5JfmRMpap6GOGZwl0PIRyUJvDaZrQyelEUE9z61GAfI,425
 policyengine_uk/variables/input/consumption/property/README.md,sha256=IP9_pLLNXMHRMS5sEjRRqsM1nQMffQC2PJII-z-I6wI,11
-policyengine_uk/variables/input/consumption/property/council_tax.py,sha256=sGrFXHO9JWqlzChroCoZbQKnd2vhfysRVmeJxwg0zys,1360
+policyengine_uk/variables/input/consumption/property/council_tax.py,sha256=QtcI4JcufejJ-8MVqntcXYP5I_5YuhXeigo3eDkSmRA,291
 policyengine_uk/variables/input/consumption/property/cumulative_non_residential_rent.py,sha256=rhqlRphsTMSx2Xij-B9RjSZeuLTjAyt3sx2VK66Nkf8,338
 policyengine_uk/variables/input/consumption/property/cumulative_residential_rent.py,sha256=KMbISuubgfGaH34kJDe_tfOsKzVUHSJneDhyd-fLeI4,326
 policyengine_uk/variables/input/consumption/property/employee_pension_contributions.py,sha256=J8Ead71hjCZ0vktrl9MbMMgsPCWsdPWSTbVPsVYkgcU,293
@@ -1380,7 +1386,7 @@ policyengine_uk/variables/misc/spi_imputed.py,sha256=iPVlBF_TisM0rtKvO-3-PQ2UYCe
 policyengine_uk/variables/misc/uc_migrated.py,sha256=zFNcUJaO8gwmbL1iY9GKgUt3G6J9yrCraqBV_5dCvlM,306
 policyengine_uk/variables/misc/categories/lower_middle_or_higher.py,sha256=C54tHYz2DmOyvQYCC1bF8RJwRZinhAq_e3aYC-9F5fM,157
 policyengine_uk/variables/misc/categories/lower_or_higher.py,sha256=81NIbLLabRr9NwjpUZDuV8IV8_mqmp5NM-CZvt55TwE,129
-policyengine_uk-2.45.4.dist-info/METADATA,sha256=76Kz17OUMRmIFC-_BSoR4K2jqZJYz9Sl1H_Jt_cRd3Q,3919
-policyengine_uk-2.45.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_uk-2.45.4.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-policyengine_uk-2.45.4.dist-info/RECORD,,
+policyengine_uk-2.47.2.dist-info/METADATA,sha256=iKd-_31YEGeJA1CqRvD2CWN_36SR840qoYoPvFTLnrk,3965
+policyengine_uk-2.47.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_uk-2.47.2.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+policyengine_uk-2.47.2.dist-info/RECORD,,