Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog_entry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- bump: patch
changes:
fixed:
- Enum columns now decode to string labels when accessing .person/.benunit/.household on datasets loaded via non-URL paths (e.g. UKSingleYearDataset or UKMultiYearDataset passed directly)
5 changes: 5 additions & 0 deletions policyengine_uk/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ def build_from_single_year_dataset(
dataset = extend_single_year_dataset(
dataset, self.tax_benefit_system.parameters
)
_pre_encode_enum_columns(dataset, self.tax_benefit_system)
self.build_from_multi_year_dataset(dataset)
self.dataset = dataset

Expand All @@ -432,6 +433,10 @@ def build_from_multi_year_dataset(
Args:
dataset: UKMultiYearDataset containing multiple years of data
"""
# Ensure enum columns are encoded and _enum_columns is populated so
# that .person/.benunit/.household properties can decode back to strings.
if not any(dataset[y]._enum_columns for y in dataset.years):
_pre_encode_enum_columns(dataset, self.tax_benefit_system)
# Use first year to establish entity structure
first_year = dataset[dataset.years[0]]
self.build_from_ids(
Expand Down
2 changes: 1 addition & 1 deletion policyengine_uk/tests/microsimulation/reforms_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ reforms:
parameters:
gov.hmrc.child_benefit.amount.additional: 25
- name: Reduce Universal Credit taper rate to 20%
expected_impact: -44.8
expected_impact: -43.2
parameters:
gov.dwp.universal_credit.means_test.reduction_rate: 0.2
- name: Raise Class 1 main employee NICs rate to 10%
Expand Down