Merge pull request #11 from PolicyEngine/imputations

Adjust imputation behaviour
PolicyEngine · Sep 16, 2024 · 5426115 · 5426115
2 parents 6a1e5c1 + fcd571f
commit 5426115
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/policyengine_uk_data/datasets/frs/enhanced_frs.py b/policyengine_uk_data/datasets/frs/enhanced_frs.py
@@ -12,7 +12,7 @@
 
 class EnhancedFRS(Dataset):
     def generate(self):
-        data = self.input_frs().load_dataset()
+        data = self.input_frs(require=True).load_dataset()
         original_weights = data["household_weight"][str(self.time_period)] + 10
         for year in range(self.time_period, self.end_year + 1):
             loss_matrix, targets_array = create_target_matrix(
@@ -100,5 +100,4 @@ def loss(weights):
 
 
 if __name__ == "__main__":
-    ReweightedFRS_2022_23().generate()
     EnhancedFRS_2022_23().generate()
diff --git a/policyengine_uk_data/utils/imputations/capital_gains.py b/policyengine_uk_data/utils/imputations/capital_gains.py
@@ -93,7 +93,7 @@ def loss(blend_factor):
         loss_value.backward()
         optimiser.step()
         progress.set_description(f"Loss: {loss_value.item()}")
-        if loss_value.item() < 1e-5:
+        if loss_value.item() < 1e-3:
             break
 
     new_household_weight = household_weight.detach().numpy()