From 8ab9e8c23ea98cd93441bdc6c6ba056ca26dcc52 Mon Sep 17 00:00:00 2001 From: martinholmer Date: Mon, 12 Sep 2016 17:15:23 -0400 Subject: [PATCH] Remove logic for expired First-Time Homebuyers Credit. --- taxcalc/calculate.py | 1 - taxcalc/functions.py | 13 ++----------- taxcalc/records.py | 2 -- taxcalc/tests/pufcsv_agg_expect.txt | 6 +++--- taxcalc/tests/pufcsv_mtr_expect.txt | 22 +++++++++++----------- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/taxcalc/calculate.py b/taxcalc/calculate.py index d1ea8ebe0..71078f186 100644 --- a/taxcalc/calculate.py +++ b/taxcalc/calculate.py @@ -189,7 +189,6 @@ def calc_one_year(self, zero_out_calc_vars=False): EducationTaxCredit(self.policy, self.records) NonrefundableCredits(self.policy, self.records) AdditionalCTC(self.policy, self.records) - F5405(self.policy, self.records) C1040(self.policy, self.records) DecomposeEITC(self.policy, self.records) IITAX(self.policy, self.records) diff --git a/taxcalc/functions.py b/taxcalc/functions.py index fb6ff06a3..5882fc1ff 100644 --- a/taxcalc/functions.py +++ b/taxcalc/functions.py @@ -1093,15 +1093,6 @@ def AdditionalCTC(n24, prectc, _earned, c07220, ptax_was, return c11070 -@iterate_jit(nopython=True) -def F5405(e11580, c11580): - """ - Form 5405, First-Time Homebuyer Credit - """ - c11580 = e11580 - return c11580 - - @iterate_jit(nopython=True) def C1040(e07400, c07200, c07220, c07230, c07300, c07240, e07260, c07600, p08000, c05800, e09900, ptax_sey, e09800, @@ -1135,14 +1126,14 @@ def DecomposeEITC(c59660, c07100, c08800, c05800, _avail, _othertax): @iterate_jit(nopython=True) -def IITAX(c09200, c59660, c11070, c10960, _eitc, c11580, +def IITAX(c09200, c59660, c11070, c10960, _eitc, _payrolltax, personal_credit, n24, _iitax, _combined, _refund, CTC_additional, CTC_additional_ps, CTC_additional_prt, c00100, _sep, MARS): """ IITAX function: ... """ - _refund = c59660 + c11070 + c10960 + c11580 + personal_credit + _refund = c59660 + c11070 + c10960 + personal_credit _iitax = c09200 - _refund _combined = _iitax + _payrolltax potential_add_CTC = max(0., min(_combined, CTC_additional * n24)) diff --git a/taxcalc/records.py b/taxcalc/records.py index 356771589..62791b555 100644 --- a/taxcalc/records.py +++ b/taxcalc/records.py @@ -145,7 +145,6 @@ class instance: Records 'c04470', 'c04600', 'c21060', 'c21040', 'c17000', 'c18300', 'c20800', 'c02900', 'c02700', 'c23650', 'c01000', 'c02500', - 'c11580', '_sey', '_earned', '_earned_p', '_earned_s', '_feided', 'ymod', 'ymod1', '_posagi', '_xyztax', '_avail', @@ -338,7 +337,6 @@ def _blowup(self, year): self.e09800 *= ATXPY self.e09900 *= ATXPY self.e11200 *= ATXPY - self.e11580 *= ATXPY # ITEMIZED DEDUCTIONS self.e17500 *= ACPIM self.e18400 *= ATXPY diff --git a/taxcalc/tests/pufcsv_agg_expect.txt b/taxcalc/tests/pufcsv_agg_expect.txt index 32767e03e..0e664915f 100644 --- a/taxcalc/tests/pufcsv_agg_expect.txt +++ b/taxcalc/tests/pufcsv_agg_expect.txt @@ -12,9 +12,9 @@ AMT income ($b) 8,571.7 9,081.5 9,428.1 9,814.9 10,233.6 10,6 AMT amount ($b) 31.3 32.9 34.6 36.8 38.9 41.1 43.3 45.7 48.2 51.1 AMT number (#m) 4.2 4.4 4.6 4.9 5.1 5.2 5.4 5.6 5.7 5.9 Tax before credits ($b) 1,338.3 1,437.1 1,491.2 1,562.6 1,639.5 1,705.5 1,765.8 1,831.4 1,908.5 1,992.9 -refundable credits ($b) 111.4 112.4 113.8 113.5 114.4 116.0 117.5 119.3 120.8 122.5 +refundable credits ($b) 100.3 100.8 101.6 100.7 100.9 101.9 102.9 104.0 104.9 105.9 nonrefundable credits ($b) 71.6 71.7 72.1 72.7 74.1 74.9 75.3 76.2 77.1 78.0 Misc. Surtax ($b) 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 -Ind inc tax ($b) 1,226.2 1,331.1 1,384.7 1,458.5 1,536.3 1,602.6 1,663.3 1,729.3 1,807.4 1,893.0 +Ind inc tax ($b) 1,237.3 1,342.7 1,397.0 1,471.4 1,549.8 1,616.6 1,677.9 1,744.5 1,823.2 1,909.6 Payroll tax ($b) 919.6 961.9 1,003.7 1,045.3 1,093.9 1,141.4 1,186.7 1,233.7 1,284.4 1,338.8 -Combined liability ($b) 2,145.8 2,293.0 2,388.4 2,503.8 2,630.2 2,743.9 2,849.9 2,962.9 3,091.8 3,231.8 +Combined liability ($b) 2,156.9 2,304.6 2,400.6 2,516.6 2,643.7 2,758.0 2,864.6 2,978.2 3,107.6 3,248.4 diff --git a/taxcalc/tests/pufcsv_mtr_expect.txt b/taxcalc/tests/pufcsv_mtr_expect.txt index 6f22db516..223b89720 100644 --- a/taxcalc/tests/pufcsv_mtr_expect.txt +++ b/taxcalc/tests/pufcsv_mtr_expect.txt @@ -6,43 +6,43 @@ ITAX mtr histogram bin edges: [-1.0, -0.3, -0.2, -0.1, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 1.0] PTAX and ITAX mtr histogram bin counts for e00200p: 219814 : 0 31950 0 0 0 0 0 183680 4184 0 -219814 : 4596 91 1978 8876 45584 63246 48589 25767 20428 659 +219814 : 4596 91 1978 8876 45597 63233 48589 25767 20428 659 PTAX and ITAX mtr histogram bin counts for e00900p: 219814 : 14116 29235 0 0 0 0 0 176463 0 0 219814 : 3328 524 794 164 15287 35394 69858 47714 36741 10010 PTAX and ITAX mtr histogram bin counts for e00300: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 0 0 60365 62865 44142 26113 25640 689 +219814 : 0 0 0 0 60379 62851 44142 26113 25640 689 PTAX and ITAX mtr histogram bin counts for e00400: 219814 : 219814 0 0 0 0 0 0 0 0 0 219814 : 0 0 0 0 205699 7875 6101 102 29 8 PTAX and ITAX mtr histogram bin counts for e00600: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 0 0 60366 62879 44314 25931 25635 689 +219814 : 0 0 0 0 60380 62865 44314 25931 25635 689 PTAX and ITAX mtr histogram bin counts for e00650: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 6 20573 103644 44365 50201 612 389 24 +219814 : 0 0 6 20614 103603 44365 50201 612 389 24 PTAX and ITAX mtr histogram bin counts for e01400: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 0 0 60317 62971 47696 26408 21748 674 +219814 : 0 0 0 0 60327 62961 47696 26408 21748 674 PTAX and ITAX mtr histogram bin counts for e01700: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 0 0 60320 62968 47677 26427 21748 674 +219814 : 0 0 0 0 60329 62959 47677 26427 21748 674 PTAX and ITAX mtr histogram bin counts for e02000: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 0 0 60337 62923 44367 25863 25635 689 +219814 : 0 0 0 0 60348 62912 44367 25863 25635 689 PTAX and ITAX mtr histogram bin counts for e02400: 219814 : 219814 0 0 0 0 0 0 0 0 0 219814 : 0 0 0 0 96405 40966 52036 29528 773 106 PTAX and ITAX mtr histogram bin counts for p22250: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 0 20 82611 60712 42471 18873 14719 408 +219814 : 0 0 0 20 82619 60704 42471 18873 14719 408 PTAX and ITAX mtr histogram bin counts for p23250: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 0 0 2 19798 122240 38602 33938 2154 3033 47 +219814 : 0 0 2 19828 122210 38602 33938 2154 3033 47 PTAX and ITAX mtr histogram bin counts for e18500: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 22942 23254 20704 5937 146977 0 0 0 0 0 +219814 : 22942 23254 20700 5941 146977 0 0 0 0 0 PTAX and ITAX mtr histogram bin counts for e19200: 219814 : 219814 0 0 0 0 0 0 0 0 0 -219814 : 32345 27674 20664 3143 135988 0 0 0 0 0 +219814 : 32345 27674 20660 3147 135988 0 0 0 0 0