policyengine-uk 2.55.1__py3-none-any.whl → 2.55.3__py3-none-any.whl

policyengine_uk/simulation.py

@@ -43,6 +43,7 @@ class Simulation(CoreSimulation):
 
     calculated_periods: List[str] = []
     _variable_dependencies: Dict[str, List[str]] = None
+    dataset = None
 
     def __init__(
         self,
@@ -84,12 +85,12 @@ class Simulation(CoreSimulation):
 
         self.branches: Dict[str, Simulation] = {}
 
-        if scenario is not None:
-            if scenario.parameter_changes is not None:
-                self.apply_parameter_changes(scenario.parameter_changes)
+        if scenario is not None and scenario.applied_before_data_load:
             if scenario.simulation_modifier is not None:
                 scenario.simulation_modifier(self)
 
+            if scenario.parameter_changes is not None:
+                self.apply_parameter_changes(scenario.parameter_changes)
         # Build simulation from appropriate source
         if situation is not None:
             self.build_from_situation(situation)
@@ -137,6 +138,12 @@ class Simulation(CoreSimulation):
 
         self.calculated_periods = []
 
+        if scenario is not None and not scenario.applied_before_data_load:
+            if scenario.simulation_modifier is not None:
+                scenario.simulation_modifier(self)
+            if scenario.parameter_changes is not None:
+                self.apply_parameter_changes(scenario.parameter_changes)
+
     def reset_calculations(self):
         for variable in self.tax_benefit_system.variables:
             if variable not in self.input_variables:

policyengine_uk/utils/dependencies.py

@@ -69,7 +69,7 @@ def calculate_dependency_contributions(
         if "weight" in variable:
             continue
         sim.get_holder(variable_name).delete_arrays(year)
-        value_type = system.get_variable(variable).value_type
+        value_type = sim.tax_benefit_system.get_variable(variable).value_type
         current_values = sim.calculate(variable, year)
         if value_type == float:
             sim.set_input(variable, year, (current_values * 0).astype(float))

policyengine_uk/utils/scenario.py

@@ -13,6 +13,8 @@ class Scenario(BaseModel):
     using the + operator.
     """
 
+    applied_before_data_load: bool = False
+
     parameter_changes: Optional[
         Dict[
             str,

{policyengine_uk-2.55.1.dist-info → policyengine_uk-2.55.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: policyengine-uk
-Version: 2.55.1
+Version: 2.55.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.55.1.dist-info → policyengine_uk-2.55.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=0FRttWoO05aTG7qvsJ5-mALEgxDHFCVRh28kwKP0XUY,21381
+policyengine_uk/simulation.py,sha256=7kNg5uwucAKyJDA-3L51736r0-KqV-H5W23isT-gJwE,21750
 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=fF3Qhm01PCx26pbG_WRKddacNzbgbuEoayV_xMETDgc,144
@@ -704,9 +704,9 @@ policyengine_uk/utils/__init__.py,sha256=3c4PdgyrexqRqqkACZxyNNbhKduhuYZmzUWm6t1
 policyengine_uk/utils/compare.py,sha256=mhHOiwYoj_lteA0uActRtO9y_Zd7cqUPVgVmBfx4u5o,697
 policyengine_uk/utils/create_ahc_deflator.py,sha256=7GvhywFiUMSsh0syBd-A2MVBr-HU6t4RIuqSgMTyZEw,5463
 policyengine_uk/utils/create_triple_lock.py,sha256=-LpKwztjcDaNYd3RpnMiwxAm48RWsvw0NY9wG6gXIYw,952
-policyengine_uk/utils/dependencies.py,sha256=8epKWmZBeHnxqh3j0sb-Wl3Of_OdKNX-p1syLowUcWs,8197
+policyengine_uk/utils/dependencies.py,sha256=8Ssi99wD0MFAM6Sw6yEDZyDsny0uSf2qc5K-NKhCD6M,8213
 policyengine_uk/utils/parameters.py,sha256=OQTzTkHMdwbphCo0mV7_n_FJT0rdwIKNFTsk_lsdETE,1301
-policyengine_uk/utils/scenario.py,sha256=07PNZhrAi9eb4EgvtGX1wHrj6GPbwd__8AXwY2WeeW4,8297
+policyengine_uk/utils/scenario.py,sha256=FdFHG10Kl3PBEccTvbh1gIOAwfVYKqRKEwkrVbZBgAs,8341
 policyengine_uk/utils/solve_private_school_attendance_factor.py,sha256=RIpxsT6OKhLlNCX5ielTRr2ZkPQOfPpg9AbP062iWh4,1555
 policyengine_uk/utils/water/README.md,sha256=sdBI-JZ-jcRoSUfwNx5wjv5Ig_nM8OPvvjSsSMs_Wh8,443
 policyengine_uk/utils/water/forecast_water_bills.py,sha256=B4vtfJuR8XfBP-KHGyhRp2Oo7X7buN-lDH6tBIXqE2U,2788
@@ -1392,7 +1392,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.55.1.dist-info/METADATA,sha256=cSUuwlgZGi1K9G30p8u9IjNNOZQbt3cZ-Ty9ObKtWD8,3995
-policyengine_uk-2.55.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-policyengine_uk-2.55.1.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-policyengine_uk-2.55.1.dist-info/RECORD,,
+policyengine_uk-2.55.3.dist-info/METADATA,sha256=QLN3eI9ByQbMHTvAr3I52JT57dq8gUr9ZePXdl82Lr8,3995
+policyengine_uk-2.55.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+policyengine_uk-2.55.3.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+policyengine_uk-2.55.3.dist-info/RECORD,,