Merge pull request #1331 from PolicyEngine/fix/parameter-bug

Fix/parameter bug

Author: MaxGhenis

policyengine_uk/simulation.py

@@ -70,12 +70,6 @@ def __init__(
         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 @@ def __init__(
             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/variables/contrib/policyengine/employer_ni/baseline_employer_cost.py

@@ -35,7 +35,11 @@ def formula(person, period, parameters):
         )
 
         # 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 @@ def formula(person, period, parameters):
         )
 
         # 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
         )