policyengine-uk 2.49.2__py3-none-any.whl → 2.49.3__py3-none-any.whl

policyengine_uk/simulation.py

@@ -70,12 +70,6 @@ class Simulation(CoreSimulation):
         if reform is not None:
             scenario = Scenario.from_reform(reform)
 
-        # Apply parametric reforms here
-
-        if scenario is not None:
-            if scenario.parameter_changes is not None:
-                self.apply_parameter_changes(scenario.parameter_changes)
-
         self.branch_name = "default"
         self.invalidated_caches = set()
         self.debug: bool = False
@@ -136,6 +130,8 @@ class Simulation(CoreSimulation):
             self.baseline = self.clone()
 
         if scenario is not None:
+            if scenario.parameter_changes is not None:
+                self.apply_parameter_changes(scenario.parameter_changes)
             if scenario.simulation_modifier is not None:
                 scenario.simulation_modifier(self)
 

policyengine_uk/tests/policy/baseline/finance/benefit/family/income_support.yaml

@@ -1,26 +1,3 @@
-- name: Lone parent, two children
-  period: 2021
-  absolute_error_margin: 1_000 # Temporarily for now
-  input:
-    people:
-      p1:
-        age: 26
-        income_support_reported: true
-        working_tax_credit_reported: true
-        child_tax_credit_reported: true
-      c1:
-        age: 4
-      c2:
-        age: 4
-    benunits:
-      b1:
-        members: [p1, c1, c2]
-        would_claim_child_benefit: true
-  output:
-    child_tax_credit: 6205
-    child_benefit: 35 * 52
-    income_support_eligible: true
-    income_support: 81 * 52
 - name: Lone parent, two children, earnings
   period: 2021
   absolute_error_margin: 5

policyengine_uk/variables/contrib/policyengine/employer_ni/baseline_employer_cost.py

@@ -35,7 +35,11 @@ class baseline_employer_cost(Variable):
         )
 
         # Calculate baseline employer cost
-        baseline_parameters = parameters(period).baseline
+        if person.simulation.baseline is None:
+            return 0
+        baseline_parameters = (
+            person.simulation.baseline.tax_benefit_system.parameters(period)
+        )
         baseline_class_1 = (
             baseline_parameters.gov.hmrc.national_insurance.class_1
         )

policyengine_uk/variables/contrib/policyengine/employer_ni/employer_ni_fixed_employer_cost_change.py

@@ -42,7 +42,11 @@ class employer_ni_fixed_employer_cost_change(Variable):
         )
 
         # Calculate baseline employer cost
-        baseline_parameters = parameters(period).baseline
+        if person.simulation.baseline is None:
+            return 0
+        baseline_parameters = (
+            person.simulation.baseline.tax_benefit_system.parameters(period)
+        )
         baseline_class_1 = (
             baseline_parameters.gov.hmrc.national_insurance.class_1
         )

policyengine_uk/variables/gov/dwp/is_CTC_eligible.py

