Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tax years 2011 and 2012 to policy_current_law.json #2519

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Add tax years 2011 and 2012 to policy_current_law.json #2519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fe2fc2c
updates up to STD
jdebacker Dec 20, 2020
2af5ed3
fix year typo
jdebacker Dec 20, 2020
f464805
up to II_credit
jdebacker Dec 23, 2020
804380e
up to ID_ps
jdebacker Dec 24, 2020
4bdab12
up to CG_brk1
jdebacker Dec 26, 2020
e6114ff
up to II_brk1
jdebacker Dec 27, 2020
6405e86
up to PT_brk1
jdebacker Dec 28, 2020
491d13c
up to CDCC_ps
jdebacker Jan 1, 2021
d9cae26
finish including 2011 and 2012 law
jdebacker Jan 2, 2021
cbdb9bf
fix year values
jdebacker Jan 2, 2021
0a4bfd2
update json start year
jdebacker Jan 2, 2021
7a2adfd
fix 2011 to 2012
jdebacker Jan 2, 2021
a59fe8b
change consuption start to 2011"
jdebacker Jan 2, 2021
83bc6f4
fix year typo
jdebacker Jan 3, 2021
82aad43
records vars start in 2011
jdebacker Jan 3, 2021
cb3723a
change array index for test with params starting in 2011
jdebacker Jan 3, 2021
d8a4e78
update calculator test indexes and arrays for 2011 start year
jdebacker Jan 3, 2021
0ca1641
update indexes and years for consumption tests
jdebacker Jan 3, 2021
e95993f
grow diffs back to 2011
jdebacker Jan 3, 2021
086b0d6
fix array to test of grow diffs
jdebacker Jan 3, 2021
fdbd59b
fix year ranges for 2011-20213
jdebacker Jan 3, 2021
8b4a866
Merge remote-tracking branch 'upstream/master' into tax_law_pre2013
jdebacker Jan 10, 2021
efe6df1
taxsim emulation for 2011
jdebacker Jan 11, 2021
3a102f5
allow 2011 and 2012 in validation script
jdebacker Jan 11, 2021
1870eda
uptate FICA rate for 2011 and 2012
jdebacker Jan 14, 2021
29f1632
fix mseparate threshold in 2011
jdebacker Jan 15, 2021
920b9ce
placeholder
jdebacker Feb 4, 2021
56187f1
merge upstream and fix conflicts
jdebacker Mar 30, 2021
71aae8c
fix conflicts
jdebacker Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions taxcalc/consumption.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "int",
"validators": {
"range": {
"min": 2013,
"min": 2011,
"max": 2033
}
}
Expand Down Expand Up @@ -81,7 +81,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -95,11 +95,11 @@
"MPC_e18400": {
"title": "Marginal propensity to consume state-and-local taxes",
"description": "Defined as dollar change in state-and-local-taxes consumption divided by dollar change in income. Typical value is in [0,1] range.",
"start_year": 2013,
"start_year": 2011,
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -113,11 +113,11 @@
"MPC_e19800": {
"title": "Marginal propensity to consume charity cash contributions",
"description": "Defined as dollar change in charity-cash-contribution consumption divided by dollar change in income. Typical value is in [0,1] range.",
"start_year": 2013,
"start_year": 2011,
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -131,11 +131,11 @@
"MPC_e20400": {
"title": "Marginal propensity to consume miscellaneous deduction expenses",
"description": "Defined as dollar change in miscellaneous-deduction-expense consumption divided by dollar change in income. Typical value is in [0,1] range.",
"start_year": 2013,
"start_year": 2011,
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -152,7 +152,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand All @@ -169,7 +169,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand All @@ -186,7 +186,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand All @@ -203,7 +203,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand All @@ -220,7 +220,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand All @@ -237,7 +237,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand All @@ -254,7 +254,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand All @@ -271,7 +271,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 1.0
}
],
Expand Down
54 changes: 27 additions & 27 deletions taxcalc/growdiff.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"type": "int",
"validators": {
"range": {
"min": 2013,
"max": 2033
"min": 2011,
"max": 2030
}
}
},
Expand Down Expand Up @@ -81,7 +81,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -98,7 +98,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -115,7 +115,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -132,7 +132,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -149,7 +149,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -166,7 +166,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -183,7 +183,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -200,7 +200,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -217,7 +217,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -234,7 +234,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -251,7 +251,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -268,7 +268,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -285,7 +285,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -302,7 +302,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -319,7 +319,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -336,7 +336,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -353,7 +353,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -370,7 +370,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -387,7 +387,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -404,7 +404,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -421,7 +421,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -438,7 +438,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -455,7 +455,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -472,7 +472,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand All @@ -489,7 +489,7 @@
"type": "float",
"value": [
{
"year": 2013,
"year": 2011,
"value": 0.0
}
],
Expand Down
4 changes: 2 additions & 2 deletions taxcalc/growdiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class GrowDiff(Parameters):
class instance: GrowDiff
"""

JSON_START_YEAR = 2013 # must be same as Policy.JSON_START_YEAR
DEFAULT_NUM_YEARS = 21 # must be same as Policy.DEFAULT_NUM_YEARS
JSON_START_YEAR = 2011 # must be same as Policy.JSON_START_YEAR
DEFAULT_NUM_YEARS = 20 # must be same as Policy.DEFAULT_NUM_YEARS
DEFAULTS_FILE_NAME = 'growdiff.json'
DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))

Expand Down
4 changes: 2 additions & 2 deletions taxcalc/policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class instance: Policy

DEFAULTS_FILE_NAME = 'policy_current_law.json'
DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
JSON_START_YEAR = 2013 # remains the same unless earlier data added
LAST_KNOWN_YEAR = 2020 # last year for which indexed param vals are known
JSON_START_YEAR = 2011 # remains the same unless earlier data added
LAST_KNOWN_YEAR = 2019 # last year for which indexed param vals are known
# should increase LAST_KNOWN_YEAR by one every calendar year
LAST_BUDGET_YEAR = 2033 # last extrapolation year
# should increase LAST_BUDGET_YEAR by one every calendar year
Expand Down
Loading
Loading