From d30b75810ab643e87931fa0307aa9035efc3b0c2 Mon Sep 17 00:00:00 2001 From: Bodi Yang Date: Fri, 6 Dec 2024 11:05:08 -0500 Subject: [PATCH] pass tests --- taxcalc/reforms/2017_law.out.csv | 2 +- taxcalc/reforms/BrownKhanna.out.csv | 2 +- taxcalc/reforms/Renacci.out.csv | 4 ++-- taxcalc/reforms/TCJA.out.csv | 2 +- taxcalc/reforms/Trump2016.out.csv | 4 ++-- taxcalc/reforms/Trump2017.out.csv | 4 ++-- taxcalc/reforms/ptaxes0.out.csv | 2 +- taxcalc/reforms/ptaxes1.out.csv | 4 ++-- taxcalc/reforms/ptaxes2.out.csv | 2 +- taxcalc/reforms/ptaxes3.out.csv | 2 +- taxcalc/tests/cpscsv_agg_expect.csv | 8 ++++---- taxcalc/tests/puf_var_wght_means_by_year.csv | 4 ++-- taxcalc/tests/pufcsv_agg_expect.csv | 8 ++++---- taxcalc/tests/reforms_expect.csv | 14 +++++++------- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/taxcalc/reforms/2017_law.out.csv b/taxcalc/reforms/2017_law.out.csv index a8e1f3aac..4dcd16caa 100644 --- a/taxcalc/reforms/2017_law.out.csv +++ b/taxcalc/reforms/2017_law.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6812.86,18841.93,526.05,4590.00 12,60000.00,6812.86,48841.93,5838.62,9180.00 -13,460000.00,6812.86,453187.14,132060.50,32754.80 +13,460000.00,6812.86,453187.14,134400.50,30414.80 21,60000.00,13625.73,28993.43,-2251.46,9180.00 22,120000.00,13625.73,88993.43,8004.64,18360.00 23,240000.00,13625.73,208993.43,44446.65,36720.00 diff --git a/taxcalc/reforms/BrownKhanna.out.csv b/taxcalc/reforms/BrownKhanna.out.csv index 6a7334b0f..2d1bf629d 100644 --- a/taxcalc/reforms/BrownKhanna.out.csv +++ b/taxcalc/reforms/BrownKhanna.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6812.86,18841.93,-1042.99,4590.00 12,60000.00,6812.86,48841.93,5838.62,9180.00 -13,460000.00,6812.86,453187.14,132060.50,32754.80 +13,460000.00,6812.86,453187.14,134400.50,30414.80 21,60000.00,13625.73,28993.43,-6593.73,9180.00 22,120000.00,13625.73,88993.43,8004.64,18360.00 23,240000.00,13625.73,208993.43,44446.65,36720.00 diff --git a/taxcalc/reforms/Renacci.out.csv b/taxcalc/reforms/Renacci.out.csv index 4e25122af..09cfb5b5d 100644 --- a/taxcalc/reforms/Renacci.out.csv +++ b/taxcalc/reforms/Renacci.out.csv @@ -1,10 +1,10 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,16093.38,8542.16,-945.78,4590.00 12,60000.00,16093.38,38542.16,2054.22,9180.00 -13,460000.00,16093.38,443906.62,102929.97,32754.80 +13,460000.00,16093.38,443906.62,105269.97,30414.80 21,60000.00,32186.76,6355.40,-6172.82,9180.00 22,120000.00,32186.76,66355.40,1535.54,18360.00 23,240000.00,32186.76,186355.40,30495.47,36720.00 31,30000.00,16093.38,3177.70,-5939.56,4590.00 32,60000.00,16093.38,33177.70,517.77,9180.00 -33,120000.00,16093.38,93177.70,13822.74,18360.00 \ No newline at end of file +33,120000.00,16093.38,93177.70,13822.74,18360.00 diff --git a/taxcalc/reforms/TCJA.out.csv b/taxcalc/reforms/TCJA.out.csv index 66785ccb3..71694fc80 100644 --- a/taxcalc/reforms/TCJA.out.csv +++ b/taxcalc/reforms/TCJA.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,12514.06,17485.94,99.65,4590.00 12,60000.00,12514.06,47485.94,4412.46,9180.00 -13,460000.00,12514.06,447485.94,131268.15,32754.80 +13,460000.00,12514.06,447485.94,133608.15,30414.80 21,60000.00,25028.13,34971.87,-3800.70,9180.00 22,120000.00,25028.13,94971.87,4824.92,18360.00 23,240000.00,25028.13,214971.87,35682.99,36720.00 diff --git a/taxcalc/reforms/Trump2016.out.csv b/taxcalc/reforms/Trump2016.out.csv index 7d6d43c4b..0839926c6 100644 --- a/taxcalc/reforms/Trump2016.out.csv +++ b/taxcalc/reforms/Trump2016.out.csv @@ -1,10 +1,10 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,16093.38,13906.62,-131.21,4590.00 12,60000.00,16093.38,43906.62,3946.31,9180.00 -13,460000.00,16093.38,443906.62,131602.81,32754.80 +13,460000.00,16093.38,443906.62,133942.81,30414.80 21,60000.00,32186.76,27813.24,-2262.41,9180.00 22,120000.00,32186.76,87813.24,6392.61,18360.00 23,240000.00,32186.76,207813.24,41492.61,36720.00 31,30000.00,16093.38,13906.62,-3129.39,4590.00 32,60000.00,16093.38,43906.62,2946.31,9180.00 -33,120000.00,16093.38,103906.62,19321.31,18360.00 \ No newline at end of file +33,120000.00,16093.38,103906.62,19321.31,18360.00 diff --git a/taxcalc/reforms/Trump2017.out.csv b/taxcalc/reforms/Trump2017.out.csv index e1c3b4fef..18c9811e6 100644 --- a/taxcalc/reforms/Trump2017.out.csv +++ b/taxcalc/reforms/Trump2017.out.csv @@ -1,10 +1,10 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,13625.73,12029.06,-597.09,4590.00 12,60000.00,13625.73,42029.06,2599.83,9180.00 -13,460000.00,13625.73,446374.27,105486.13,32754.80 +13,460000.00,13625.73,446374.27,107826.13,30414.80 21,60000.00,27251.46,15367.70,-4063.23,9180.00 22,120000.00,27251.46,75367.70,2436.77,18360.00 23,240000.00,27251.46,195367.70,36627.05,36720.00 31,30000.00,20063.08,1246.50,-4673.54,4590.00 32,60000.00,20063.08,31246.50,324.65,9180.00 -33,120000.00,20063.08,91246.50,13211.19,18360.00 \ No newline at end of file +33,120000.00,20063.08,91246.50,13211.19,18360.00 diff --git a/taxcalc/reforms/ptaxes0.out.csv b/taxcalc/reforms/ptaxes0.out.csv index 8fc6906c3..166398acb 100644 --- a/taxcalc/reforms/ptaxes0.out.csv +++ b/taxcalc/reforms/ptaxes0.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6812.86,18841.93,526.05,5100.00 12,60000.00,6812.86,48841.93,5838.62,10200.00 -13,460000.00,6812.86,453187.14,132060.50,35418.00 +13,460000.00,6812.86,453187.14,134400.50,33078.00 21,60000.00,13625.73,28993.43,-2251.46,10200.00 22,120000.00,13625.73,88993.43,8004.64,20400.00 23,240000.00,13625.73,208993.43,44446.65,40800.00 diff --git a/taxcalc/reforms/ptaxes1.out.csv b/taxcalc/reforms/ptaxes1.out.csv index f0c943576..c2e142d94 100644 --- a/taxcalc/reforms/ptaxes1.out.csv +++ b/taxcalc/reforms/ptaxes1.out.csv @@ -1,10 +1,10 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6812.86,18841.93,526.05,4590.00 12,60000.00,6812.86,48841.93,5838.62,9180.00 -13,460000.00,6812.86,453187.14,132060.50,46680.00 +13,460000.00,6812.86,453187.14,134400.50,44340.00 21,60000.00,13625.73,28993.43,-2251.46,9180.00 22,120000.00,13625.73,88993.43,8004.64,18360.00 23,240000.00,13625.73,208993.43,44446.65,36720.00 31,30000.00,10031.54,11278.04,-3670.39,4590.00 32,60000.00,10031.54,41278.04,2675.55,9180.00 -33,120000.00,10031.54,101278.04,17728.06,18360.00 \ No newline at end of file +33,120000.00,10031.54,101278.04,17728.06,18360.00 diff --git a/taxcalc/reforms/ptaxes2.out.csv b/taxcalc/reforms/ptaxes2.out.csv index 7be7516b6..ad0737802 100644 --- a/taxcalc/reforms/ptaxes2.out.csv +++ b/taxcalc/reforms/ptaxes2.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6812.86,18841.93,526.05,4590.00 12,60000.00,6812.86,48841.93,5838.62,9180.00 -13,460000.00,6812.86,453187.14,132060.50,72720.00 +13,460000.00,6812.86,453187.14,134400.50,70380.00 21,60000.00,13625.73,28993.43,-2251.46,9180.00 22,120000.00,13625.73,88993.43,8004.64,18360.00 23,240000.00,13625.73,208993.43,44446.65,36720.00 diff --git a/taxcalc/reforms/ptaxes3.out.csv b/taxcalc/reforms/ptaxes3.out.csv index af835a844..1cc3a4dd9 100644 --- a/taxcalc/reforms/ptaxes3.out.csv +++ b/taxcalc/reforms/ptaxes3.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6812.86,18841.93,526.05,4590.00 12,60000.00,6812.86,48841.93,5838.62,9180.00 -13,460000.00,6812.86,453187.14,132060.50,32463.80 +13,460000.00,6812.86,453187.14,134109.50,30414.80 21,60000.00,13625.73,28993.43,-2251.46,9180.00 22,120000.00,13625.73,88993.43,8004.64,18360.00 23,240000.00,13625.73,208993.43,44446.65,36720.00 diff --git a/taxcalc/tests/cpscsv_agg_expect.csv b/taxcalc/tests/cpscsv_agg_expect.csv index a301a42f3..5839e7f79 100644 --- a/taxcalc/tests/cpscsv_agg_expect.csv +++ b/taxcalc/tests/cpscsv_agg_expect.csv @@ -15,11 +15,11 @@ Tax before Credits ($b),1116.0,1380.4,1449.4,1497.9,1764.3,1838.0,1939.7,2018.7, Refundable Credits ($b),70.8,102.5,102.7,655.0,827.1,98.5,106.2,111.9,112.8,98.2 Nonrefundable Credits ($b),32.7,97.2,99.2,99.2,0.0,107.7,108.4,109.4,111.2,30.0 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -Other Taxes ($b),5.5,10.7,11.3,12.6,13.9,14.4,16.5,17.6,18.8,19.9 -Ind Income Tax ($b),1018.1,1191.4,1258.9,756.3,951.0,1646.2,1741.7,1815.1,1918.2,2256.3 -Payroll Taxes ($b),1040.8,1141.6,1194.9,1217.9,1318.7,1421.6,1509.2,1585.1,1660.8,1735.0 +Other Taxes ($b),61.3,70.4,72.7,75.9,82.3,87.9,91.9,97.0,102.3,107.8 +Ind Income Tax ($b),1073.9,1251.1,1320.2,819.6,1019.4,1719.7,1817.1,1894.4,2001.7,2344.1 +Payroll Taxes ($b),985.0,1081.8,1133.6,1154.6,1250.3,1348.0,1433.8,1505.8,1577.3,1647.1 Combined Liability ($b),2059.0,2333.0,2453.8,1974.2,2269.7,3067.8,3250.9,3400.2,3578.9,3991.2 -With Income Tax <= 0 (#m),88.1,96.2,97.0,135.4,127.8,96.1,97.8,99.1,99.6,97.3 +With Income Tax <= 0 (#m),86.2,94.6,95.3,133.1,126.0,94.5,96.1,97.4,97.9,95.7 With Combined Tax <= 0 (#m),62.8,65.4,66.4,98.2,97.7,67.9,69.3,70.4,71.3,70.7 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 "Total Benefits, Consumption Value ($b)",2790.7,3225.5,3429.9,3617.0,3993.0,4069.6,4390.5,4696.3,4983.2,5266.5 diff --git a/taxcalc/tests/puf_var_wght_means_by_year.csv b/taxcalc/tests/puf_var_wght_means_by_year.csv index e0c008b55..9439561c9 100644 --- a/taxcalc/tests/puf_var_wght_means_by_year.csv +++ b/taxcalc/tests/puf_var_wght_means_by_year.csv @@ -67,7 +67,7 @@ e87530,Adjusted qualified lifetime learning expenses for all students, 93, eitc,Federal EITC, 376, 369, 364, 352, 342, 343, 346, 355, 335, 348, 382, 396, 402, 409, 415, 420, 426, 433, 440, 451, 457, 467 elderly_dependents,number of dependents age 65+ in filing unit excluding taxpayer and spouse, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 g20500,Itemizable gross (before 10% AGI disregard) casualty or theft loss, 29, 30, 31, 32, 33, 35, 36, 38, 40, 41, 42, 44, 47, 48, 50, 52, 55, 57, 60, 63, 62, 66 -iitax,Federal income tax liability, 6550, 7474, 7521, 7477, 8281, 8734, 8910, 6481, 9055, 11069, 11537, 11736, 12098, 12406, 12729, 13100, 13503, 13912, 14325, 14853, 15237, 15662 +iitax,Federal income tax liability, 6826, 7764, 7820, 7778, 8605, 9071, 9251, 6827, 9422, 11452, 11929, 12145, 12523, 12849, 13188, 13577, 13998, 14428, 14862, 15419, 15805, 16254 k1bx14p,Partner self-employment earnings/loss for taxpayer (included in e26270 total), -213, -239, -187, -162, -144, -139, -133, -129, -156, -168, -183, -181, -177, -174, -168, -158, -145, -124, -103, -68, -150, -123 k1bx14s,Partner self-employment earnings/loss for spouse (included in e26270 total), -7, -9, 0, 2, 8, 10, 11, 11, 13, 14, 14, 14, 15, 16, 18, 21, 25, 27, 31, 34, 28, 33 nu06,Number of dependents under 6 years old, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 @@ -75,6 +75,6 @@ nu13,Number of dependents under 13 years old, 0, 0, 0, 0 p08000,Other tax credits (but not including Sch R credit), 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 p22250,Sch D: Net short-term capital gains/losses, -120, -173, -172, -151, -195, -212, -202, -267, -481, -308, -330, -304, -299, -292, -288, -288, -290, -293, -284, -285, -327, -335 p23250,Sch D: Net long-term capital gains/losses, 2284, 3191, 3138, 2776, 3680, 3912, 3596, 4616, 8212, 5153, 5390, 4987, 4839, 4662, 4598, 4612, 4669, 4756, 4864, 5021, 5090, 5224 -payrolltax,Payroll taxes (ee+er) for OASDI+HI, 5193, 5382, 5440, 5516, 5676, 5834, 6009, 6042, 6437, 6824, 7161, 7425, 7679, 7919, 8150, 8383, 8625, 8879, 9148, 9505, 9606, 9872 +payrolltax,Payroll taxes (ee+er) for OASDI+HI, 4917, 5091, 5141, 5215, 5352, 5497, 5667, 5696, 6069, 6441, 6769, 7016, 7253, 7477, 7690, 7906, 8129, 8363, 8611, 8939, 9038, 9280 pencon_p,Contributions to defined-contribution pension plans for taxpayer, 856, 897, 916, 941, 963, 996, 1029, 1030, 1107, 1185, 1239, 1282, 1326, 1368, 1407, 1448, 1490, 1532, 1578, 1637, 1655, 1698 pencon_s,Contributions to defined-contribution pension plans for spouse, 393, 410, 421, 424, 440, 452, 466, 466, 500, 535, 558, 577, 595, 612, 629, 645, 661, 678, 695, 720, 738, 756 diff --git a/taxcalc/tests/pufcsv_agg_expect.csv b/taxcalc/tests/pufcsv_agg_expect.csv index f6e71670d..2e52644e4 100644 --- a/taxcalc/tests/pufcsv_agg_expect.csv +++ b/taxcalc/tests/pufcsv_agg_expect.csv @@ -15,11 +15,11 @@ Tax before Credits ($b),1708.1,1734.4,1801.1,1863.4,2309.3,2310.1,2452.2,2520.2, Refundable Credits ($b),102.9,117.5,118.5,642.0,802.6,119.2,126.9,133.5,136.0,122.4 Nonrefundable Credits ($b),67.0,127.3,129.2,128.5,47.6,141.0,143.3,144.0,145.7,77.7 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -Other Taxes ($b),40.0,44.8,43.6,52.9,84.9,61.5,66.5,65.2,66.0,66.3 -Ind Income Tax ($b),1578.2,1534.3,1597.0,1145.8,1543.9,2111.5,2248.5,2308.0,2414.7,2769.8 -Payroll Taxes ($b),1083.8,1133.3,1185.4,1209.0,1306.0,1403.4,1492.5,1568.0,1643.2,1716.5 +Other Taxes ($b),101.9,110.3,110.9,122.1,159.4,140.3,148.2,151.5,157.0,162.3 +Ind Income Tax ($b),1640.1,1599.8,1664.4,1215.0,1618.4,2190.2,2330.2,2394.2,2505.7,2865.7 +Payroll Taxes ($b),1021.9,1067.9,1118.1,1139.7,1231.5,1324.7,1410.9,1481.8,1552.2,1620.6 Combined Liability ($b),2662.0,2667.7,2782.4,2354.8,2849.9,3514.9,3741.0,3876.0,4057.9,4486.3 -With Income Tax <= 0 (#m),92.8,98.6,99.7,131.7,125.0,100.3,101.8,103.4,104.3,101.0 +With Income Tax <= 0 (#m),88.5,94.0,95.1,129.1,122.6,95.7,97.1,98.6,99.6,96.4 With Combined Tax <= 0 (#m),63.4,65.6,66.8,102.1,94.5,68.9,70.2,71.6,72.7,72.4 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 "Total Benefits, Consumption Value ($b)",1052.3,1104.9,1175.3,1243.9,1476.4,1411.5,1569.5,1707.8,1818.1,1924.4 diff --git a/taxcalc/tests/reforms_expect.csv b/taxcalc/tests/reforms_expect.csv index 40963965c..a1d062527 100644 --- a/taxcalc/tests/reforms_expect.csv +++ b/taxcalc/tests/reforms_expect.csv @@ -1,9 +1,9 @@ rid,res1,res2,res3,res4 -1,63.8,64.9,68.1,71.0 -2,52.1,56.2,51.1,59.3 -3,76.4,77.7,81.8,85.8 -4,-0.3,-0.3,-0.3,-0.4 -5,0.7,0.7,0.8,0.9 +1,60.8,61.9,64.9,67.6 +2,50.4,54.6,49.5,57.2 +3,73.3,74.5,78.4,82.2 +4,0.0,0.0,0.0,0.0 +5,0.0,0.0,0.0,0.0 6,37.9,37.8,39.4,40.7 7,7.2,7.4,7.5,7.9 8,1.9,1.9,2.1,2.2 @@ -52,12 +52,12 @@ rid,res1,res2,res3,res4 51,-0.3,-0.3,-0.5,-0.5 52,-187.0,-187.5,-193.6,-201.6 53,-130.0,-129.3,-132.7,-137.7 -54,31.3,33.7,32.0,41.7 +54,30.7,33.2,31.4,41.0 55,86.1,90.8,94.7,102.1 56,0.0,0.0,0.0,0.0 57,-14.1,-15.6,-15.9,-14.4 58,-15.5,-17.0,-17.4,-15.8 -59,-66.1,-66.2,-66.2,-66.4 +59,-66.9,-66.9,-67.0,-67.1 60,-67.3,-67.2,-67.3,-67.4 61,-1.0,-0.6,-0.8,-1.7 62,-17.4,-18.0,-24.3,-20.0