diff --git a/changelog_entry.yaml b/changelog_entry.yaml index e69de29bb..01d4561b2 100644 --- a/changelog_entry.yaml +++ b/changelog_entry.yaml @@ -0,0 +1,4 @@ +- bump: patch + changes: + fixed: + - SSMG uprating. diff --git a/policyengine_uk_data/datasets/frs/frs.py b/policyengine_uk_data/datasets/frs/frs.py index ea092d7e0..bf11e46cf 100644 --- a/policyengine_uk_data/datasets/frs/frs.py +++ b/policyengine_uk_data/datasets/frs/frs.py @@ -573,6 +573,8 @@ def add_market_income( frs["lump_sum_income"] = person.REDAMT + frs["student_loan_repayments"] = person.SLREPAMT * 52 + def sum_from_positive_fields( table: pd.DataFrame, fields: List[str] diff --git a/policyengine_uk_data/utils/imputations/capital_gains.py b/policyengine_uk_data/utils/imputations/capital_gains.py index 536c7d18b..970b75586 100644 --- a/policyengine_uk_data/utils/imputations/capital_gains.py +++ b/policyengine_uk_data/utils/imputations/capital_gains.py @@ -126,8 +126,8 @@ def loss(blend_factor): lower = row.minimum_total_income upper = row.maximum_total_income ti_in_range = (ti >= lower) * (ti < upper) - in_target_range = has_cg * ti_in_range - quantiles = np.random.random(int(in_target_range.sum())) + in_target_range = has_cg * ti_in_range > 0 + quantiles = np.random.random(int(in_target_range.values.sum())) pred_capital_gains = spline(quantiles) new_cg[in_target_range] = pred_capital_gains