policyengine 3.1.1__py3-none-any.whl → 3.1.2__py3-none-any.whl

policyengine/core/__init__.py

@@ -1,4 +1,5 @@
 from .dataset import Dataset
+from .dataset import YearData as YearData
 from .dataset import map_to_entity as map_to_entity
 from .dataset_version import DatasetVersion as DatasetVersion
 from .dynamic import Dynamic as Dynamic

policyengine/core/dataset.py

@@ -8,6 +8,63 @@ from .dataset_version import DatasetVersion
 from .tax_benefit_model import TaxBenefitModel
 
 
+class YearData(BaseModel):
+    """Base class for entity-level data for a single year."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    @property
+    def entity_data(self) -> dict[str, MicroDataFrame]:
+        """Return a dictionary of entity names to their data.
+
+        This should be implemented by subclasses to return the appropriate entities.
+        """
+        raise NotImplementedError(
+            "Subclasses must implement entity_data property"
+        )
+
+    @property
+    def person_entity(self) -> str:
+        """Return the name of the person-level entity.
+
+        Defaults to 'person' but can be overridden by subclasses.
+        """
+        return "person"
+
+    def map_to_entity(
+        self,
+        source_entity: str,
+        target_entity: str,
+        columns: list[str] = None,
+        values: list = None,
+        how: str = "sum",
+    ) -> MicroDataFrame:
+        """Map data from source entity to target entity using join keys.
+
+        Args:
+            source_entity (str): The source entity name.
+            target_entity (str): The target entity name.
+            columns (list[str], optional): List of column names to map. If None, maps all columns.
+            values (list, optional): List of values to use instead of column data.
+            how (str): Aggregation method ('sum' or 'first') when mapping to higher-level entities (default 'sum').
+
+        Returns:
+            MicroDataFrame: The mapped data at the target entity level.
+
+        Raises:
+            ValueError: If source or target entity is invalid.
+        """
+        return map_to_entity(
+            entity_data=self.entity_data,
+            source_entity=source_entity,
+            target_entity=target_entity,
+            person_entity=self.person_entity,
+            columns=columns,
+            values=values,
+            how=how,
+        )
+
+
 class Dataset(BaseModel):
     """Base class for datasets.
 
@@ -43,6 +100,8 @@ def map_to_entity(
     target_entity: str,
     person_entity: str = "person",
     columns: list[str] | None = None,
+    values: list | None = None,
+    how: str = "sum",
 ) -> MicroDataFrame:
     """Map data from source entity to target entity using join keys.
 
@@ -58,12 +117,17 @@ def map_to_entity(
         target_entity: The target entity name
         person_entity: The name of the person entity (default "person")
         columns: List of column names to map. If None, maps all columns
+        values: List of values to use instead of column data. If provided, creates a single unnamed column
+        how: Aggregation method (default 'sum')
+            - For person → group: 'sum' (aggregate), 'first' (take first value)
+            - For group → person: 'project' (broadcast), 'divide' (split equally)
+            - For group → group: 'sum', 'first', 'project', 'divide'
 
     Returns:
         MicroDataFrame: The mapped data at the target entity level
 
     Raises:
-        ValueError: If source or target entity is invalid
+        ValueError: If source or target entity is invalid or unsupported aggregation method
     """
     valid_entities = set(entity_data.keys())
 
