Merge pull request #152 from PolicyEngine/nikhilwoodruff/issue146

Fix SSMG uprating

Author: nikhilwoodruff

changelog_entry.yaml

@@ -0,0 +1,4 @@
+- bump: patch
+  changes:
+    fixed:
+    - SSMG uprating.

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]

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