use tmd constructor

PSLmodels · May 28, 2024 · c993fbc · c993fbc
1 parent 9c88f53
commit c993fbc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/taxbrain/taxbrain.py b/taxbrain/taxbrain.py
@@ -690,10 +690,9 @@ def _make_calculators(self):
                 weights=tc.Records.PUF_WEIGHTS_FILENAME,
             )
         elif self.microdata == "TMD":
-            records = tc.Records(
+            records = tc.Records.tmd_constructor(
                 "tmd.csv",
                 gfactors=gf_base,
-                weights=tc.Records.TMD_WEIGHTS_FILENAME,
             )
         elif isinstance(self.microdata, dict):
             if self.microdata["growfactors"] is None:
@@ -743,10 +742,9 @@ def _make_calculators(self):
                 weights=tc.Records.PUF_WEIGHTS_FILENAME,
             )
         elif self.microdata == "TMD":
-            records = tc.Records(
+            records = tc.Records.tmd_constructor(
                 "tmd.csv",
                 gfactors=gf_reform,
-                weights=tc.Records.TMD_WEIGHTS_FILENAME,
             )
         elif isinstance(self.microdata, dict):
             if self.microdata["growfactors"] is None:
@@ -813,10 +811,9 @@ def _make_stacked_objects(self):
                 weights=tc.Records.PUF_WEIGHTS_FILENAME,
             )
         elif self.microdata == "TMD":
-            records = tc.Records(
+            records = tc.Records.tmd_constructor(
                 "tmd.csv",
                 gfactors=gf_base,
-                weights=tc.Records.TMD_WEIGHTS_FILENAME,
             )
         elif isinstance(self.microdata, dict):
             if self.microdata["growfactors"] is None:
@@ -868,10 +865,9 @@ def _make_stacked_objects(self):
                 weights=tc.Records.PUF_WEIGHTS_FILENAME,
             )
         elif self.microdata == "TMD":
-            reform_records = tc.Records(
+            records = tc.Records.tmd_constructor(
                 "tmd.csv",
                 gfactors=gf_reform,
-                weights=tc.Records.TMD_WEIGHTS_FILENAME,
             )
         elif isinstance(self.microdata, dict):
             if self.microdata["growfactors"] is None:

diff --git a/taxbrain/tests/test_brain.py b/taxbrain/tests/test_brain.py
@@ -45,10 +45,10 @@ def test_baseline_policy_PUF():
 
 @pytest.mark.requires_tmdcsv
 def test_baseline_policy_TMD():
-    base = {"II_em": {2019: 0}}
+    base = {"II_em": {2021: 0}}
     reform = {"II_em": {2025: 2000}}
 
-    tb = TaxBrain(2018, 2019, microdata="TMD", reform=reform, base_policy=base)
+    tb = TaxBrain(2021, 2022, microdata="TMD", reform=reform, base_policy=base)
     tb.run()