@@ -79,6 +143,18 @@ def map_to_entity(
     # Get source data (convert to plain DataFrame to avoid weighted operations during mapping)
     source_df = pd.DataFrame(entity_data[source_entity])
 
+    # Handle values parameter - create a temporary column with the provided values
+    if values is not None:
+        if len(values) != len(source_df):
+            raise ValueError(
+                f"Length of values ({len(values)}) must match source entity length ({len(source_df)})"
+            )
+        # Create a temporary DataFrame with just ID columns and the values column
+        id_cols = {col for col in source_df.columns if col.endswith("_id")}
+        source_df = source_df[[col for col in id_cols]]
+        source_df["__mapped_value"] = values
+        columns = ["__mapped_value"]
+
     if columns:
         # Select only requested columns (keep all ID columns for joins)
         id_cols = {col for col in source_df.columns if col.endswith("_id")}
@@ -118,10 +194,17 @@ def map_to_entity(
                 if c not in id_cols and c not in weight_cols
             ]
 
-            # Group by join key and sum
-            aggregated = source_df.groupby(join_key, as_index=False)[
-                agg_cols
-            ].sum()
+            # Group by join key and aggregate
+            if how == "sum":
+                aggregated = source_df.groupby(join_key, as_index=False)[
+                    agg_cols
+                ].sum()
+            elif how == "first":
+                aggregated = source_df.groupby(join_key, as_index=False)[
+                    agg_cols
+                ].first()
+            else:
+                raise ValueError(f"Unsupported aggregation method: {how}")
 
             # Rename join key to target key if needed
             if join_key != target_key:
@@ -146,6 +229,10 @@ def map_to_entity(
 
     # Group entity to person: expand group-level data to person level
     if source_entity != person_entity and target_entity == person_entity:
+        # Default to 'project' (broadcast) for group -> person if 'sum' was provided
+        if how == "sum":
+            how = "project"
+
         source_key = f"{source_entity}_id"
         # Check for both naming patterns
         person_source_key = f"{person_entity}_{source_entity}_id"
@@ -163,6 +250,40 @@ def map_to_entity(
                 source_df = source_df.rename(columns={source_key: join_key})
 
             result = target_pd.merge(source_df, on=join_key, how="left")
+
+            # Handle divide operation
+            if how == "divide":
+                # Get columns to divide (exclude ID and weight columns)
+                id_cols = {
+                    col for col in result.columns if col.endswith("_id")
+                }
+                weight_cols = {
+                    col for col in result.columns if col.endswith("_weight")
+                }
+                value_cols = [
+                    c
+                    for c in result.columns
+                    if c not in id_cols and c not in weight_cols
+                ]
+
+                # Count members in each group
+                group_counts = (
+                    target_pd.groupby(join_key, as_index=False)
+                    .size()
+                    .rename(columns={"size": "__group_count"})
+                )
+                result = result.merge(group_counts, on=join_key, how="left")
+
+                # Divide values by group count
+                for col in value_cols:
+                    result[col] = result[col] / result["__group_count"]
+
+                result = result.drop(columns=["__group_count"])
+            elif how not in ["project"]:
+                raise ValueError(
+                    f"Unsupported aggregation method for group->person: {how}. Use 'project' or 'divide'."
+                )
+
             return MicroDataFrame(result, weights=target_weight)
 
     # Group to group: go through person table
@@ -228,9 +349,43 @@ def map_to_entity(
                 if c not in id_cols and c not in weight_cols
             ]
 
-            aggregated = source_with_target.groupby(
-                target_link_key, as_index=False
-            )[agg_cols].sum()
+            if how == "sum":
+                aggregated = source_with_target.groupby(
+                    target_link_key, as_index=False
+                )[agg_cols].sum()
+            elif how == "first":
+                aggregated = source_with_target.groupby(
+                    target_link_key, as_index=False
+                )[agg_cols].first()
+            elif how == "project":
+                # Just take first value (broadcast to target groups)
+                aggregated = source_with_target.groupby(
+                    target_link_key, as_index=False
+                )[agg_cols].first()
+            elif how == "divide":
+                # Count persons in each source group
+                source_group_counts = (
+                    person_df.groupby(source_link_key, as_index=False)
+                    .size()
+                    .rename(columns={"size": "__source_count"})
+                )
+                source_with_target = source_with_target.merge(
+                    source_group_counts, on=source_link_key, how="left"
+                )
+
+                # Divide values by source group count (per-person share)
+                for col in agg_cols:
+                    source_with_target[col] = (
+                        source_with_target[col]
+                        / source_with_target["__source_count"]
+                    )
+
+                # Now aggregate (sum of per-person shares) to target level
+                aggregated = source_with_target.groupby(
+                    target_link_key, as_index=False
+                )[agg_cols].sum()
+            else:
+                raise ValueError(f"Unsupported aggregation method: {how}")
 
             # Rename target link key to target key if needed
             if target_link_key != target_key:

policyengine/core/dynamic.py

@@ -23,7 +23,10 @@ class Dynamic(BaseModel):
 
         # Combine simulation modifiers
         combined_modifier = None
-        if self.simulation_modifier is not None and other.simulation_modifier is not None:
+        if (
+            self.simulation_modifier is not None
+            and other.simulation_modifier is not None
+        ):
 
             def combined_modifier(sim):
                 sim = self.simulation_modifier(sim)

policyengine/core/parameter.py

@@ -8,6 +8,7 @@ from .tax_benefit_model_version import TaxBenefitModelVersion
 class Parameter(BaseModel):
     id: str = Field(default_factory=lambda: str(uuid4()))
     name: str
+    label: str | None = None
     description: str | None = None
     data_type: type | None = None
     tax_benefit_model_version: TaxBenefitModelVersion

policyengine/core/policy.py

@@ -23,7 +23,10 @@ class Policy(BaseModel):
 
         # Combine simulation modifiers
         combined_modifier = None
-        if self.simulation_modifier is not None and other.simulation_modifier is not None:
+        if (
+            self.simulation_modifier is not None
+            and other.simulation_modifier is not None
+        ):
 
             def combined_modifier(sim):
                 sim = self.simulation_modifier(sim)

policyengine/core/simulation.py

@@ -21,10 +21,13 @@ class Simulation(BaseModel):
     tax_benefit_model_version: TaxBenefitModelVersion = None
     output_dataset: Dataset | None = None
 
-    variables: dict[str, list[str]] | None = Field(
-        default=None,
-        description="Optional dictionary mapping entity names to lists of variable names to calculate. If None, uses model defaults.",
-    )
-
     def run(self):
         self.tax_benefit_model_version.run(self)
+
+    def save(self):
+        """Save the simulation's output dataset."""
+        self.tax_benefit_model_version.save(self)
+
+    def load(self):
+        """Load the simulation's output dataset."""
+        self.tax_benefit_model_version.load(self)

policyengine/core/tax_benefit_model_version.py

@@ -29,6 +29,54 @@ class TaxBenefitModelVersion(BaseModel):
             "The TaxBenefitModel class must define a method to execute simulations."
         )
 
+    def save(self, simulation: "Simulation"):
+        raise NotImplementedError(
+            "The TaxBenefitModel class must define a method to save simulations."
+        )
+
+    def load(self, simulation: "Simulation"):
+        raise NotImplementedError(
+            "The TaxBenefitModel class must define a method to load simulations."
+        )
+
+    def get_parameter(self, name: str) -> "Parameter":
+        """Get a parameter by name.
+
+        Args:
+            name: The parameter name (e.g., "gov.hmrc.income_tax.allowances.personal_allowance.amount")
+
+        Returns:
+            Parameter: The matching parameter
+
+        Raises:
+            ValueError: If parameter not found
+        """
+        for param in self.parameters:
+            if param.name == name:
+                return param
+        raise ValueError(
+            f"Parameter '{name}' not found in {self.model.id} version {self.version}"
+        )
+
+    def get_variable(self, name: str) -> "Variable":
+        """Get a variable by name.
+
+        Args:
+            name: The variable name (e.g., "income_tax", "household_net_income")
+
+        Returns:
+            Variable: The matching variable
+
+        Raises:
+            ValueError: If variable not found
+        """
+        for var in self.variables:
+            if var.name == name:
+                return var
+        raise ValueError(
+            f"Variable '{name}' not found in {self.model.id} version {self.version}"
+        )
+
     def __repr__(self) -> str:
         # Give the id and version, and the number of variables, parameters, parameter values
         return f"<TaxBenefitModelVersion id={self.id} variables={len(self.variables)} parameters={len(self.parameters)} parameter_values={len(self.parameter_values)}>"

policyengine/tax_benefit_models/uk/datasets.py

@@ -2,12 +2,12 @@ from pathlib import Path
 
 import pandas as pd
 from microdf import MicroDataFrame
-from pydantic import BaseModel, ConfigDict
+from pydantic import ConfigDict
 
-from policyengine.core import Dataset, map_to_entity
+from policyengine.core import Dataset, YearData
 
 
-class UKYearData(BaseModel):
+class UKYearData(YearData):
     """Entity-level data for a single year."""
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -16,34 +16,14 @@ class UKYearData(BaseModel):
     benunit: MicroDataFrame
     household: MicroDataFrame
 
-    def map_to_entity(
-        self, source_entity: str, target_entity: str, columns: list[str] = None
-    ) -> MicroDataFrame:
-        """Map data from source entity to target entity using join keys.
-
-        Args:
-            source_entity (str): The source entity name ('person', 'benunit', 'household').
-            target_entity (str): The target entity name ('person', 'benunit', 'household').
-            columns (list[str], optional): List of column names to map. If None, maps all columns.
-
-        Returns:
-            MicroDataFrame: The mapped data at the target entity level.
-
-        Raises:
-            ValueError: If source or target entity is invalid.
-        """
-        entity_data = {
+    @property
+    def entity_data(self) -> dict[str, MicroDataFrame]:
+        """Return a dictionary of entity names to their data."""
+        return {
             "person": self.person,
             "benunit": self.benunit,
             "household": self.household,
         }
-        return map_to_entity(
-            entity_data=entity_data,
-            source_entity=source_entity,
-            target_entity=target_entity,
-            person_entity="person",
-            columns=columns,
-        )
 
 
 class PolicyEngineUKDataset(Dataset):

policyengine/tax_benefit_models/uk/model.py

@@ -83,6 +83,7 @@ class PolicyEngineUKLatest(TaxBenefitModelVersion):
                 parameter = Parameter(
                     id=self.id + "-" + param_node.name,
                     name=param_node.name,
+                    label=param_node.metadata.get("label", param_node.name),
                     tax_benefit_model_version=self,
                     description=param_node.description,
                     data_type=type(
@@ -152,77 +153,72 @@ class PolicyEngineUKLatest(TaxBenefitModelVersion):
             )
             modifier(microsim)
 
-        # Allow custom variable selection, or use defaults
-        if simulation.variables is not None:
-            entity_variables = simulation.variables
-        else:
-            # Default comprehensive variable set
-            entity_variables = {
-                "person": [
-                    # IDs and weights
-                    "person_id",
-                    "benunit_id",
-                    "household_id",
-                    "person_weight",
-                    # Demographics
-                    "age",
-                    "gender",
-                    "is_adult",
-                    "is_SP_age",
-                    "is_child",
-                    # Income
-                    "employment_income",
-                    "self_employment_income",
-                    "pension_income",
-                    "private_pension_income",
-                    "savings_interest_income",
-                    "dividend_income",
-                    "property_income",
-                    "total_income",
-                    "earned_income",
-                    # Benefits
-                    "universal_credit",
-                    "child_benefit",
-                    "pension_credit",
-                    "income_support",
-                    "working_tax_credit",
-                    "child_tax_credit",
-                    # Tax
-                    "income_tax",
-                    "national_insurance",
-                ],
-                "benunit": [
-                    # IDs and weights
-                    "benunit_id",
-                    "benunit_weight",
-                    # Structure
-                    "family_type",
-                    # Income and benefits
-                    "universal_credit",
-                    "child_benefit",
-                    "working_tax_credit",
-                    "child_tax_credit",
-                ],
-                "household": [
-                    # IDs and weights
-                    "household_id",
-                    "household_weight",
-                    # Income measures
-                    "household_net_income",
-                    "hbai_household_net_income",
-                    "equiv_hbai_household_net_income",
-                    "household_market_income",
-                    "household_gross_income",
-                    # Benefits and tax
-                    "household_benefits",
-                    "household_tax",
-                    "vat",
-                    # Housing
-                    "rent",
-                    "council_tax",
-                    "tenure_type",
-                ],
-            }
+        entity_variables = {
+            "person": [
+                # IDs and weights
+                "person_id",
+                "benunit_id",
+                "household_id",
+                "person_weight",
+                # Demographics
+                "age",
+                "gender",
+                "is_adult",
+                "is_SP_age",
+                "is_child",
+                # Income
+                "employment_income",
+                "self_employment_income",
+                "pension_income",
+                "private_pension_income",
+                "savings_interest_income",
+                "dividend_income",
+                "property_income",
+                "total_income",
+                "earned_income",
+                # Benefits
+                "universal_credit",
+                "child_benefit",
+                "pension_credit",
+                "income_support",
+                "working_tax_credit",
+                "child_tax_credit",
+                # Tax
+                "income_tax",
+                "national_insurance",
+            ],
+            "benunit": [
+                # IDs and weights
+                "benunit_id",
+                "benunit_weight",
+                # Structure
+                "family_type",
+                # Income and benefits
+                "universal_credit",
+                "child_benefit",
+                "working_tax_credit",
+                "child_tax_credit",
+            ],
+            "household": [
+                # IDs and weights
+                "household_id",
+                "household_weight",
+                # Income measures
+                "household_net_income",
+                "hbai_household_net_income",
+                "equiv_hbai_household_net_income",
+                "household_market_income",
+                "household_gross_income",
+                # Benefits and tax
+                "household_benefits",
+                "household_tax",
+                "vat",
+                # Housing
+                "rent",
+                "council_tax",
+                "tenure_type",
+            ],
+        }
 
         data = {
             "person": pd.DataFrame(),
@@ -247,6 +243,7 @@ class PolicyEngineUKLatest(TaxBenefitModelVersion):
         )
 
         simulation.output_dataset = PolicyEngineUKDataset(
+            id=simulation.id,
             name=dataset.name,
             description=dataset.description,
             filepath=str(
@@ -262,7 +259,23 @@ class PolicyEngineUKLatest(TaxBenefitModelVersion):
             ),
         )
 
+    def save(self, simulation: "Simulation"):
+        """Save the simulation's output dataset."""
         simulation.output_dataset.save()
 
+    def load(self, simulation: "Simulation"):
+        """Load the simulation's output dataset."""
+        simulation.output_dataset = PolicyEngineUKDataset(
+            id=simulation.id,
+            name=simulation.dataset.name,
+            description=simulation.dataset.description,
+            filepath=str(
+                Path(simulation.dataset.filepath).parent
+                / (simulation.id + ".h5")
+            ),
+            year=simulation.dataset.year,
+            is_output_dataset=True,
+        )
+
 
 uk_latest = PolicyEngineUKLatest()

policyengine/tax_benefit_models/us/datasets.py

@@ -3,12 +3,12 @@ from pathlib import Path
 
 import pandas as pd
 from microdf import MicroDataFrame
-from pydantic import BaseModel, ConfigDict
+from pydantic import ConfigDict
 
-from policyengine.core import Dataset, map_to_entity
+from policyengine.core import Dataset, YearData
 
 
-class USYearData(BaseModel):
+class USYearData(YearData):
     """Entity-level data for a single year."""
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -20,23 +20,10 @@ class USYearData(BaseModel):
     tax_unit: MicroDataFrame
     household: MicroDataFrame
 
-    def map_to_entity(
-        self, source_entity: str, target_entity: str, columns: list[str] = None
-    ) -> MicroDataFrame:
-        """Map data from source entity to target entity using join keys.
-
-        Args:
-            source_entity (str): The source entity name.
-            target_entity (str): The target entity name.
-            columns (list[str], optional): List of column names to map. If None, maps all columns.
-
-        Returns:
-            MicroDataFrame: The mapped data at the target entity level.
-
-        Raises:
-            ValueError: If source or target entity is invalid.
-        """
-        entity_data = {
+    @property
+    def entity_data(self) -> dict[str, MicroDataFrame]:
+        """Return a dictionary of entity names to their data."""
+        return {
             "person": self.person,
             "marital_unit": self.marital_unit,
             "family": self.family,
@@ -44,13 +31,6 @@ class USYearData(BaseModel):
             "tax_unit": self.tax_unit,
             "household": self.household,
         }
-        return map_to_entity(
-            entity_data=entity_data,
-            source_entity=source_entity,
-            target_entity=target_entity,
-            person_entity="person",
-            columns=columns,
-        )
 
 
 class PolicyEngineUSDataset(Dataset):

policyengine/tax_benefit_models/us/model.py

@@ -156,63 +156,58 @@ class PolicyEngineUSLatest(TaxBenefitModelVersion):
             )
             modifier(microsim)
 
-        # Allow custom variable selection, or use defaults
-        if simulation.variables is not None:
-            entity_variables = simulation.variables
-        else:
-            # Default comprehensive variable set
-            entity_variables = {
-                "person": [
-                    # IDs and weights
-                    "person_id",
-                    "marital_unit_id",
-                    "family_id",
-                    "spm_unit_id",
-                    "tax_unit_id",
-                    "household_id",
-                    "person_weight",
-                    # Demographics
-                    "age",
-                    # Income
-                    "employment_income",
-                    # Benefits
-                    "ssi",
-                    "social_security",
-                    "medicaid",
-                    "unemployment_compensation",
-                ],
-                "marital_unit": [
-                    "marital_unit_id",
-                    "marital_unit_weight",
-                ],
-                "family": [
-                    "family_id",
-                    "family_weight",
-                ],
-                "spm_unit": [
-                    "spm_unit_id",
-                    "spm_unit_weight",
-                    "snap",
-                    "tanf",
-                    "spm_unit_net_income",
-                ],
-                "tax_unit": [
-                    "tax_unit_id",
-                    "tax_unit_weight",
-                    "income_tax",
-                    "employee_payroll_tax",
-                    "eitc",
-                    "ctc",
-                ],
-                "household": [
-                    "household_id",
-                    "household_weight",
-                    "household_net_income",
-                    "household_benefits",
-                    "household_tax",
-                    "household_market_income",
-                ],
-            }
+        entity_variables = {
+            "person": [
+                # IDs and weights
+                "person_id",
+                "marital_unit_id",
+                "family_id",
+                "spm_unit_id",
+                "tax_unit_id",
+                "household_id",
+                "person_weight",
+                # Demographics
+                "age",
+                # Income
+                "employment_income",
+                # Benefits
+                "ssi",
+                "social_security",
+                "medicaid",
+                "unemployment_compensation",
+            ],
+            "marital_unit": [
+                "marital_unit_id",
+                "marital_unit_weight",
+            ],
+            "family": [
+                "family_id",
+                "family_weight",
+            ],
+            "spm_unit": [
+                "spm_unit_id",
+                "spm_unit_weight",
+                "snap",
+                "tanf",
+                "spm_unit_net_income",
+            ],
+            "tax_unit": [
+                "tax_unit_id",
+                "tax_unit_weight",
+                "income_tax",
+                "employee_payroll_tax",
+                "eitc",
+                "ctc",
+            ],
+            "household": [
+                "household_id",
+                "household_weight",
+                "household_net_income",
+                "household_benefits",
+                "household_tax",
+                "household_market_income",
+            ],
+        }
 
         data = {
             "person": pd.DataFrame(),
@@ -291,6 +286,7 @@ class PolicyEngineUSLatest(TaxBenefitModelVersion):
         )
 
         simulation.output_dataset = PolicyEngineUSDataset(
+            id=simulation.id,
             name=dataset.name,
             description=dataset.description,
             filepath=str(
@@ -309,8 +305,24 @@ class PolicyEngineUSLatest(TaxBenefitModelVersion):
             ),
         )
 
+    def save(self, simulation: "Simulation"):
+        """Save the simulation's output dataset."""
         simulation.output_dataset.save()
 
+    def load(self, simulation: "Simulation"):
+        """Load the simulation's output dataset."""
+        simulation.output_dataset = PolicyEngineUSDataset(
+            id=simulation.id,
+            name=simulation.dataset.name,
+            description=simulation.dataset.description,
+            filepath=str(
+                Path(simulation.dataset.filepath).parent
+                / (simulation.id + ".h5")
+            ),
+            year=simulation.dataset.year,
+            is_output_dataset=True,
+        )
+
     def _build_simulation_from_dataset(self, microsim, dataset, system):
         """Build a PolicyEngine Core simulation from dataset entity IDs.
 

policyengine/utils/plotting.py

@@ -1,6 +1,5 @@
 """Plotting utilities for PolicyEngine visualisations."""
 
-
 import plotly.graph_objects as go
 
 # PolicyEngine brand colours

{policyengine-3.1.1.dist-info → policyengine-3.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine
-Version: 3.1.1
+Version: 3.1.2
 Summary: A package to conduct policy analysis using PolicyEngine tax-benefit models.
 Author-email: PolicyEngine <hello@policyengine.org>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{policyengine-3.1.1.dist-info → policyengine-3.1.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
 policyengine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-policyengine/__pycache__/__init__.cpython-313.pyc,sha256=dmkhqYKcUjDPvirOFgf1L-P-aV3l7JIWK6zZZ6J45LU,175
-policyengine/core/__init__.py,sha256=3vabkWXYNNmQmN4Vy1yx2kKk6RKVSsdjtToQ8s8gzUg,870
-policyengine/core/dataset.py,sha256=jGjnoyEQ6VcTiCs8Hr6PT22l59CRhK1oUT5RPaz7mC0,9256
+policyengine/__pycache__/__init__.cpython-313.pyc,sha256=o8VWizV0RJAh0YGEL98jBlt-vlR2yWepNiM-xbf5ET8,175
+policyengine/core/__init__.py,sha256=KBVhkqzkvjWLDDwk96vquQKL63ZFuLen5AzBOBnO9pg,912
+policyengine/core/dataset.py,sha256=SFicjsZgMeKgJjlt8z98fOUWG2dfod0Q9NBy_m9PSc8,15506
 policyengine/core/dataset_version.py,sha256=6KeFCRGQto_Yyl4QY4Vo2JFythjaXrNAOHQiwRGESyM,378
-policyengine/core/dynamic.py,sha256=40RO3N6hmUT6-3tpJy0wSOC-9ITdFSS5LRiqPmi79f0,1605
+policyengine/core/dynamic.py,sha256=ng9BjDzxdwjJ0e7zoqXFmq33E1SRbaaPYfW7pjRSSzI,1641
 policyengine/core/output.py,sha256=cCW4vbzkLdQaT_nJTyDJBl7Hubm7nZeRuR7aVG1dKvg,643
-policyengine/core/parameter.py,sha256=PLDaepytqB7FVSfYQ541vnkVuMDLamFBeHtz2TmQrOE,378
+policyengine/core/parameter.py,sha256=5nBCw-6-BCfW-_uFqvAN5zcP_Vfz1mAmQsi3peWAbZA,407
 policyengine/core/parameter_value.py,sha256=b0ts1kbWcwjPSYnZm2rlCylmTLPJRLxDL8z3RmxM5OI,377
-policyengine/core/policy.py,sha256=xorVf03bcjB-3mBEmwj2YMqF1-6Xzps74SquzqtS0lo,1599
-policyengine/core/simulation.py,sha256=x9dU_nKEIgCZa11cxB-VdRNt9DZjjSML7n7M8_3STv8,941
+policyengine/core/policy.py,sha256=ExMrUDMvNk_uuOL0cSm0UCzDyGka0t_yk6x4U0Kp6Ww,1635
+policyengine/core/simulation.py,sha256=fToaD4ieV99IMMKGU7r6ATCREWuOU2-4k6WqhzAzo7c,971
 policyengine/core/tax_benefit_model.py,sha256=2Yc1RlQrUG7djDMZbJOQH4Ns86_lOnLeISCGR4-9zMo,176
-policyengine/core/tax_benefit_model_version.py,sha256=AJHFRaSEzR2_0FVkBBb40ID3FAaFFrFLnhSXRYYbtWs,1291
+policyengine/core/tax_benefit_model_version.py,sha256=V1CGft5Y6YflMASx0wR3V73jr-WqQu2R8N5QVMRm9yw,2752
 policyengine/core/variable.py,sha256=AjSImORlRkh05xhYxyeT6GFMOfViRzYg0qRQAIj-mxo,350
 policyengine/outputs/__init__.py,sha256=IJUmLP0Og41VrwiqhJF-a9-3fIb4nlXpS7uFuVCINIs,515
 policyengine/outputs/aggregate.py,sha256=exI-U04OF5kVf2BBYV6sf8VldIWnT_IzxgkBs5wtnCw,4846
@@ -20,20 +20,20 @@ policyengine/tax_benefit_models/uk.py,sha256=MCeJGQCTwUzBYdz0ru7IgT8Mgv-vJMqqVwF
 policyengine/tax_benefit_models/us.py,sha256=d6rdhW2awoUvk5Ldp9mHAUiHqlnSfEQR318PkIXS_9c,794
 policyengine/tax_benefit_models/uk/__init__.py,sha256=1L1HBbOTflRefjOcU5vgEYkn6wLWOt_uG9G_PF089S0,732
 policyengine/tax_benefit_models/uk/analysis.py,sha256=O4eYJYF7tsgiuLuiWMU0OXq7ss6U8-vzlg6nC2U8sgU,3175
-policyengine/tax_benefit_models/uk/datasets.py,sha256=LvbHemfhMU1kk9sZU5eAPrix8EmTl07p9fYkwbSasIE,6542
-policyengine/tax_benefit_models/uk/model.py,sha256=5GGhscQEX1-YBgkUt4kd2RyFfVIBEd7IihaSP3ia7hg,9247
+policyengine/tax_benefit_models/uk/datasets.py,sha256=Cn3sBvIBQ_-s5pEM9TDp2FwdVIo20h3do_8biVJLyKI,5748
+policyengine/tax_benefit_models/uk/model.py,sha256=-u7DM9pPndgCcNzOSMD0kftlVLF90mJV1RYCkECiw2c,9483
 policyengine/tax_benefit_models/uk/outputs.py,sha256=2mYLwQW4QNvrOHtHfm_ACqE9gbmuLxvcCyldRU46s0o,3543
 policyengine/tax_benefit_models/us/__init__.py,sha256=ClBkFwRa_nFQ3YU003uxBKiMG3pktaUb8jRvhzfR0vE,968
 policyengine/tax_benefit_models/us/analysis.py,sha256=Xf-DT0QjVySs0QG_koCwgvOeWI_scLtv3S3SP8u8ZWc,3253
-policyengine/tax_benefit_models/us/datasets.py,sha256=sQ0YsTsmqpaM-j7w6Cea1lKUzjMV3UPqH5Bc3hH71cI,12718
-policyengine/tax_benefit_models/us/model.py,sha256=SNQ3_pVLJDF41gRzU4NZ1yZUq8nLMPSHWwb-qGaTae0,16021
+policyengine/tax_benefit_models/us/datasets.py,sha256=StvHtliqhYSIzI2ARqadLxTkp6xDYnf_qquB7aeH55Y,11994
+policyengine/tax_benefit_models/us/model.py,sha256=pfkPEJXm4epccgLQlSxP7Apw9JdvfZgNA9rgYHaNdlc,16236
 policyengine/tax_benefit_models/us/outputs.py,sha256=GT8Eur8DfB9cPQRbSljEl9RpKSNHW80Fq_CBXCybvIU,3519
 policyengine/utils/__init__.py,sha256=1X-VYAWLyB9A0YRHwsGWrqQHns1WfeZ7ISC6DMU5myM,140
 policyengine/utils/dates.py,sha256=HnAqyl8S8EOYp8ibsnMTmECYoDWCSqwL-7A2_qKgxSc,1510
 policyengine/utils/parametric_reforms.py,sha256=4P3U39-4pYTU4BN6JjgmVLUkCkBhRfZJ6UIWTlsjyQE,1155
-policyengine/utils/plotting.py,sha256=JbMPwD7SCQqp_qbjYrXixT5zS0eG734n0Sg4JkD9nDc,5336
-policyengine-3.1.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-policyengine-3.1.1.dist-info/METADATA,sha256=JuCAmXnSyBcTeeqyBm54GYmsYrrOPg8zGhWHdYoleT4,45889
-policyengine-3.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-policyengine-3.1.1.dist-info/top_level.txt,sha256=_23UPobfkneHQkpJ0e0OmDJfhCUfoXj_F2sTckCGOH4,13
-policyengine-3.1.1.dist-info/RECORD,,
+policyengine/utils/plotting.py,sha256=ZAzTWz38vIaW0c3Nt4Un1kfrNoXLyHCDd1pEJIlsRg4,5335
+policyengine-3.1.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+policyengine-3.1.2.dist-info/METADATA,sha256=iZkPPB-Tve-DYtGCm7ZDhTCDQyRhBg2nQ9DRer6eZ_A,45889
+policyengine-3.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+policyengine-3.1.2.dist-info/top_level.txt,sha256=_23UPobfkneHQkpJ0e0OmDJfhCUfoXj_F2sTckCGOH4,13
+policyengine-3.1.2.dist-info/RECORD,,