Merge pull request PSLmodels#1820 from martinholmer/1819-cleanup

Update three requires_pufcsv test statistics whose value has changed via rounding
willrichens · Jan 11, 2018 · b74bab7 · b74bab7
2 parents 2af32da + b585835
commit b74bab7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/taxcalc/functions.py b/taxcalc/functions.py
@@ -258,9 +258,9 @@ def CapGains(p23250, p22250, sep, ALD_StudentLoan_hc,
     ymod1 = (e00200 + e00700 + e00800 + e01400 + e01700 +
              invinc - invinc_agi_ec + e02100 + e02300 +
              max(e00900 + e02000, -ALD_BusinessLosses_c[MARS - 1]))
-    # compute loss limitation to be added onto ymod1
-    loss_limit = min(e00900 + e02000 + ALD_BusinessLosses_c[MARS - 1], 0.)
-    c02900_in_ei = c02900_in_ei + loss_limit
+    # compute business loss excluded from ymod1 but included in expanded_income
+    excluded_loss = min(e00900 + e02000 + ALD_BusinessLosses_c[MARS - 1], 0.)
+    c02900_in_ei += excluded_loss
     if CG_nodiff:
         # apply QDIV+CG exclusion if QDIV+LTCG receive no special tax treatment
         qdcg_pos = max(0., e00650 + c01000)

diff --git a/taxcalc/tests/puf_var_wght_means_by_year.csv b/taxcalc/tests/puf_var_wght_means_by_year.csv
@@ -1,7 +1,7 @@
 ,description,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027
 c00100,Federal AGI,   57412,   61770,   65221,   65728,   67717,   69405,   70875,   72474,   74271,   76305,   78489,   80755,   83105,   85602,   88645
 c02500,OASDI benefits in AGI,    1324,    1408,    1518,    1557,    1608,    1700,    1830,    1972,    2118,    2281,    2452,    2633,    2821,    3022,    3278
-c04470,Post-phase-out itemized deduction,    6719,    6813,    7099,    7301,    7471,    7712,    7969,    8232,    8518,    8809,    9099,    9402,    9706,   10034,   10463
+c04470,Post-phase-out itemized deduction,    6719,    6813,    7099,    7302,    7471,    7712,    7969,    8232,    8518,    8809,    9099,    9402,    9706,   10034,   10463
 c04600,Post-phase-out personal exemption,    7272,    7292,    7339,    7389,    7341,    7467,    7603,    7749,    7906,    8073,    8239,    8410,    8582,    8759,    8958
 c04800,Federal regular taxable income,   40934,   45252,   48332,   48555,   50398,   51663,   52671,   53793,   55083,   56595,   58257,   59980,   61783,   63695,   65840
 c05200,Regular tax on taxable income,    8995,   10324,   11212,   11149,   11637,   11908,   12098,   12333,   12616,   12958,   13343,   13744,   14164,   14612,   15023

diff --git a/taxcalc/tests/pufcsv_agg_expect.txt b/taxcalc/tests/pufcsv_agg_expect.txt
@@ -2,7 +2,7 @@
 Returns (#m)                      162.5    162.2    164.4    167.1    170.1    172.9    175.4    177.7    179.9    182.2
 AGI ($b)                        9,326.9 10,020.7 10,724.0 10,983.8 11,515.7 11,997.4 12,428.7 12,875.0 13,363.2 13,902.2
 Itemizers (#m)                     42.1     42.0     42.9     43.9     44.7     45.4     46.1     46.7     47.3     47.9
-Itemized Deduction ($b)         1,091.5  1,105.2  1,167.2  1,220.1  1,270.5  1,333.1  1,397.5  1,462.4  1,532.6  1,604.9
+Itemized Deduction ($b)         1,091.5  1,105.2  1,167.2  1,220.2  1,270.5  1,333.1  1,397.4  1,462.4  1,532.6  1,604.9
 Standard Deduction Filers (#m)    108.1    107.7    108.7    110.1    111.9    113.6    115.0    116.4    117.7    119.0
 Standard Deduction ($b)           918.2    925.0    949.1    962.0    985.1  1,023.2  1,060.0  1,097.8  1,137.7  1,179.3
 Personal Exemption ($b)         1,114.5  1,113.8  1,136.0  1,162.0  1,173.5  1,212.0  1,250.8  1,290.5  1,332.6  1,376.7