From 97b9f59c9e0d1f8a5e6a571f2df902944db9cfcd Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Thu, 1 Aug 2024 15:17:00 -0400 Subject: [PATCH 1/5] Begin filling in missing years through 2022 for indexed parameters --- taxcalc/policy_current_law.json | 415 +++++++++++++++++++++++++++++++- 1 file changed, 413 insertions(+), 2 deletions(-) diff --git a/taxcalc/policy_current_law.json b/taxcalc/policy_current_law.json index d7ef4d408..4fdf3a9c9 100644 --- a/taxcalc/policy_current_law.json +++ b/taxcalc/policy_current_law.json @@ -1137,6 +1137,18 @@ { "year": 2019, "value": 0.0 + }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 } ], "validators": { @@ -1187,6 +1199,18 @@ { "year": 2019, "value": 0.0 + }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 } ], "validators": { @@ -1582,6 +1606,18 @@ "year": 2019, "value": 0.0 }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 + }, { "year": 2026, "value": 5300.0 @@ -1783,6 +1819,81 @@ "MARS": "widow", "value": 9e+99 }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 + }, { "year": 2026, "MARS": "single", @@ -2818,6 +2929,81 @@ "year": 2019, "MARS": "widow", "value": 0.0 + }, + { + "year": 2020, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 0.0 } ], "validators": { @@ -3015,6 +3201,81 @@ "year": 2019, "MARS": "widow", "value": 0.0 + }, + { + "year": 2020, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 0.0 } ], "validators": { @@ -3238,7 +3499,82 @@ "year": 2019, "MARS": "widow", "value": 0.0 - } + }, + { + "year": 2020, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 0.0 + } ], "validators": { "range": { @@ -3435,7 +3771,82 @@ "year": 2019, "MARS": "widow", "value": 0.0 - } + }, + { + "year": 2020, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 0.0 + } ], "validators": { "range": { From 38a774620f39b8c831c4d5badc5ae90bb8489c02 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Thu, 1 Aug 2024 16:03:37 -0400 Subject: [PATCH 2/5] Continue filling in missing years through 2022 for indexed parameters --- taxcalc/policy_current_law.json | 897 +++++++++++++++++++++++++++++++- 1 file changed, 880 insertions(+), 17 deletions(-) diff --git a/taxcalc/policy_current_law.json b/taxcalc/policy_current_law.json index 4fdf3a9c9..0c8a37609 100644 --- a/taxcalc/policy_current_law.json +++ b/taxcalc/policy_current_law.json @@ -4610,6 +4610,81 @@ "year": 2019, "MARS": "widow", "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 } ], "validators": { @@ -4859,6 +4934,81 @@ "year": 2019, "MARS": "widow", "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 } ], "validators": { @@ -5108,6 +5258,81 @@ "year": 2019, "MARS": "widow", "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 } ], "validators": { @@ -5382,6 +5607,31 @@ "MARS": "widow", "value": 10000.0 }, + { + "year": 2022, + "MARS": "single", + "value": 10000.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 10000.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 5000.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 10000.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 10000.0 + }, { "year": 2026, "MARS": "single", @@ -5629,12 +5879,87 @@ "year": 2019, "MARS": "widow", "value": 9e+99 - } - ], - "validators": { - "range": { - "min": 0, - "max": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 + } + ], + "validators": { + "range": { + "min": 0, + "max": 9e+99 } }, "compatible_data": { @@ -5948,6 +6273,81 @@ "year": 2019, "MARS": "widow", "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 } ], "validators": { @@ -6272,7 +6672,82 @@ "year": 2019, "MARS": "widow", "value": 9e+99 - } + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 + } ], "validators": { "range": { @@ -6550,7 +7025,82 @@ "year": 2019, "MARS": "widow", "value": 9e+99 - } + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 + } ], "validators": { "range": { @@ -6709,42 +7259,117 @@ "value": 9e+99 }, { - "year": 2018, + "year": 2018, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2018, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2018, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2019, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2019, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2019, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2019, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2019, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, "MARS": "mseparate", "value": 9e+99 }, { - "year": 2018, + "year": 2021, "MARS": "headhh", "value": 9e+99 }, { - "year": 2018, + "year": 2021, "MARS": "widow", "value": 9e+99 }, { - "year": 2019, + "year": 2022, "MARS": "single", "value": 9e+99 }, { - "year": 2019, + "year": 2022, "MARS": "mjoint", "value": 9e+99 }, { - "year": 2019, + "year": 2022, "MARS": "mseparate", "value": 9e+99 }, { - "year": 2019, + "year": 2022, "MARS": "headhh", "value": 9e+99 }, { - "year": 2019, + "year": 2022, "MARS": "widow", "value": 9e+99 }, @@ -7141,6 +7766,81 @@ "year": 2019, "MARS": "widow", "value": 0.0 + }, + { + "year": 2020, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 0.0 } ], "validators": { @@ -7478,7 +8178,82 @@ "year": 2019, "MARS": "widow", "value": 9e+99 - } + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 + } ], "validators": { "range": { @@ -8427,7 +9202,83 @@ "year": 2019, "MARS": "widow", "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 } + ], "validators": { "range": { @@ -9449,6 +10300,18 @@ { "year": 2019, "value": 0.0 + }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 } ], "validators": { From 5c07ac0a91008a2e74b0bb471d2f1b3928ca592b Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Thu, 1 Aug 2024 17:24:04 -0400 Subject: [PATCH 3/5] Complete filling in missing years through 2022 for indexed parameters --- taxcalc/policy_current_law.json | 373 ++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+) diff --git a/taxcalc/policy_current_law.json b/taxcalc/policy_current_law.json index 0c8a37609..57e9b7ca3 100644 --- a/taxcalc/policy_current_law.json +++ b/taxcalc/policy_current_law.json @@ -16409,6 +16409,81 @@ "year": 2019, "MARS": "widow", "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 } ], "validators": { @@ -19652,6 +19727,18 @@ { "year": 2019, "value": 0.0 + }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 } ], "validators": { @@ -20298,6 +20385,31 @@ "MARS": "widow", "value": 0.0 }, + { + "year": 2020, + "MARS": "single", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 0.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 0.0 + }, { "year": 2021, "MARS": "single", @@ -20682,6 +20794,81 @@ "year": 2019, "MARS": "widow", "value": 1000000.0 + }, + { + "year": 2020, + "MARS": "single", + "value": 1000000.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 1000000.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 500000.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 1000000.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 1000000.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 1000000.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 1000000.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 500000.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 1000000.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 1000000.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 1000000.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 1000000.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 500000.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 1000000.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 1000000.0 } ], "validators": { @@ -20879,6 +21066,81 @@ "year": 2019, "MARS": "widow", "value": 2000000.0 + }, + { + "year": 2020, + "MARS": "single", + "value": 2000000.0 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 2000000.0 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 1000000.0 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 2000000.0 + }, + { + "year": 2020, + "MARS": "widow", + "value": 2000000.0 + }, + { + "year": 2021, + "MARS": "single", + "value": 2000000.0 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 2000000.0 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 1000000.0 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 2000000.0 + }, + { + "year": 2021, + "MARS": "widow", + "value": 2000000.0 + }, + { + "year": 2022, + "MARS": "single", + "value": 2000000.0 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 2000000.0 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 1000000.0 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 2000000.0 + }, + { + "year": 2022, + "MARS": "widow", + "value": 2000000.0 } ], "validators": { @@ -21102,6 +21364,81 @@ "year": 2019, "MARS": "widow", "value": 9e+99 + }, + { + "year": 2020, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2020, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2021, + "MARS": "widow", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "single", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mjoint", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "mseparate", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "headhh", + "value": 9e+99 + }, + { + "year": 2022, + "MARS": "widow", + "value": 9e+99 } ], "validators": { @@ -21178,6 +21515,18 @@ { "year": 2019, "value": 0.0 + }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 } ], "validators": { @@ -21228,6 +21577,18 @@ { "year": 2019, "value": 0.0 + }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 } ], "validators": { @@ -21278,6 +21639,18 @@ { "year": 2019, "value": 0.0 + }, + { + "year": 2020, + "value": 0.0 + }, + { + "year": 2021, + "value": 0.0 + }, + { + "year": 2022, + "value": 0.0 } ], "validators": { From 3fe43d2a5b2d49ca70cd19ea5e77059fdb218648 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Thu, 1 Aug 2024 17:24:52 -0400 Subject: [PATCH 4/5] Revise tests given new 2020-2022 policy parameter values --- taxcalc/reforms/rounding2022.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/taxcalc/reforms/rounding2022.json b/taxcalc/reforms/rounding2022.json index e6bd4741c..d338dd818 100644 --- a/taxcalc/reforms/rounding2022.json +++ b/taxcalc/reforms/rounding2022.json @@ -138,6 +138,16 @@ "2024": 1600, "2025": 1600, "2026": 1000}, - "FST_AGI_thd_lo": {"2019": [1000000, 1000000, 500000, 1000000, 1000000]}, - "FST_AGI_thd_hi": {"2019": [2000000, 2000000, 1000000, 2000000, 2000000]} - } + "FST_AGI_thd_lo": { + "2019": [1000000, 1000000, 500000, 1000000, 1000000], + "2020": [1000000, 1000000, 500000, 1000000, 1000000], + "2021": [1000000, 1000000, 500000, 1000000, 1000000], + "2022": [1000000, 1000000, 500000, 1000000, 1000000] + }, + "FST_AGI_thd_hi": { + "2019": [2000000, 2000000, 1000000, 2000000, 2000000], + "2020": [2000000, 2000000, 1000000, 2000000, 2000000], + "2021": [2000000, 2000000, 1000000, 2000000, 2000000], + "2022": [2000000, 2000000, 1000000, 2000000, 2000000] + } +} From 1ee8321904c1a16c7269c498e327e7782b35e794 Mon Sep 17 00:00:00 2001 From: "martin.holmer@gmail.com" Date: Thu, 1 Aug 2024 17:47:25 -0400 Subject: [PATCH 5/5] Remove trailing spaces in policy_current_law.json --- taxcalc/policy_current_law.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/taxcalc/policy_current_law.json b/taxcalc/policy_current_law.json index 57e9b7ca3..a4030ab11 100644 --- a/taxcalc/policy_current_law.json +++ b/taxcalc/policy_current_law.json @@ -3574,7 +3574,7 @@ "year": 2022, "MARS": "widow", "value": 0.0 - } + } ], "validators": { "range": { @@ -3846,7 +3846,7 @@ "year": 2022, "MARS": "widow", "value": 0.0 - } + } ], "validators": { "range": { @@ -5954,7 +5954,7 @@ "year": 2022, "MARS": "widow", "value": 9e+99 - } + } ], "validators": { "range": { @@ -6747,7 +6747,7 @@ "year": 2022, "MARS": "widow", "value": 9e+99 - } + } ], "validators": { "range": { @@ -7100,7 +7100,7 @@ "year": 2022, "MARS": "widow", "value": 9e+99 - } + } ], "validators": { "range": { @@ -8253,7 +8253,7 @@ "year": 2022, "MARS": "widow", "value": 9e+99 - } + } ], "validators": { "range": { @@ -9278,7 +9278,6 @@ "MARS": "widow", "value": 9e+99 } - ], "validators": { "range": {