@@ -11,7 +11,7 @@ class is_CTC_eligible(Variable):
     def formula(benunit, period, parameters):
         already_claiming = (
             add(benunit, period, ["child_tax_credit_reported"]) > 0
-        )
+        ) & (~add(benunit, period, ["would_claim_uc"]) > 0)
         return (
             benunit.any(benunit.members("is_child_for_CTC", period))
             & already_claiming

{policyengine_uk-2.49.2.dist-info → policyengine_uk-2.49.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine-uk
-Version: 2.49.2
+Version: 2.49.3
 Summary: PolicyEngine tax and benefit system for the UK.
 Project-URL: Homepage, https://github.com/PolicyEngine/policyengine-uk
 Project-URL: Repository, https://github.com/PolicyEngine/policyengine-uk

{policyengine_uk-2.49.2.dist-info → policyengine_uk-2.49.3.dist-info}/RECORD

@@ -3,7 +3,7 @@ policyengine_uk/entities.py,sha256=9yUbkUWQr3WydNE-gHhUudG97HGyXIZY3dkgQ6Z3t9A,1
 policyengine_uk/microsimulation.py,sha256=WskrrDrLGfDYwS1CzFk5rJkQSQlTknLkxFufStKRpxc,3379
 policyengine_uk/model_api.py,sha256=KdwJCL2HkXVxDpL6fCsCnQ9Sub6Kqp7Hyxlis3MNIx4,241
 policyengine_uk/modelled_policies.yaml,sha256=TLhvmkuI9ip-Fjq63n66RzDErCkN8K4BzY6XLxLMtFg,463
-policyengine_uk/simulation.py,sha256=ATrSdxxJrT8TZogmV0eVQcgB7wxaZz4NBl_ZBtMsk4E,21340
+policyengine_uk/simulation.py,sha256=n8LwAjabGHQLLg6bSWiotcJzrr49wDcvzaq1eOZSbqA,21265
 policyengine_uk/system.py,sha256=Z-ax_ImUq5k4tycuThczTxQNW5iTE6ikBJIBQdKfIzU,91
 policyengine_uk/tax_benefit_system.py,sha256=CjX1lERyOm_vlgHQcQO92HZtJiwItLH-MxJveJqk6iM,5165
 policyengine_uk/data/__init__.py,sha256=J0bZ3WnvPzZ4qfVLYcwOc4lziMUMdbcMqJ3xwjoekbM,101
@@ -559,7 +559,7 @@ policyengine_uk/tests/policy/baseline/finance/benefit/care.yaml,sha256=7lnFmydBP
 policyengine_uk/tests/policy/baseline/finance/benefit/general.yaml,sha256=7Ez1HDiKr5O3ZiuUBW_VpkOxCabyxijeLMCx8Vr7x0U,920
 policyengine_uk/tests/policy/baseline/finance/benefit/family/LHA.yaml,sha256=ha32cnW3zNcnUYQCGUj2Lg_j7GNKteJvnK6PH6am3QA,481
 policyengine_uk/tests/policy/baseline/finance/benefit/family/child_benefit.yaml,sha256=1BmGpY9lhAJctMQSBgCwOX-TeW2h1B9_hmMHVLZkURg,959
-policyengine_uk/tests/policy/baseline/finance/benefit/family/income_support.yaml,sha256=fzl8g4-TqG9jSyWBY-CL5_L3UeEkF5fjRWvNBSXcGfA,1142
+policyengine_uk/tests/policy/baseline/finance/benefit/family/income_support.yaml,sha256=0SX-onfP3RsQ9-0AojFhZlfsVJyzqkVKyOOHCG9Cerc,603
 policyengine_uk/tests/policy/baseline/finance/benefit/family/tax_credits.yaml,sha256=4waST6yDOWwnnAw90Yv7wL_vKlKXDy9diH9dz9vACow,2474
 policyengine_uk/tests/policy/baseline/finance/benefit/family/universal_credit.yaml,sha256=xz0Ew53OQdleX_CxtP24kfQykgrLY9EglPbEgt708nY,543
 policyengine_uk/tests/policy/baseline/finance/benefit/family/housing_benefit/housing_benefit.yaml,sha256=C3PbDEEpsQ9lHfguTtUagPcq1tNzLkKasMeI2wCkPOQ,455
@@ -721,9 +721,9 @@ policyengine_uk/variables/contrib/policyengine/pre_budget_change_household_net_i
 policyengine_uk/variables/contrib/policyengine/pre_budget_change_household_tax.py,sha256=ug0AjfDVm_KTymDL2DKOklwVVgW-Ug416yCOrm1YPbU,1184
 policyengine_uk/variables/contrib/policyengine/pre_budget_change_ons_household_income_decile.py,sha256=JfxVO6B2WYx776lSa-Do-mXSJ5igCzmc2dDzzfQLeXA,1495
 policyengine_uk/variables/contrib/policyengine/employer_ni/adjusted_employer_cost.py,sha256=ST8qa0iZssevjJEe5c2-3XJfxC6Z6mswsmu2dcaosC8,1479
-policyengine_uk/variables/contrib/policyengine/employer_ni/baseline_employer_cost.py,sha256=3dvHkJubJcYkY5HspAWrS7bm81YiySbobUvwnjYF_qk,1849
+policyengine_uk/variables/contrib/policyengine/employer_ni/baseline_employer_cost.py,sha256=Gi2PzfQ0CO4alFvo0Ir1vbMgv94l7vIlCucWVBW63kM,1978
 policyengine_uk/variables/contrib/policyengine/employer_ni/employer_cost.py,sha256=C71cXMlFA-cI4EUPhQj9O2faaQJgQHxcwMQl27DujCY,666
-policyengine_uk/variables/contrib/policyengine/employer_ni/employer_ni_fixed_employer_cost_change.py,sha256=kPRn_R9oZTkkl7yg6s8XUljhuqQ0fKVxsTIYUy83PhM,3551
+policyengine_uk/variables/contrib/policyengine/employer_ni/employer_ni_fixed_employer_cost_change.py,sha256=yuHFCAlc4rd2FZaay7Zs356jGXTAqc3LD_DHOvKMQqI,3680
 policyengine_uk/variables/contrib/policyengine/employer_ni/employer_ni_response_capital_incidence.py,sha256=ZONuKFK7zwyE33D9Ymgv8iWxXPZ_I44AM-pO2TlfXZY,1615
 policyengine_uk/variables/contrib/policyengine/employer_ni/employer_ni_response_consumer_incidence.py,sha256=73FMwSh_sJ3rZ18WWuP85vKcjH3AHCgdcVFOcD3_U9Q,1652
 policyengine_uk/variables/contrib/ubi_center/carbon_tax.py,sha256=sHmStTjRYK85zKI0GM5yb4ALAV8M1di9gybFvOowp10,940
@@ -842,7 +842,7 @@ policyengine_uk/variables/gov/dwp/income_support_eligible.py,sha256=2slaAZ7De_9J
 policyengine_uk/variables/gov/dwp/income_support_entitlement.py,sha256=Ct-uEKrdHHKpV5y7vS1WvF8SbS_uaL_7gHovSQ8arsM,501
 policyengine_uk/variables/gov/dwp/income_support_reported.py,sha256=twdQtU8mtslfy06NnW-RzI-jiNQiTHDKsusc5z0xsow,292
 policyengine_uk/variables/gov/dwp/is_CTC_child_limit_exempt.py,sha256=_kSBwtMuTLbppTHPR_w2_3TzXUbBMWdh7Khy0xdp91s,1041
-policyengine_uk/variables/gov/dwp/is_CTC_eligible.py,sha256=vAbT8-DwUh5YZKVpRMbJay6jeWZvk3NrBsCTMEaH35Q,515
+policyengine_uk/variables/gov/dwp/is_CTC_eligible.py,sha256=eDWw_fj_dAvE8zZ4XStvxUd06D_D9goDMqvnL1ILTvo,565
 policyengine_uk/variables/gov/dwp/is_SP_age.py,sha256=yiDWUA5FicwN4PSXVQ9CDXwONj96LFtlsGoT22kYH8s,364
 policyengine_uk/variables/gov/dwp/is_WTC_eligible.py,sha256=Oc0ZyQYK09U4PQv00HZtVhXMxh5MQGs3s4M-VjJvv_g,2020
 policyengine_uk/variables/gov/dwp/is_benefit_cap_exempt.py,sha256=JbXVGLI3bUpG525xjuamudRB3rPMBnYEeRf_gcbGrVc,733
@@ -1386,7 +1386,7 @@ policyengine_uk/variables/misc/spi_imputed.py,sha256=iPVlBF_TisM0rtKvO-3-PQ2UYCe
 policyengine_uk/variables/misc/uc_migrated.py,sha256=zFNcUJaO8gwmbL1iY9GKgUt3G6J9yrCraqBV_5dCvlM,306
 policyengine_uk/variables/misc/categories/lower_middle_or_higher.py,sha256=C54tHYz2DmOyvQYCC1bF8RJwRZinhAq_e3aYC-9F5fM,157
 policyengine_uk/variables/misc/categories/lower_or_higher.py,sha256=81NIbLLabRr9NwjpUZDuV8IV8_mqmp5NM-CZvt55TwE,129
-policyengine_uk-2.49.2.dist-info/METADATA,sha256=zhIj6YOm4-Rxv3K_AK79smGzEriNYZDn5eMnj256DiM,3995
-policyengine_uk-2.49.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_uk-2.49.2.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-policyengine_uk-2.49.2.dist-info/RECORD,,
+policyengine_uk-2.49.3.dist-info/METADATA,sha256=ic93AvTj-8TE_uyD7U4WyOD8nUgWxiHq023K2dZXvNs,3995
+policyengine_uk-2.49.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_uk-2.49.3.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+policyengine_uk-2.49.3.dist-info/RECORD,,