Skip to content

Commit

Permalink
change files and pass the test
Browse files Browse the repository at this point in the history
  • Loading branch information
Bodi Yang committed Nov 21, 2024
1 parent 2027303 commit 34c6842
Show file tree
Hide file tree
Showing 15 changed files with 142 additions and 182 deletions.
18 changes: 9 additions & 9 deletions taxcalc/reforms/2017_law.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,6723.42,18988.43,554.60,4590.00
12,60000.00,6723.42,48988.43,5935.27,9180.00
13,460000.00,6723.42,453276.58,132718.27,32754.80
21,60000.00,13446.83,29400.57,-2177.25,9180.00
22,120000.00,13446.83,89400.57,8226.47,18360.00
23,240000.00,13446.83,209400.57,44745.39,36720.00
31,30000.00,9899.84,11523.86,-3556.63,4590.00
32,60000.00,9899.84,41523.86,2721.83,9180.00
33,120000.00,9899.84,101523.86,17870.48,18360.00
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
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
18 changes: 9 additions & 9 deletions taxcalc/reforms/BrownKhanna.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,6723.42,18988.43,-930.89,4590.00
12,60000.00,6723.42,48988.43,5935.27,9180.00
13,460000.00,6723.42,453276.58,132718.27,32754.80
21,60000.00,13446.83,29400.57,-6296.60,9180.00
22,120000.00,13446.83,89400.57,8226.47,18360.00
23,240000.00,13446.83,209400.57,44745.39,36720.00
31,30000.00,9899.84,11523.86,-6868.57,4590.00
32,60000.00,9899.84,41523.86,2294.87,9180.00
33,120000.00,9899.84,101523.86,17870.48,18360.00
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
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
31,30000.00,10031.54,11278.04,-7026.40,4590.00
32,60000.00,10031.54,41278.04,2115.35,9180.00
33,120000.00,10031.54,101278.04,17728.06,18360.00
18 changes: 9 additions & 9 deletions taxcalc/reforms/Renacci.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,15882.08,8823.89,-917.61,4590.00
12,60000.00,15882.08,38823.89,2082.39,9180.00
13,460000.00,15882.08,444117.92,103088.44,32754.80
21,60000.00,31764.18,7059.70,-5920.62,9180.00
22,120000.00,31764.18,67059.70,1605.97,18360.00
23,240000.00,31764.18,187059.70,30882.84,36720.00
31,30000.00,15882.08,3529.86,-5796.01,4590.00
32,60000.00,15882.08,33529.86,552.99,9180.00
33,120000.00,15882.08,93529.86,14016.42,18360.00
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
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
18 changes: 9 additions & 9 deletions taxcalc/reforms/TCJA.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,12404.02,17595.98,114.60,4590.00
12,60000.00,12404.02,47595.98,4473.91,9180.00
13,460000.00,12404.02,447595.98,131529.61,32754.80
21,60000.00,24808.03,35191.97,-3770.79,9180.00
22,120000.00,24808.03,95191.97,4947.82,18360.00
23,240000.00,24808.03,215191.97,35840.55,36720.00
31,30000.00,18606.02,11393.98,-4526.38,4590.00
32,60000.00,18606.02,41393.98,886.12,9180.00
33,120000.00,18606.02,101393.98,13568.45,18360.00
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
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
31,30000.00,18771.09,11228.91,-4601.98,4590.00
32,60000.00,18771.09,41228.91,863.82,9180.00
33,120000.00,18771.09,101228.91,13463.70,18360.00
18 changes: 9 additions & 9 deletions taxcalc/reforms/Trump2016.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,15882.08,14117.92,-105.85,4590.00
12,60000.00,15882.08,44117.92,4067.80,9180.00
13,460000.00,15882.08,444117.92,131867.98,32754.80
21,60000.00,31764.18,28235.82,-2211.70,9180.00
22,120000.00,31764.18,88235.82,6635.60,18360.00
23,240000.00,31764.18,208235.82,41735.60,36720.00
31,30000.00,15882.08,14117.92,-3014.86,4590.00
32,60000.00,15882.08,44117.92,3067.80,9180.00
33,120000.00,15882.08,104117.92,19442.80,18360.00
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
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
18 changes: 9 additions & 9 deletions taxcalc/reforms/Trump2017.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,13446.83,12265.02,-573.50,4590.00
12,60000.00,13446.83,42265.02,2739.00,9180.00
13,460000.00,13446.83,446553.17,106145.92,32754.80
21,60000.00,26893.67,15953.73,-4004.63,9180.00
22,120000.00,26893.67,75953.73,2495.37,18360.00
23,240000.00,26893.67,195953.73,36933.93,36720.00
31,30000.00,19799.67,1624.03,-4546.61,4590.00
32,60000.00,19799.67,31624.03,362.40,9180.00
33,120000.00,19799.67,91624.03,13412.91,18360.00
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
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
18 changes: 9 additions & 9 deletions taxcalc/reforms/ptaxes0.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,6723.42,18988.43,554.60,5100.00
12,60000.00,6723.42,48988.43,5935.27,10200.00
13,460000.00,6723.42,453276.58,132718.27,35418.00
21,60000.00,13446.83,29400.57,-2177.25,10200.00
22,120000.00,13446.83,89400.57,8226.47,20400.00
23,240000.00,13446.83,209400.57,44745.39,40800.00
31,30000.00,9899.84,11523.86,-3556.63,5100.00
32,60000.00,9899.84,41523.86,2721.83,10200.00
33,120000.00,9899.84,101523.86,17870.48,20400.00
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
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
31,30000.00,10031.54,11278.04,-3670.39,5100.00
32,60000.00,10031.54,41278.04,2675.55,10200.00
33,120000.00,10031.54,101278.04,17728.06,20400.00
18 changes: 9 additions & 9 deletions taxcalc/reforms/ptaxes1.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,6723.42,18988.43,554.60,4590.00
12,60000.00,6723.42,48988.43,5935.27,9180.00
13,460000.00,6723.42,453276.58,132718.27,46680.00
21,60000.00,13446.83,29400.57,-2177.25,9180.00
22,120000.00,13446.83,89400.57,8226.47,18360.00
23,240000.00,13446.83,209400.57,44745.39,36720.00
31,30000.00,9899.84,11523.86,-3556.63,4590.00
32,60000.00,9899.84,41523.86,2721.83,9180.00
33,120000.00,9899.84,101523.86,17870.48,18360.00
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
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
18 changes: 9 additions & 9 deletions taxcalc/reforms/ptaxes2.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,6723.42,18988.43,554.60,4590.00
12,60000.00,6723.42,48988.43,5935.27,9180.00
13,460000.00,6723.42,453276.58,132718.27,72720.00
21,60000.00,13446.83,29400.57,-2177.25,9180.00
22,120000.00,13446.83,89400.57,8226.47,18360.00
23,240000.00,13446.83,209400.57,44745.39,36720.00
31,30000.00,9899.84,11523.86,-3556.63,4590.00
32,60000.00,9899.84,41523.86,2721.83,9180.00
33,120000.00,9899.84,101523.86,17870.48,18360.00
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
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
18 changes: 9 additions & 9 deletions taxcalc/reforms/ptaxes3.out.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
RECID,c00100,standard,c04800,iitax,payrolltax
11,30000.00,6723.42,18988.43,554.60,4590.00
12,60000.00,6723.42,48988.43,5935.27,9180.00
13,460000.00,6723.42,453276.58,132718.27,32475.05
21,60000.00,13446.83,29400.57,-2177.25,9180.00
22,120000.00,13446.83,89400.57,8226.47,18360.00
23,240000.00,13446.83,209400.57,44745.39,36720.00
31,30000.00,9899.84,11523.86,-3556.63,4590.00
32,60000.00,9899.84,41523.86,2721.83,9180.00
33,120000.00,9899.84,101523.86,17870.48,18360.00
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
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
18 changes: 9 additions & 9 deletions taxcalc/tests/cpscsv_agg_expect.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
Returns (#m),187.1,199.2,201.9,204.5,207.1,209.7,212.3,214.9,217.5,220.1
AGI ($b),9087.6,10714.8,11167.0,11573.2,13174.9,13543.8,14390.3,15077.5,15785.2,16487.0
Itemizers (#m),62.8,23.9,25.0,27.5,31.2,31.2,30.0,29.6,30.4,81.1
Itemized Deduction ($b),1218.6,612.0,655.1,745.4,862.7,881.9,891.8,917.9,964.3,2181.4
Itemized Deduction ($b),1218.6,612.0,655.1,745.4,862.7,881.9,891.8,917.9,964.3,2181.1
Standard Deduction Filers (#m),124.3,175.3,176.9,176.9,175.8,178.5,182.3,185.3,187.1,139.0
Standard Deduction ($b),1092.1,2951.3,3026.1,3080.8,3091.9,3231.4,3534.5,3791.7,3933.0,1610.8
Standard Deduction ($b),1092.1,2951.3,3026.1,3080.8,3091.9,3231.4,3534.5,3791.7,3933.0,1611.4
Personal Exemption ($b),1383.6,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2081.5
Taxable Income ($b),6230.6,7959.2,8322.8,8615.4,10049.9,10332.2,10954.0,11432.4,11991.8,11810.0
Regular Tax ($b),1108.0,1380.0,1449.0,1497.4,1762.8,1837.4,1939.0,2018.1,2122.8,2347.6
AMT Income ($b),8319.8,10212.6,10630.3,10965.7,12473.9,12821.8,13655.8,14315.8,14983.7,15102.7
Taxable Income ($b),6230.6,7959.2,8322.8,8615.4,10049.9,10332.2,10954.0,11432.4,11991.8,11809.9
Regular Tax ($b),1108.0,1380.0,1449.0,1497.4,1762.8,1837.4,1939.0,2018.1,2122.8,2347.5
AMT Income ($b),8319.8,10212.6,10630.3,10965.7,12473.9,12821.8,13655.8,14315.8,14983.7,15102.9
AMT Liability ($b),8.1,0.4,0.4,0.5,1.4,0.7,0.7,0.6,0.6,17.1
AMT Filers (#m),2.6,0.1,0.1,0.1,0.2,0.1,0.1,0.1,0.1,4.1
Tax before Credits ($b),1116.0,1380.4,1449.4,1497.9,1764.3,1838.0,1939.7,2018.7,2123.4,2364.7
Refundable Credits ($b),70.8,102.5,102.7,655.0,827.1,98.5,106.2,111.9,112.8,97.8
Tax before Credits ($b),1116.0,1380.4,1449.4,1497.9,1764.3,1838.0,1939.7,2018.7,2123.4,2364.5
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.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
Combined Liability ($b),2059.0,2333.0,2453.8,1974.2,2269.7,3067.8,3250.9,3400.2,3578.9,3991.9
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 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
Expand Down
Loading

0 comments on commit 34c6842

Please sign in to comment.