policyengine-core 3.1.0__tar.gz → 3.2.0__tar.gz

{policyengine_core-3.1.0/policyengine_core.egg-info → policyengine_core-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: policyengine-core
-Version: 3.1.0
+Version: 3.2.0
 Summary: Core microsimulation engine enabling country-specific policy models.
 Home-page: https://github.com/policyengine/policyengine-core
 Author: PolicyEngine

{policyengine_core-3.1.0 → policyengine_core-3.2.0}/policyengine_core/country_template/data/datasets/country_template_dataset.py

@@ -29,6 +29,7 @@ class CountryTemplateDataset(Dataset):
             "person_household_id": {ETERNITY: person_household_id},
             "person_household_role": {ETERNITY: person_household_role},
             "salary": {salary_time_period: salary},
+            "accommodation_size": {salary_time_period: [200, 300]},
             "household_weight": {weight_time_period: weight},
         }
         self.save_dataset(data)

{policyengine_core-3.1.0 → policyengine_core-3.2.0}/policyengine_core/data/dataset.py

@@ -363,3 +363,26 @@ class Dataset:
         )()
 
         return dataset
+
+    @staticmethod
+    def from_dataframe(dataframe: pd.DataFrame, time_period: str = None):
+        """Creates a dataset from a DataFrame.
+
+        Returns:
+            Dataset: The dataset.
+        """
+        file_path = Path(file_path)
+        dataset = type(
+            "Dataset",
+            (Dataset,),
+            {
+                "name": file_path.stem,
+                "label": file_path.stem,
+                "data_format": Dataset.FLAT_FILE,
+                "file_path": "dataframe",
+                "time_period": time_period,
+                "load": lambda: dataframe,
+            },
+        )()
+
+        return dataset

{policyengine_core-3.1.0 → policyengine_core-3.2.0}/policyengine_core/parameters/parameter.py

@@ -137,7 +137,7 @@ class Parameter(AtInstantLike):
         ]
         return clone
 
-    def update(self, period=None, start=None, stop=None, value=None):
+    def update(self, value=None, period=None, start=None, stop=None):
         """
         Change the value for a given period.
 
@@ -156,7 +156,7 @@ class Parameter(AtInstantLike):
             start = period.start
             stop = period.stop
         if start is None:
-            raise ValueError("You must provide either a start or a period")
+            start = "0000-01-01"
         start_str = str(start)
         stop_str = str(stop.offset(1, "day")) if stop else None
 

{policyengine_core-3.1.0 → policyengine_core-3.2.0}/policyengine_core/reforms/reform.py

@@ -1,10 +1,13 @@
 from __future__ import annotations
 
 import copy
-from typing import Callable, Union
+from typing import Callable, Union, TYPE_CHECKING
 
 from policyengine_core.parameters import ParameterNode, Parameter
 from policyengine_core.taxbenefitsystems import TaxBenefitSystem
+
+if TYPE_CHECKING:
+    from policyengine_core.simulations import Simulation
 from policyengine_core.periods import (
     period as period_,
     instant as instant_,
@@ -60,6 +63,8 @@ class Reform(TaxBenefitSystem):
     parameter_values: dict = None
     """The parameter values of the reform. This is used to inform any calls to the PolicyEngine API."""
 
+    simulation: "Simulation" = None
+
     def __init__(self, baseline: TaxBenefitSystem):
         """
         :param baseline: Baseline TaxBenefitSystem.

{policyengine_core-3.1.0 → policyengine_core-3.2.0}/policyengine_core/simulations/simulation.py

@@ -85,7 +85,6 @@ class Simulation:
         reform: Reform = None,
         trace: bool = False,
     ):
-        reform_applied_after = False
         if tax_benefit_system is None:
             if (
                 self.default_tax_benefit_system_instance is not None
@@ -94,20 +93,11 @@ class Simulation:
                 tax_benefit_system = self.default_tax_benefit_system_instance
             else:
                 # If reform is taken as an arg, pass it
-                try:
-                    tax_benefit_system = self.default_tax_benefit_system(
-                        reform=reform
-                    )
-                except:
-                    tax_benefit_system = self.default_tax_benefit_system()
-                    reform_applied_after = True
+                tax_benefit_system = self.default_tax_benefit_system()
             self.tax_benefit_system = tax_benefit_system
 
         self.reform = reform
         self.tax_benefit_system = tax_benefit_system
-
-        if reform_applied_after and reform is not None:
-            self.apply_reform(reform)
         self.branch_name = "default"
 
         if dataset is None:
@@ -169,6 +159,11 @@ class Simulation:
                 self.dataset = dataset
             self.build_from_dataset()
 
+        self.tax_benefit_system.simulation = self
+
+        if self.reform is not None:
+            self.tax_benefit_system.apply_reform_set(self.reform)
+
         # Backwards compatibility methods
         self.calc = self.calculate
         self.df = self.calculate_dataframe

{policyengine_core-3.1.0 → policyengine_core-3.2.0/policyengine_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: policyengine-core
-Version: 3.1.0
+Version: 3.2.0
 Summary: Core microsimulation engine enabling country-specific policy models.
 Home-page: https://github.com/policyengine/policyengine-core
 Author: PolicyEngine

{policyengine_core-3.1.0 → policyengine_core-3.2.0}/setup.py

@@ -50,7 +50,7 @@ dev_requirements = [
 
 setup(
     name="policyengine-core",
-    version="3.1.0",
+    version="3.2.0",
     author="PolicyEngine",
     author_email="hello@policyengine.org",
     classifiers=[