diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 420a278c3..76a9b21ae 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,4 +1,4 @@ -name: Build Package and Test Source Code [Python 3.9, 3.10, 3.11, 3.12] +name: Build Package and Test Source Code [Python 3.10, 3.11, 3.12] on: [push, pull_request] @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: [3.9, '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] steps: - name: Checkout @@ -36,7 +36,7 @@ jobs: run: | pytest -m 'not requires_pufcsv and not requires_tmdcsv and not pre_release and not local' --cov=./ --cov-report=xml - name: Upload coverage to Codecov - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' && contains(github.repository, 'PSLmodels/Tax-Calculator') uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos diff --git a/.github/workflows/check_jupyterbook.yml b/.github/workflows/check_jupyterbook.yml index 4a491fe5e..3c3b65950 100644 --- a/.github/workflows/check_jupyterbook.yml +++ b/.github/workflows/check_jupyterbook.yml @@ -26,4 +26,4 @@ jobs: pip install -e . python docs/guide/make/make_uguide.py cd docs - jb build . \ No newline at end of file + jb build . diff --git a/README.md b/README.md index dcd1fa597..55daa6dd4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ | | | | --- | --- | | Org | [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CCO-1.0](https://img.shields.io/badge/OS%20License-CCO%201.0-yellow)](https://github.com/PSLmodels/Tax-Calculator/blob/master/LICENSE) [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://pslmodels.github.io/Tax-Calculator/) | -| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)| +| Package | [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)| | Testing | ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/deploy_jupyterbook.yml/badge.svg?branch=master) [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator) | diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index a3c721b33..d618a778f 100755 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -8,22 +8,22 @@ build: requirements: build: - - "python>=3.9, <3.13" - - "numpy>=1.20" + - "python>=3.10, <3.13" + - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" - - "paramtools>=0.18.2" + - "paramtools>=0.18.3" - numba - curl - openpyxl - behresp run: - - "python>=3.9, <3.13" - - "numpy>=1.20" + - "python>=3.10, <3.13" + - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" - - "paramtools>=0.18.2" + - "paramtools>=0.18.3" - numba - curl - openpyxl diff --git a/docs/about/releases.md b/docs/about/releases.md index ea896f736..c6ce2af8f 100644 --- a/docs/about/releases.md +++ b/docs/about/releases.md @@ -3,6 +3,24 @@ Release history Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclosed) for a complete commit history. +2024-09-14 Release 4.2.2 +------------------------ +(last merged pull request is +[#2801](https://github.com/PSLmodels/Tax-Calculator/pull/2801)) + +**This is a bug-fix release.** + +**API Changes** + +**New Features** +- Non-substantive, cosmetic changes to `policy_current_law.json` file [[#2791](https://github.com/PSLmodels/Tax-Calculator/pull/2791) by Martin Holmer] +- Update `tmd_growfactors.csv` and `tmd_weights.csv.gz` files [[#2797](https://github.com/PSLmodels/Tax-Calculator/pull/2797) by Martin Holmer] + +**Bug Fixes** +- Add missing pre-2022 values for indexed policy parameters [[#2789](https://github.com/PSLmodels/Tax-Calculator/pull/2789) by Martin Holmer] +- Fix education tax credit phase-out parameters [[#2790](https://github.com/PSLmodels/Tax-Calculator/pull/2790) by Martin Holmer] +- Several PRs with updates for dependency versions and other minor changes by Martin Holmer and Jason DeBacker + 2024-07-30 Release 4.2.1 ------------------------ diff --git a/docs/index.md b/docs/index.md index abe53c058..4f97f63b4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -57,7 +57,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described ## Latest release -{doc}`4.2.1 (2024-07-30) ` +{doc}`4.2.2 (2024-09-14) ` If you are already using Tax-Calculator, upgrade using the following command: diff --git a/environment.yml b/environment.yml index c32c15dcb..8032c1e8d 100644 --- a/environment.yml +++ b/environment.yml @@ -2,11 +2,10 @@ name: taxcalc-dev channels: - conda-forge dependencies: -- "python>=3.9, <3.13" -- "numpy>=1.20" +- "python>=3.10, <3.13" +- "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" -- "paramtools>=0.18.2" - numba - curl - pytest @@ -19,3 +18,4 @@ dependencies: - pip - pip: - jupyter-book + - "paramtools>=0.18.3" diff --git a/ppp.py b/ppp.py index 210bcefb5..9ff2df5c1 100644 --- a/ppp.py +++ b/ppp.py @@ -74,3 +74,4 @@ # write new pcl dictionary to policy_current_law.json with open('taxcalc/policy_current_law.json', 'w', encoding='utf-8') as pcl_new: json.dump(pcl, pcl_new, indent=4) + pcl_new.write('\n') diff --git a/setup.py b/setup.py index c5226a8ae..168700c24 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ with open("README.md") as f: longdesc = f.read() -version = "4.2.1" +version = "4.2.2" config = { "description": "Tax Calculator", @@ -24,7 +24,7 @@ "bokeh", "numba", "requests", - "paramtools", + "paramtools>=0.18.3", ], "classifiers": [ "Development Status :: 4 - Beta", @@ -34,7 +34,6 @@ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", diff --git a/taxcalc.egg-info/PKG-INFO b/taxcalc.egg-info/PKG-INFO index fe2a5d517..2ed490aa9 100644 --- a/taxcalc.egg-info/PKG-INFO +++ b/taxcalc.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: taxcalc -Version: 4.2.1 +Version: 4.2.2 Summary: taxcalc Home-page: https://github.com/PSLmodels/Tax-Calculator Download-URL: https://github.com/PSLmodels/Tax-Calculator @@ -12,7 +12,6 @@ Classifier: License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3.12 @@ -25,12 +24,12 @@ Requires-Dist: pandas Requires-Dist: bokeh Requires-Dist: numba Requires-Dist: requests -Requires-Dist: paramtools +Requires-Dist: paramtools>=0.18.3 | | | | --- | --- | | Org | [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CCO-1.0](https://img.shields.io/badge/OS%20License-CCO%201.0-yellow)](https://github.com/PSLmodels/Tax-Calculator/blob/master/LICENSE) [![Jupyter Book Badge](https://jupyterbook.org/badge.svg)](https://pslmodels.github.io/Tax-Calculator/) | -| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3916/) [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)| +| Package | [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3108/) [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3118/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3121/) [![PyPI Latest Release](https://img.shields.io/pypi/v/taxcalc.svg)](https://pypi.org/project/taxcalc/) [![PyPI Downloads](https://img.shields.io/pypi/dm/taxcalc.svg?label=PyPI%20downloads)](https://pypi.org/project/taxcalc/) [![Anaconda](https://img.shields.io/conda/dn/conda-forge/taxcalc?color=brightgreen&label=downloads&logo=conda-forge)](https://anaconda.org/conda-forge/taxcalc)| | Testing | ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/Tax-Calculator/actions/workflows/deploy_jupyterbook.yml/badge.svg?branch=master) [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator) | diff --git a/taxcalc.egg-info/SOURCES.txt b/taxcalc.egg-info/SOURCES.txt index b9685d567..1d6021c0a 100644 --- a/taxcalc.egg-info/SOURCES.txt +++ b/taxcalc.egg-info/SOURCES.txt @@ -1,7 +1,104 @@ +.coveragerc +.gitignore LICENSE MANIFEST.in +Makefile +PSL_catalog.json README.md +codecov.yml +csv_show.sh +csv_vars.sh +environment.yml +extend_tcja.py +gitpr +gitpr.bat +gitsync +gitsync.bat +ppp.py +pytest.ini setup.py +tctest-nojit.sh +.github/FUNDING.yml +.github/workflows/build_and_test.yml +.github/workflows/check_jupyterbook.yml +.github/workflows/deploy_jupyterbook.yml +.github/workflows/deploy_parameters_docs.yml +conda.recipe/bld.bat +conda.recipe/build.sh +conda.recipe/meta.yaml +docs/PSL.svg +docs/_config.yml +docs/_toc.yml +docs/index.md +docs/use_cases.md +docs/_static/atr.png +docs/_static/mtr.png +docs/_static/pch.png +docs/about/LICENSE.md +docs/about/history.md +docs/about/releases.md +docs/about/roadmap.md +docs/api/calcfunctions.rst +docs/api/calculator.rst +docs/api/consumption.rst +docs/api/data.rst +docs/api/decorators.rst +docs/api/growdiff.rst +docs/api/growfactors.rst +docs/api/parameters.rst +docs/api/policy.rst +docs/api/public_api.rst +docs/api/records.rst +docs/api/taxcalcio.rst +docs/api/utils.rst +docs/api/utilsprvt.rst +docs/contributing/RELEASING.md +docs/contributing/contributor_guide.md +docs/contributing/dependencies.md +docs/contributing/param_naming.md +docs/contributing/pr_workflow.md +docs/contributing/testing.md +docs/guide/README.md +docs/guide/assumption_params.md +docs/guide/cli.md +docs/guide/index.md +docs/guide/input_vars.md +docs/guide/output_vars.md +docs/guide/policy_params.md +docs/guide/python_interface.md +docs/guide/make/make_io_vars.py +docs/guide/make/make_params.py +docs/guide/make/make_uguide.py +docs/guide/templates/assumption_params_template.md +docs/guide/templates/input_vars_template.md +docs/guide/templates/output_vars_template.md +docs/guide/templates/policy_params_template.md +docs/recipes/README.md +docs/recipes/convert_all.sh +docs/recipes/index.md +docs/recipes/recipe00.ipynb +docs/recipes/recipe01.ipynb +docs/recipes/recipe02.ipynb +docs/recipes/recipe03.ipynb +docs/recipes/recipe04.ipynb +docs/recipes/recipe04_pandas.ipynb +docs/recipes/recipe05.ipynb +docs/recipes/recipe06.ipynb +docs/recipes/_static/reformA.json +docs/recipes/_static/reformB.json +docs/recipes/_static/reformC.json +docs/recipes/md_src/recipe00.md +docs/recipes/md_src/recipe01.md +docs/recipes/md_src/recipe02.md +docs/recipes/md_src/recipe03.md +docs/recipes/md_src/recipe04.md +docs/recipes/md_src/recipe04_pandas.md +docs/recipes/md_src/recipe05.md +docs/recipes/md_src/recipe06.md +docs/usage/data.md +docs/usage/overview.md +docs/usage/starting.md +docs/usage/tcja_after_2025.md taxcalc/__init__.py taxcalc/calcfunctions.py taxcalc/calculator.py @@ -34,5 +131,115 @@ taxcalc.egg-info/dependency_links.txt taxcalc.egg-info/entry_points.txt taxcalc.egg-info/requires.txt taxcalc.egg-info/top_level.txt +taxcalc/assumptions/ASSUMPTIONS.md +taxcalc/assumptions/README.md +taxcalc/assumptions/economic_assumptions_template.json taxcalc/cli/__init__.py -taxcalc/cli/tc.py \ No newline at end of file +taxcalc/cli/tc.py +taxcalc/reforms/2017_law.json +taxcalc/reforms/2017_law.out.csv +taxcalc/reforms/ARPA.json +taxcalc/reforms/ARPA.out.csv +taxcalc/reforms/BrownKhanna.json +taxcalc/reforms/BrownKhanna.out.csv +taxcalc/reforms/CARES.json +taxcalc/reforms/CARES.out.csv +taxcalc/reforms/ConsolidatedAppropriationsAct2021.json +taxcalc/reforms/ConsolidatedAppropriationsAct2021.out.csv +taxcalc/reforms/Larson2019.json +taxcalc/reforms/Larson2019.out.csv +taxcalc/reforms/README.md +taxcalc/reforms/REFORMS.md +taxcalc/reforms/Renacci.json +taxcalc/reforms/Renacci.out.csv +taxcalc/reforms/SandersDeFazio.json +taxcalc/reforms/SandersDeFazio.out.csv +taxcalc/reforms/TCJA.json +taxcalc/reforms/TCJA.md +taxcalc/reforms/TCJA.out.csv +taxcalc/reforms/Trump2016.json +taxcalc/reforms/Trump2016.out.csv +taxcalc/reforms/Trump2017.json +taxcalc/reforms/Trump2017.out.csv +taxcalc/reforms/cases.csv +taxcalc/reforms/clp.out.csv +taxcalc/reforms/ext.json +taxcalc/reforms/growfactors_ext.csv +taxcalc/reforms/ptaxes0.json +taxcalc/reforms/ptaxes0.out.csv +taxcalc/reforms/ptaxes1.json +taxcalc/reforms/ptaxes1.out.csv +taxcalc/reforms/ptaxes2.json +taxcalc/reforms/ptaxes2.out.csv +taxcalc/reforms/ptaxes3.json +taxcalc/reforms/ptaxes3.out.csv +taxcalc/reforms/rounding2022.json +taxcalc/reforms/rounding2022.out.csv +taxcalc/reforms/archive/Clinton2016.json +taxcalc/reforms/archive/RyanBrady.json +taxcalc/reforms/archive/TCJA_House.json +taxcalc/reforms/archive/TCJA_House_Amended.json +taxcalc/reforms/archive/TCJA_Reconciliation.json +taxcalc/reforms/archive/TCJA_Senate.json +taxcalc/reforms/archive/TCJA_Senate_111417.json +taxcalc/reforms/archive/TCJA_Senate_120117.json +taxcalc/tests/benefits_expect.csv +taxcalc/tests/cmpi_cps_expect.txt +taxcalc/tests/cmpi_puf_expect.txt +taxcalc/tests/conftest.py +taxcalc/tests/cpscsv_agg_expect.csv +taxcalc/tests/puf_var_correl_coeffs_2016.csv +taxcalc/tests/puf_var_wght_means_by_year.csv +taxcalc/tests/pufcsv_agg_expect.csv +taxcalc/tests/pufcsv_mtr_expect.txt +taxcalc/tests/reforms.json +taxcalc/tests/reforms_expect.csv +taxcalc/tests/test_4package.py +taxcalc/tests/test_benefits.py +taxcalc/tests/test_calcfunctions.py +taxcalc/tests/test_calculator.py +taxcalc/tests/test_compare.py +taxcalc/tests/test_compatible_data.py +taxcalc/tests/test_consumption.py +taxcalc/tests/test_cpscsv.py +taxcalc/tests/test_data.py +taxcalc/tests/test_decorators.py +taxcalc/tests/test_growdiff.py +taxcalc/tests/test_growfactors.py +taxcalc/tests/test_parameters.py +taxcalc/tests/test_policy.py +taxcalc/tests/test_puf_var_stats.py +taxcalc/tests/test_pufcsv.py +taxcalc/tests/test_records.py +taxcalc/tests/test_reforms.py +taxcalc/tests/test_responses.py +taxcalc/tests/test_taxcalcio.py +taxcalc/tests/test_tmdcsv.py +taxcalc/tests/test_utils.py +taxcalc/validation/CSV_INPUT_VARS.md +taxcalc/validation/CSV_OUTPUT_VARS.md +taxcalc/validation/README.md +taxcalc/validation/tests_35.sh +taxcalc/validation/taxsim35/Differences_Explained.md +taxcalc/validation/taxsim35/README.md +taxcalc/validation/taxsim35/input_setup.py +taxcalc/validation/taxsim35/main_comparison.py +taxcalc/validation/taxsim35/prepare_taxcalc_input.py +taxcalc/validation/taxsim35/process_taxcalc_output.py +taxcalc/validation/taxsim35/taxsim_emulation.json +taxcalc/validation/taxsim35/taxsim_input.py +taxcalc/validation/taxsim35/tc_sims.py +taxcalc/validation/taxsim35/tests_35.py +taxcalc/validation/taxsim35/expected_differences/a17-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a18-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a19-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a20-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a21-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b17-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b18-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b19-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b20-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/c17-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv \ No newline at end of file diff --git a/taxcalc.egg-info/requires.txt b/taxcalc.egg-info/requires.txt index f8a31659f..2e5f43376 100644 --- a/taxcalc.egg-info/requires.txt +++ b/taxcalc.egg-info/requires.txt @@ -4,4 +4,4 @@ pandas bokeh numba requests -paramtools +paramtools>=0.18.3 diff --git a/taxcalc/__init__.py b/taxcalc/__init__.py index 91eccf03c..99296938d 100644 --- a/taxcalc/__init__.py +++ b/taxcalc/__init__.py @@ -14,4 +14,4 @@ from taxcalc.utils import * from taxcalc.cli import * -__version__ = '4.2.1' +__version__ = '4.2.2' diff --git a/taxcalc/data.py b/taxcalc/data.py index d2d70c382..0b861ffea 100644 --- a/taxcalc/data.py +++ b/taxcalc/data.py @@ -102,7 +102,7 @@ def __init__(self, data, start_year, gfactors=None, weights=None): # ... weights must be same size as data if self.array_length > len(self.WT.index): raise ValueError("Data has more records than weights.") - elif self.array_length < len(self.WT.index): + if self.array_length < len(self.WT.index): # scale-up sub-sample weights by year-specific factor sum_full_weights = self.WT.sum() self.WT = self.WT.iloc[self.__index] @@ -110,9 +110,11 @@ def __init__(self, data, start_year, gfactors=None, weights=None): factor = sum_full_weights / sum_sub_weights self.WT *= factor # ... construct sample weights for current_year - wt_colname = 'WT{}'.format(self.current_year) - if wt_colname in self.WT.columns: - self.s006 = self.WT[wt_colname] * 0.01 + wt_colname = f'WT{self.current_year}' + assert wt_colname in self.WT.columns, ( + f'no weights for start year {self.current_year}' + ) + self.s006 = self.WT[wt_colname] * 0.01 @property def data_year(self): @@ -146,7 +148,10 @@ def increment_year(self): # ... apply variable extrapolation growth factors self._extrapolate(self.__current_year) # ... specify current-year sample weights - wt_colname = 'WT{}'.format(self.__current_year) + wt_colname = f'WT{self.__current_year}' + assert wt_colname in self.WT.columns, ( + f'no weights for new year {self.current_year}' + ) self.s006 = self.WT[wt_colname] * 0.01 # ----- begin private methods of Data class ----- diff --git a/taxcalc/policy_current_law.json b/taxcalc/policy_current_law.json index 0627e45ef..90ca00d05 100644 --- a/taxcalc/policy_current_law.json +++ b/taxcalc/policy_current_law.json @@ -2628,10 +2628,38 @@ "year": 2013, "value": false }, + { + "year": 2014, + "value": false + }, + { + "year": 2015, + "value": false + }, + { + "year": 2016, + "value": false + }, + { + "year": 2017, + "value": false + }, + { + "year": 2018, + "value": false + }, + { + "year": 2019, + "value": false + }, { "year": 2020, "value": true }, + { + "year": 2021, + "value": true + }, { "year": 2022, "value": false @@ -15999,6 +16027,181 @@ "MARS": "widow", "value": 100000.0 }, + { + "year": 2019, + "MARS": "single", + "value": 50000.0 + }, + { + "year": 2019, + "MARS": "mjoint", + "value": 100000.0 + }, + { + "year": 2019, + "MARS": "mseparate", + "value": 50000.0 + }, + { + "year": 2019, + "MARS": "headhh", + "value": 50000.0 + }, + { + "year": 2019, + "MARS": "widow", + "value": 100000.0 + }, + { + "year": 2020, + "MARS": "single", + "value": 50000.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 100000.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 50000.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 50000.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 100000.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 50000.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 100000.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 50000.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 50000.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 100000.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 50000.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 100000.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 50000.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 50000.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 100000.0 + }, + { + "year": 2023, + "MARS": "single", + "value": 50000.0 + }, + { + "year": 2023, + "MARS": "mjoint", + "value": 100000.0 + }, + { + "year": 2023, + "MARS": "mseparate", + "value": 50000.0 + }, + { + "year": 2023, + "MARS": "headhh", + "value": 50000.0 + }, + { + "year": 2023, + "MARS": "widow", + "value": 100000.0 + }, + { + "year": 2024, + "MARS": "single", + "value": 50000.0 + }, + { + "year": 2024, + "MARS": "mjoint", + "value": 100000.0 + }, + { + "year": 2024, + "MARS": "mseparate", + "value": 50000.0 + }, + { + "year": 2024, + "MARS": "headhh", + "value": 50000.0 + }, + { + "year": 2024, + "MARS": "widow", + "value": 100000.0 + }, + { + "year": 2025, + "MARS": "single", + "value": 50000.0 + }, + { + "year": 2025, + "MARS": "mjoint", + "value": 100000.0 + }, + { + "year": 2025, + "MARS": "mseparate", + "value": 50000.0 + }, + { + "year": 2025, + "MARS": "headhh", + "value": 50000.0 + }, + { + "year": 2025, + "MARS": "widow", + "value": 100000.0 + }, { "year": 2026, "MARS": "single", @@ -17739,7 +17942,7 @@ "value": [ { "year": 2013, - "value": 2000 + "value": 2000.0 } ], "validators": { diff --git a/taxcalc/tmd_growfactors.csv b/taxcalc/tmd_growfactors.csv index 9435042a6..bea7ae2f0 100644 --- a/taxcalc/tmd_growfactors.csv +++ b/taxcalc/tmd_growfactors.csv @@ -1,55 +1,55 @@ YEAR,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS,ACGNS,ASOCSEC,AUCOMP,AIPD,ABENOTHER,ABENMCARE,ABENMCAID,ABENSSI,ABENSNAP,ABENWIC,ABENHOUSING,ABENTANF,ABENVET -2021,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2022,1.014347,1.742914,1.047552,1.07229,1.040311,1.076282,1.022527,1.022546,1.047553,1.047566,1.049118,1.042358,0.631565,1.04749,0.152665,1.022138,1.030159,1.048769,1.047573,0.999851,1.0,1.002545,1.034942,1.0,1.0 -2023,1.050108,0.653145,1.091056,1.05402,1.004761,1.050035,1.013156,1.013121,1.091037,1.091047,1.026196,1.126711,1.0525,1.085497,0.748857,1.058072,1.030193,1.050822,1.048715,1.000448,1.0,1.003807,1.034968,1.0,1.0 -2024,1.046242,0.895528,1.007166,1.0255,1.01407,1.040377,1.0397,1.03963,1.007187,1.007157,1.156028,1.023049,0.932271,1.052921,1.337549,1.054081,1.030334,1.048426,1.051767,0.99776,1.0,1.002528,1.034951,1.0,1.0 -2025,1.040442,0.963117,1.020457,1.02198,0.958663,1.038977,1.037682,1.037745,1.020415,1.020444,1.091746,1.02538,0.97747,1.031721,1.154874,1.047914,1.030635,1.046248,1.052213,1.002245,1.0,1.003783,1.034897,1.0,1.0 -2026,1.039294,0.987094,1.014705,1.02074,1.014023,1.035978,1.037783,1.037762,1.014711,1.014716,1.098184,1.019802,0.970235,1.030992,1.035291,1.046856,1.030633,1.072236,1.0,0.999552,1.0,1.002513,1.034808,1.0,1.0 -2027,1.037119,0.998822,1.017535,1.01946,1.013312,1.033569,1.03414,1.034138,1.017568,1.017583,1.066606,1.013266,0.993714,1.031791,1.045541,1.044372,1.030788,1.0,1.0,1.0,1.0,1.002506,1.034863,1.0,1.0 -2028,1.036799,1.006582,1.023966,1.01942,1.013356,1.033042,1.031594,1.03158,1.023985,1.02393,1.050716,1.021542,1.009158,1.03344,1.043558,1.043967,1.030942,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2029,1.035913,1.010333,1.028149,1.01966,1.013612,1.033365,1.030869,1.030888,1.028085,1.028143,1.03013,1.032091,1.018962,1.033664,1.045739,1.042825,1.031131,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2030,1.036423,1.01018,1.024121,1.01977,1.013855,1.03321,1.030563,1.030595,1.02417,1.024128,1.036979,1.032934,1.024538,1.034401,1.043738,1.043174,1.03133,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2031,1.036362,1.010259,1.024733,1.01991,1.014016,1.032812,1.031233,1.03124,1.024699,1.024734,1.039197,1.032793,1.027842,1.036645,1.038241,1.042951,1.03151,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2032,1.036409,1.009979,1.028,1.01999,1.014306,1.032126,1.032334,1.032295,1.028004,1.027983,1.04014,1.03261,1.029719,1.036435,1.031319,1.042807,1.031644,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2033,1.035793,1.008195,1.02813,1.02002,1.014309,1.031481,1.033961,1.033991,1.028128,1.02811,1.031669,1.03246,1.030798,1.037554,1.028443,1.042009,1.031857,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2034,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2035,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2036,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2037,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2038,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2039,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2040,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2041,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2042,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2043,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2044,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2045,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2046,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2047,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2048,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2049,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2050,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2051,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2052,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2053,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2054,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2055,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2056,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2057,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2058,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2059,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2060,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2061,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2062,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2063,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2064,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2065,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2066,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2067,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2068,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2069,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2070,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2071,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2072,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2073,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2074,1.035385,1.008203,1.02971,1.02,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.03748,1.029528,1.041408,1.032059,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2021,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2022,1.014347,1.742914,1.047552,1.072290,1.040311,1.175282,1.022527,1.022546,1.047553,1.047566,1.049118,1.003358,0.592565,0.855490,0.152665,1.022138,1.030159,1.048769,1.047573,0.999851,1.000000,1.002545,1.034942,1.000000,1.000000 +2023,1.050108,0.653145,1.091056,1.054020,1.004761,1.050035,1.013156,1.013121,1.091037,1.091047,1.026196,1.126711,1.052500,1.085497,0.748857,1.058072,1.030193,1.050822,1.048715,1.000448,1.000000,1.003807,1.034968,1.000000,1.000000 +2024,1.046242,0.895528,1.007166,1.025500,1.014070,1.040377,1.039700,1.039630,1.007187,1.007157,1.156028,1.023049,0.932271,1.052921,1.337549,1.054081,1.030334,1.048426,1.051767,0.997760,1.000000,1.002528,1.034951,1.000000,1.000000 +2025,1.040442,0.963117,1.020457,1.021980,0.958663,1.038977,1.037682,1.037745,1.020415,1.020444,1.091746,1.025380,0.977470,1.031721,1.154874,1.047914,1.030635,1.046248,1.052213,1.002245,1.000000,1.003783,1.034897,1.000000,1.000000 +2026,1.039294,0.987094,1.014705,1.020740,1.014023,1.035978,1.037783,1.037762,1.014711,1.014716,1.098184,1.019802,0.970235,1.030992,1.035291,1.046856,1.030633,1.072236,1.000000,0.999552,1.000000,1.002513,1.034808,1.000000,1.000000 +2027,1.037119,0.998822,1.017535,1.019460,1.013312,1.033569,1.034140,1.034138,1.017568,1.017583,1.066606,1.013266,0.993714,1.031791,1.045541,1.044372,1.030788,1.000000,1.000000,1.000000,1.000000,1.002506,1.034863,1.000000,1.000000 +2028,1.036799,1.006582,1.023966,1.019420,1.013356,1.033042,1.031594,1.031580,1.023985,1.023930,1.050716,1.021542,1.009158,1.033440,1.043558,1.043967,1.030942,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2029,1.035913,1.010333,1.028149,1.019660,1.013612,1.033365,1.030869,1.030888,1.028085,1.028143,1.030130,1.032091,1.018962,1.033664,1.045739,1.042825,1.031131,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2030,1.036423,1.010180,1.024121,1.019770,1.013855,1.033210,1.030563,1.030595,1.024170,1.024128,1.036979,1.032934,1.024538,1.034401,1.043738,1.043174,1.031330,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2031,1.036362,1.010259,1.024733,1.019910,1.014016,1.032812,1.031233,1.031240,1.024699,1.024734,1.039197,1.032793,1.027842,1.036645,1.038241,1.042951,1.031510,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2032,1.036409,1.009979,1.028000,1.019990,1.014306,1.032126,1.032334,1.032295,1.028004,1.027983,1.040140,1.032610,1.029719,1.036435,1.031319,1.042807,1.031644,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2033,1.035793,1.008195,1.028130,1.020020,1.014309,1.031481,1.033961,1.033991,1.028128,1.028110,1.031669,1.032460,1.030798,1.037554,1.028443,1.042009,1.031857,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2034,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2035,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2036,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2037,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2038,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2039,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2040,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2041,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2042,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2043,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2044,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2045,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2046,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2047,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2048,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2049,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2050,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2051,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2052,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2053,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2054,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2055,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2056,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2057,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2058,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2059,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2060,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2061,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2062,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2063,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2064,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2065,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2066,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2067,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2068,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2069,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2070,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2071,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2072,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2073,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 +2074,1.035385,1.008203,1.029710,1.020000,1.014443,1.030912,1.033294,1.033253,1.029705,1.029722,1.027096,1.032231,1.031308,1.037480,1.029528,1.041408,1.032059,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000,1.000000 diff --git a/taxcalc/tmd_weights.csv.gz b/taxcalc/tmd_weights.csv.gz index 153f12a51..e92f8b47f 100644 Binary files a/taxcalc/tmd_weights.csv.gz and b/taxcalc/tmd_weights.csv.gz differ diff --git a/taxcalc/validation/taxsim35/expected_differences/a21-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/a21-taxdiffs-expect.csv index 39747593b..6ac04ebb3 100644 --- a/taxcalc/validation/taxsim35/expected_differences/a21-taxdiffs-expect.csv +++ b/taxcalc/validation/taxsim35/expected_differences/a21-taxdiffs-expect.csv @@ -1,5 +1,5 @@ ,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val -iitax,6,-1.5300000000006548,104,-9933.15,-9934.68 +iitax,0,0.0,no diff,no diff,no diff statetax,0,0.0,no diff,no diff,no diff payrolltax,0,0.0,no diff,no diff,no diff mtr_inctax,1,80.1,150,30.9,111.0 @@ -18,7 +18,7 @@ gen_tax_credit,0,0.0,no diff,no diff,no diff non_refundable_child_odep_credit,0,0.0,no diff,no diff,no diff c11070,0,0.0,no diff,no diff,no diff c07180,0,0.0,no diff,no diff,no diff -eitc,6,1.5300000000000011,136,56.15,57.68 +eitc,0,0.0,no diff,no diff,no diff c62100,0,0.0,no diff,no diff,no diff amt_liability,0,0.0,no diff,no diff,no diff iitax_before_credits_ex_AMT,0,0.0,no diff,no diff,no diff diff --git a/taxcalc/validation/taxsim35/expected_differences/b18-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/b18-taxdiffs-expect.csv index a18d73320..a1edfa410 100644 --- a/taxcalc/validation/taxsim35/expected_differences/b18-taxdiffs-expect.csv +++ b/taxcalc/validation/taxsim35/expected_differences/b18-taxdiffs-expect.csv @@ -1,8 +1,8 @@ ,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val -iitax,1000,-28040.51999999996,221,465566.97,437526.45 +iitax,1000,-27543.059999999998,239,422043.45,394500.39 statetax,0,0.0,no diff,no diff,no diff payrolltax,942,15897.89,861,43904.8,59802.69 -mtr_inctax,445,-15.39,869,48.39,33.0 +mtr_inctax,395,-18.090000000000003,114,42.09,24.0 mtr_state,0,0.0,no diff,no diff,no diff c00100,567,-7949.869999999995,861,984467.76,976517.89 e02300,0,0.0,no diff,no diff,no diff @@ -11,15 +11,15 @@ post_phase_out_pe,0,0.0,no diff,no diff,no diff phased_out_pe,0,0.0,no diff,no diff,no diff c21040,0,0.0,no diff,no diff,no diff c04470,0,0.0,no diff,no diff,no diff -c04800,1000,-77330.33000000007,239,1308141.76,1230811.43 -taxbc,1000,-32120.51999999996,221,467556.97,435436.45 +c04800,1000,-74440.69999999995,239,1308141.76,1233701.06 +taxbc,1000,-31100.119999999995,221,467556.97,436456.85 exemption_surtax,0,0.0,no diff,no diff,no diff gen_tax_credit,0,0.0,no diff,no diff,no diff non_refundable_child_odep_credit,15,311.75,930,1355.76,1667.51 c11070,0,0.0,no diff,no diff,no diff c07180,0,0.0,no diff,no diff,no diff eitc,0,0.0,no diff,no diff,no diff -c62100,1000,134121.56000000006,353,1329565.93,1463687.49 -amt_liability,305,20536.04,892,0.0,20536.04 -iitax_before_credits_ex_AMT,1000,-28612.22000000003,239,419991.45,391379.23 +c62100,1000,-74440.69999999995,239,1332141.76,1257701.06 +amt_liability,0,0.0,no diff,no diff,no diff +iitax_before_credits_ex_AMT,1000,-27543.059999999998,239,419991.45,392448.39 recovery_rebate_credit,0,0.0,no diff,no diff,no diff diff --git a/taxcalc/validation/taxsim35/expected_differences/b19-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/b19-taxdiffs-expect.csv index 87b234db3..b526b9fa8 100644 --- a/taxcalc/validation/taxsim35/expected_differences/b19-taxdiffs-expect.csv +++ b/taxcalc/validation/taxsim35/expected_differences/b19-taxdiffs-expect.csv @@ -1,8 +1,8 @@ ,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val -iitax,1000,-28131.679999999993,956,292614.24,264482.56 +iitax,1000,-27824.47999999998,956,292614.24,264789.76 statetax,0,0.0,no diff,no diff,no diff payrolltax,946,16470.230000000003,583,42555.56,59025.79 -mtr_inctax,428,-16.990000000000002,431,44.99,28.0 +mtr_inctax,361,-19.07,476,43.07,24.0 mtr_state,0,0.0,no diff,no diff,no diff c00100,535,-8235.959999999963,583,1095818.15,1087582.19 e02300,0,0.0,no diff,no diff,no diff @@ -11,15 +11,15 @@ post_phase_out_pe,0,0.0,no diff,no diff,no diff phased_out_pe,0,0.0,no diff,no diff,no diff c21040,0,0.0,no diff,no diff,no diff c04470,0,0.0,no diff,no diff,no diff -c04800,1000,-77845.41000000003,956,960616.86,882771.45 -taxbc,1000,-31634.48999999999,600,394678.94,363044.45 +c04800,1000,-75201.29999999993,956,960616.86,885415.56 +taxbc,1000,-30819.72000000003,600,394678.94,363859.22 exemption_surtax,0,0.0,no diff,no diff,no diff gen_tax_credit,0,0.0,no diff,no diff,no diff non_refundable_child_odep_credit,9,389.85000000000014,113,908.31,1298.16 c11070,0,0.0,no diff,no diff,no diff c07180,0,0.0,no diff,no diff,no diff eitc,0,0.0,no diff,no diff,no diff -c62100,1000,138070.68000000017,759,1632066.41,1770137.09 -amt_liability,301,20274.89,863,0.0,20274.89 -iitax_before_credits_ex_AMT,1000,-28802.79999999999,956,291018.24,262215.44 +c62100,1000,-75201.29999999993,956,986316.86,911115.56 +amt_liability,0,0.0,no diff,no diff,no diff +iitax_before_credits_ex_AMT,1000,-27824.47999999998,956,291018.24,263193.76 recovery_rebate_credit,0,0.0,no diff,no diff,no diff diff --git a/taxcalc/validation/taxsim35/expected_differences/b20-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/b20-taxdiffs-expect.csv index e90e637d9..6356effb2 100644 --- a/taxcalc/validation/taxsim35/expected_differences/b20-taxdiffs-expect.csv +++ b/taxcalc/validation/taxsim35/expected_differences/b20-taxdiffs-expect.csv @@ -1,8 +1,8 @@ ,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val -iitax,1000,-21050.880000000005,600,240306.89,219256.01 +iitax,1000,-27821.880000000005,957,252485.92,224664.04 statetax,0,0.0,no diff,no diff,no diff payrolltax,939,17066.6,860,50776.77,67843.37 -mtr_inctax,843,-19.299999999999997,280,52.3,33.0 +mtr_inctax,387,-21.15,159,50.15,29.0 mtr_state,0,0.0,no diff,no diff,no diff c00100,546,-8534.540000000037,860,1450796.75,1442262.21 e02300,1,10000.0,905,0.0,10000.0 @@ -11,15 +11,15 @@ post_phase_out_pe,0,0.0,no diff,no diff,no diff phased_out_pe,0,0.0,no diff,no diff,no diff c21040,0,0.0,no diff,no diff,no diff c04470,0,0.0,no diff,no diff,no diff -c04800,1000,-78096.15999999992,957,856997.08,778900.92 -taxbc,1000,-25130.880000000005,600,242600.89,217470.01 +c04800,1000,-75194.26000000001,957,856997.08,781802.82 +taxbc,1000,-30928.869999999995,903,446385.24,415456.37 exemption_surtax,0,0.0,no diff,no diff,no diff gen_tax_credit,0,0.0,no diff,no diff,no diff non_refundable_child_odep_credit,7,-60.12000000000012,562,1812.92,1752.8 c11070,0,0.0,no diff,no diff,no diff c07180,0,0.0,no diff,no diff,no diff eitc,0,0.0,no diff,no diff,no diff -c62100,1000,131537.64000000013,56,1352907.13,1484444.77 -amt_liability,144,13043.77,604,0.0,13043.77 -iitax_before_credits_ex_AMT,1000,-21572.860000000015,916,187882.78,166309.91999999998 +c62100,1000,-75194.26000000001,957,883097.08,807902.82 +amt_liability,0,0.0,no diff,no diff,no diff +iitax_before_credits_ex_AMT,1000,-27821.880000000005,957,251687.92,223866.04 recovery_rebate_credit,3,1568.03,613,0.0,1568.03 diff --git a/taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv index 6855acbc9..8a524c45c 100644 --- a/taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv +++ b/taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv @@ -1,25 +1,25 @@ -,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val -iitax,1000,-26282.14,621,363908.06,337625.92 -statetax,0,0,no diff,no diff,no diff -payrolltax,927,17673.56,359,38169.65,55843.21 -mtr_inctax,475,-25.15,252,25.15,0 -mtr_state,0,0,no diff,no diff,no diff -c00100,588,-8838.32,359,923028.96,914190.64 -e02300,0,0,no diff,no diff,no diff -c02500,0,0,no diff,no diff,no diff -post_phase_out_pe,0,0,no diff,no diff,no diff -phased_out_pe,0,0,no diff,no diff,no diff -c21040,0,0,no diff,no diff,no diff -c04470,0,0,no diff,no diff,no diff -c04800,1000,-79781.2,557,863181.07,783399.87 -taxbc,1000,-32968.14,11,236011.88,203043.74 -exemption_surtax,0,0,no diff,no diff,no diff -gen_tax_credit,0,0,no diff,no diff,no diff -non_refundable_child_odep_credit,6,255.18,202,1305.4,1560.58 -c11070,6,255.18,202,1305.4,1560.58 -c07180,0,0,no diff,no diff,no diff -eitc,0,0,no diff,no diff,no diff -c62100,1000,134481.4,718,1516232.63,1650714.03 -amt_liability,317,20260.32,513,0,20260.32 -iitax_before_credits_ex_AMT,1000,-29519.05,557,253689.5,224170.45 -recovery_rebate_credit,0,0,no diff,no diff,no diff \ No newline at end of file +,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val +iitax,1000,-27772.820000000007,557,254981.5,227208.68 +statetax,0,0.0,no diff,no diff,no diff +payrolltax,927,17673.559999999998,359,38169.65,55843.21 +mtr_inctax,403,-25.15,252,25.15,0.0 +mtr_state,0,0.0,no diff,no diff,no diff +c00100,588,-8838.319999999949,359,923028.96,914190.64 +e02300,0,0.0,no diff,no diff,no diff +c02500,0,0.0,no diff,no diff,no diff +post_phase_out_pe,0,0.0,no diff,no diff,no diff +phased_out_pe,0,0.0,no diff,no diff,no diff +c21040,0,0.0,no diff,no diff,no diff +c04470,0,0.0,no diff,no diff,no diff +c04800,1000,-75061.65999999992,557,863181.07,788119.41 +taxbc,1000,-31201.459999999992,11,236011.88,204810.42 +exemption_surtax,0,0.0,no diff,no diff,no diff +gen_tax_credit,0,0.0,no diff,no diff,no diff +non_refundable_child_odep_credit,6,255.17999999999984,202,1305.4,1560.58 +c11070,6,255.17999999999984,202,1305.4,1560.58 +c07180,0,0.0,no diff,no diff,no diff +eitc,0,0.0,no diff,no diff,no diff +c62100,1000,-75061.65999999992,557,888281.07,813219.41 +amt_liability,1,2058.18,252,0.0,2058.18 +iitax_before_credits_ex_AMT,1000,-27772.820000000007,557,253689.5,225916.68 +recovery_rebate_credit,0,0.0,no diff,no diff,no diff diff --git a/taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv index 4ba1772f0..1032c3e7e 100644 --- a/taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv +++ b/taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv @@ -1,8 +1,8 @@ ,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val -iitax,1000,-28423.099999999977,608,351510.6,323087.5 +iitax,1000,-27840.640000000014,246,246001.89,218161.25 statetax,0,0.0,no diff,no diff,no diff payrolltax,939,15897.900000000001,861,39167.24,55065.14 -mtr_inctax,424,-17.490000000000002,17,50.49,33.0 +mtr_inctax,384,-21.490000000000002,17,50.49,29.0 mtr_state,0,0.0,no diff,no diff,no diff c00100,573,-7949.859999999986,861,963275.51,955325.65 e02300,0,0.0,no diff,no diff,no diff @@ -10,16 +10,16 @@ c02500,0,0.0,no diff,no diff,no diff post_phase_out_pe,0,0.0,no diff,no diff,no diff phased_out_pe,0,0.0,no diff,no diff,no diff c21040,0,0.0,no diff,no diff,no diff -c04470,93,26000.0,368,0.0,26000.0 -c04800,1000,-76819.18999999994,608,1114955.69,1038136.5 -taxbc,1000,-33247.869999999995,956,229141.22,195893.35 +c04470,0,0.0,no diff,no diff,no diff +c04800,1000,-75244.97999999998,246,828115.91,752870.93 +taxbc,1000,-32292.660000000003,956,229141.22,196848.56 exemption_surtax,0,0.0,no diff,no diff,no diff gen_tax_credit,0,0.0,no diff,no diff,no diff non_refundable_child_odep_credit,12,234.75,561,1293.63,1528.38 c11070,0,0.0,no diff,no diff,no diff c07180,0,0.0,no diff,no diff,no diff eitc,0,0.0,no diff,no diff,no diff -c62100,1000,133510.84999999986,115,1770440.11,1903950.96 -amt_liability,247,17177.0,892,0.0,17177.0 -iitax_before_credits_ex_AMT,1000,-28423.099999999977,608,350552.6,322129.5 +c62100,1000,-75244.97999999998,246,854715.91,779470.93 +amt_liability,0,0.0,no diff,no diff,no diff +iitax_before_credits_ex_AMT,1000,-27840.640000000014,246,245271.89,217431.25 recovery_rebate_credit,0,0.0,no diff,no diff,no diff diff --git a/taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv index e9e501480..95259cd1f 100644 --- a/taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv +++ b/taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv @@ -1,8 +1,8 @@ ,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val -iitax,1000,-28313.72000000003,837,312222.07,283908.35 +iitax,1000,-27608.780000000028,837,312222.07,284613.29 statetax,0,0.0,no diff,no diff,no diff payrolltax,942,16454.309999999998,873,46662.91,63117.22 -mtr_inctax,400,-19.259999999999998,130,48.26,29.0 +mtr_inctax,366,-19.259999999999998,130,48.26,29.0 mtr_state,0,0.0,no diff,no diff,no diff c00100,550,-8228.23999999999,873,1128648.72,1120420.48 e02300,0,0.0,no diff,no diff,no diff @@ -10,16 +10,16 @@ c02500,0,0.0,no diff,no diff,no diff post_phase_out_pe,0,0.0,no diff,no diff,no diff phased_out_pe,0,0.0,no diff,no diff,no diff c21040,0,0.0,no diff,no diff,no diff -c04470,88,27000.0,187,0.0,27000.0 -c04800,1000,-76708.95999999996,758,759327.73,682618.77 -taxbc,1000,-30693.73000000004,837,313966.08,283272.35 +c04470,0,0.0,no diff,no diff,no diff +c04800,1000,-74618.33999999997,837,1015746.15,941127.81 +taxbc,1000,-29988.790000000037,837,313966.08,283977.29 exemption_surtax,0,0.0,no diff,no diff,no diff gen_tax_credit,0,0.0,no diff,no diff,no diff non_refundable_child_odep_credit,10,382.96000000000004,3,3128.1,3511.06 c11070,0,0.0,no diff,no diff,no diff c07180,0,0.0,no diff,no diff,no diff eitc,0,0.0,no diff,no diff,no diff -c62100,1000,135318.34999999986,388,1091657.28,1226975.63 -amt_liability,251,16473.47,863,0.0,16473.47 -iitax_before_credits_ex_AMT,1000,-28382.320000000007,758,218411.26,190028.94 +c62100,1000,-74618.33999999997,837,1025746.15,951127.81 +amt_liability,0,0.0,no diff,no diff,no diff +iitax_before_credits_ex_AMT,1000,-27608.780000000028,837,311586.07,283977.29 recovery_rebate_credit,0,0.0,no diff,no diff,no diff diff --git a/taxcalc/validation/taxsim35/expected_differences/c20-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/c20-taxdiffs-expect.csv new file mode 100644 index 000000000..84939cd1d --- /dev/null +++ b/taxcalc/validation/taxsim35/expected_differences/c20-taxdiffs-expect.csv @@ -0,0 +1,25 @@ +,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val +iitax,1000,-27587.579999999958,966,377963.72,350376.14 +statetax,0,0.0,no diff,no diff,no diff +payrolltax,938,17032.1,397,31756.92,48789.02 +mtr_inctax,390,-26.560000000000002,153,55.56,29.0 +mtr_state,0,0.0,no diff,no diff,no diff +c00100,571,8800.0,912,148171.91,156971.91 +e02300,1,19000.0,912,0.0,19000.0 +c02500,0,0.0,no diff,no diff,no diff +post_phase_out_pe,0,0.0,no diff,no diff,no diff +phased_out_pe,0,0.0,no diff,no diff,no diff +c21040,0,0.0,no diff,no diff,no diff +c04470,0,0.0,no diff,no diff,no diff +c04800,1000,-74561.02000000002,966,1192564.1,1118003.08 +taxbc,1000,-30679.309999999998,830,319552.27,288872.96 +exemption_surtax,0,0.0,no diff,no diff,no diff +gen_tax_credit,0,0.0,no diff,no diff,no diff +non_refundable_child_odep_credit,11,402.75,218,6454.73,6857.48 +c11070,0,0.0,no diff,no diff,no diff +c07180,0,0.0,no diff,no diff,no diff +eitc,0,0.0,no diff,no diff,no diff +c62100,1000,-74561.02000000002,966,1202564.1,1128003.08 +amt_liability,0,0.0,no diff,no diff,no diff +iitax_before_credits_ex_AMT,1000,-27587.579999999958,966,377887.72,350300.14 +recovery_rebate_credit,2,472.78,449,0.0,472.78 diff --git a/taxcalc/validation/taxsim35/expected_differences/c21-taxdiffs-expect.csv b/taxcalc/validation/taxsim35/expected_differences/c21-taxdiffs-expect.csv new file mode 100644 index 000000000..2c5a57c90 --- /dev/null +++ b/taxcalc/validation/taxsim35/expected_differences/c21-taxdiffs-expect.csv @@ -0,0 +1,25 @@ +,# of differing records,max_diff,max_diff_index,max_diff_taxsim_val,max_diff_taxcalc_val +iitax,1000,-27509.429999999993,104,238353.58,210844.15 +statetax,0,0.0,no diff,no diff,no diff +payrolltax,927,17673.57,359,42415.9,60089.47 +mtr_inctax,418,-20.1,120,49.1,29.0 +mtr_state,0,0.0,no diff,no diff,no diff +c00100,560,-8838.319999999832,359,1081408.68,1072570.36 +e02300,0,0.0,no diff,no diff,no diff +c02500,0,0.0,no diff,no diff,no diff +post_phase_out_pe,0,0.0,no diff,no diff,no diff +phased_out_pe,0,0.0,no diff,no diff,no diff +c21040,0,0.0,no diff,no diff,no diff +c04470,0,0.0,no diff,no diff,no diff +c04800,1000,-74349.80999999994,104,818635.34,744285.53 +taxbc,1000,-30739.429999999993,104,239417.58,208678.15 +exemption_surtax,0,0.0,no diff,no diff,no diff +gen_tax_credit,0,0.0,no diff,no diff,no diff +non_refundable_child_odep_credit,8,270.96999999999997,221,3.17,274.14 +c11070,8,270.96999999999997,221,3.17,274.14 +c07180,4,-46.38000000000005,150,545.97,499.59 +eitc,0,0.0,no diff,no diff,no diff +c62100,1000,-74349.80999999994,104,828635.34,754285.53 +amt_liability,0,0.0,no diff,no diff,no diff +iitax_before_credits_ex_AMT,1000,-27509.429999999993,104,236187.58,208678.15 +recovery_rebate_credit,0,0.0,no diff,no diff,no diff