diff --git a/MANIFEST.in b/MANIFEST.in index ea4f9918c..c064552c5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,4 +11,3 @@ include taxcalc/consumption.json include taxcalc/records_variables.json include taxcalc/cps.csv.gz include taxcalc/cps_weights.csv.gz -include taxcalc/cps_benefits.csv.gz diff --git a/taxcalc/assumptions/economic_assumptions_template.json b/taxcalc/assumptions/economic_assumptions_template.json index 9f0db4cdc..5d17aaf20 100644 --- a/taxcalc/assumptions/economic_assumptions_template.json +++ b/taxcalc/assumptions/economic_assumptions_template.json @@ -41,7 +41,16 @@ "_ASOCSEC": {"2017": [0.0]}, "_ATXPY": {"2017": [0.0]}, "_AUCOMP": {"2017": [0.0]}, - "_AWAGE": {"2017": [0.0]} + "_AWAGE": {"2017": [0.0]}, + "_ABENOTHER": {"2017": [0.0]}, + "_ABENMCARE": {"2017": [0.0]}, + "_ABENMCAID": {"2017": [0.0]}, + "_ABENSSI": {"2017": [0.0]}, + "_ABENSNAP": {"2017": [0.0]}, + "_ABENWIC": {"2017": [0.0]}, + "_ABENHOUSING": {"2017": [0.0]}, + "_ABENTANF": {"2017": [0.0]}, + "_ABENVET": {"2017": [0.0]} }, "growdiff_response": { "_ABOOK": {"2017": [0.0]}, @@ -59,7 +68,16 @@ "_ASOCSEC": {"2017": [0.0]}, "_ATXPY": {"2017": [0.0]}, "_AUCOMP": {"2017": [0.0]}, - "_AWAGE": {"2017": [0.0]} + "_AWAGE": {"2017": [0.0]}, + "_ABENOTHER": {"2017": [0.0]}, + "_ABENMCARE": {"2017": [0.0]}, + "_ABENMCAID": {"2017": [0.0]}, + "_ABENSSI": {"2017": [0.0]}, + "_ABENSNAP": {"2017": [0.0]}, + "_ABENWIC": {"2017": [0.0]}, + "_ABENHOUSING": {"2017": [0.0]}, + "_ABENTANF": {"2017": [0.0]}, + "_ABENVET": {"2017": [0.0]} }, "growmodel": { "_active": {"2017": [false]} diff --git a/taxcalc/cps_benefits.csv.gz b/taxcalc/cps_benefits.csv.gz deleted file mode 100644 index 7318c2b53..000000000 Binary files a/taxcalc/cps_benefits.csv.gz and /dev/null differ diff --git a/taxcalc/growdiff.json b/taxcalc/growdiff.json index 4b57c57ce..730aafe53 100644 --- a/taxcalc/growdiff.json +++ b/taxcalc/growdiff.json @@ -301,5 +301,183 @@ "integer_value": false, "value": [0.0], "range": {"min": -1, "max": 1} + }, + + "_ABENOTHER": { + "long_name": "ABENOTHER additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENOTHER extrapolates input variable other_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + "_ABENMCARE": { + "long_name": "ABENMCARE additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENMCARE extrapolates input variable mcare_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + + "_ABENMCAID": { + "long_name": "ABENMCAID additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENMCAID extrapolates input variable mcaid_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + + "_ABENSSI": { + "long_name": "ABENSSI additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENSSI extrapolates input variable ssi_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + + "_ABENSNAP": { + "long_name": "ABENSNAP additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENSNAP extrapolates input variable snap_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + + "_ABENWIC": { + "long_name": "ABENWIC additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENWIC extrapolates input variable wic_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + + "_ABENHOUSING": { + "long_name": "ABENHOUSING additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENHOUSING extrapolates input variable housing_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + + "_ABENTANF": { + "long_name": "ABENTANF additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENTANF extrapolates input variable tanf_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} + }, + + "_ABENVET": { + "long_name": "ABENVET additive difference from default projection", + "description": "Default projection is in growfactors.csv file. ABENVET extrapolates input variable vet_ben.", + "section_1": "", + "section_2": "", + "notes": "", + "row_var": "FLPDYR", + "row_label": ["2013"], + "start_year": 2013, + "cpi_inflatable": false, + "cpi_inflated": false, + "col_var": "", + "col_label": "", + "boolean_value": false, + "integer_value": false, + "value": [0.0], + "range": {"min": -1, "max": 1} } + } diff --git a/taxcalc/growdiff.py b/taxcalc/growdiff.py index aab278a8c..1cf17411b 100644 --- a/taxcalc/growdiff.py +++ b/taxcalc/growdiff.py @@ -132,3 +132,12 @@ def apply_to(self, growfactors): growfactors.update('ATXPY', cyr, self._ATXPY[i]) growfactors.update('AUCOMP', cyr, self._AUCOMP[i]) growfactors.update('AWAGE', cyr, self._AWAGE[i]) + growfactors.update('ABENOTHER', cyr, self._ABENOTHER[i]) + growfactors.update('ABENMCARE', cyr, self._ABENMCARE[i]) + growfactors.update('ABENMCAID', cyr, self._ABENMCAID[i]) + growfactors.update('ABENSSI', cyr, self._ABENSSI[i]) + growfactors.update('ABENSNAP', cyr, self._ABENSNAP[i]) + growfactors.update('ABENWIC', cyr, self._ABENWIC[i]) + growfactors.update('ABENHOUSING', cyr, self._ABENHOUSING[i]) + growfactors.update('ABENTANF', cyr, self._ABENTANF[i]) + growfactors.update('ABENVET', cyr, self._ABENVET[i]) diff --git a/taxcalc/growfactors.csv b/taxcalc/growfactors.csv index ff4fff739..f7a969716 100644 --- a/taxcalc/growfactors.csv +++ b/taxcalc/growfactors.csv @@ -1,18 +1,18 @@ -YEAR,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS,ACGNS,ASOCSEC,AUCOMP,AIPD,ABENEFITS -2011,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2012,1.043862,0.950283,1.104992,1.0209,1.0365,1.032649,1.049023,0.956138,1.165922,0.926962,0.923588,1.327776,1.58966,1.02827,0.7711,0.9231,0.992359 -2013,1.012518,1.142179,1.033784,1.014791,1.024602,1.019984,0.99505,1.050098,0.997245,1.013128,0.893658,0.819381,0.776217,1.014786,0.728829,0.896219,0.992515 -2014,1.029476,0.931683,0.976566,1.015927,0.964218,1.039999,1.040616,1.030349,1.075978,0.991321,0.925886,1.17606,1.387522,1.004801,0.641103,0.970506,0.99257 -2015,1.043858,0.508206,0.999544,1.001235,1.010449,1.042272,1.045643,1.045687,0.999528,0.999533,0.992874,1.157209,1.268161,1.015868,0.910908,1.052061,1.053858 -2016,1.027314,0.689296,0.990701,1.012621,1.01353,1.03404,1.031041,1.031132,0.990745,0.990685,1.000698,0.989028,0.889463,1.005343,0.782145,1.035752,1.097065 -2017,1.033861,0.813631,0.995785,1.022585,1.025269,1.037738,1.041126,1.041095,0.995835,0.995814,1.031828,1.012056,1.101495,1.005072,0.996884,1.042176,1.011911 -2018,1.037313,1.48793,0.993846,1.022361,1.012742,1.036076,1.025419,1.025377,0.993871,0.993912,1.036421,1.043694,1.025287,1.024288,0.977335,1.045734,1.103035 -2019,1.035569,1.296752,1.001475,1.023127,1.013316,1.030217,1.023213,1.023267,1.001456,1.001478,1.063017,1.034493,0.993445,1.037255,1.082367,1.043838,1.054052 -2020,1.034169,1.205152,1.006471,1.023743,1.013866,1.026805,1.021165,1.021158,1.006439,1.006348,1.081241,1.024377,1.017719,1.035877,1.18212,1.042299,0.996727 -2021,1.035865,1.16783,1.012885,1.02439,1.014213,1.028412,1.025171,1.025174,1.012827,1.01294,1.090913,1.019573,1.023735,1.033631,1.113125,1.04386,1.03007 -2022,1.035881,1.107286,1.019598,1.023726,1.014102,1.030728,1.02925,1.02929,1.019656,1.019575,1.072062,1.019234,1.027913,1.034139,1.064851,1.043771,1.030159 -2023,1.035254,1.063374,1.028614,1.023992,1.01434,1.031473,1.031689,1.031633,1.028548,1.028594,1.058859,1.019495,1.029178,1.035356,1.051938,1.043174,1.030193 -2024,1.035337,1.048499,1.030505,1.023749,1.014395,1.031564,1.032954,1.032966,1.030531,1.030529,1.048357,1.023404,1.030403,1.036368,1.043358,1.043084,1.030334 -2025,1.034629,1.044463,1.030914,1.023898,1.014528,1.031933,1.033635,1.033618,1.030967,1.030889,1.040376,1.026049,1.031554,1.034024,1.043478,1.042117,1.030635 -2026,1.036122,1.016269,1.033285,1.023949,1.014736,1.032043,1.033896,1.033848,1.03325,1.033314,1.040659,1.028251,1.032329,1.035647,1.043508,1.043536,1.030633 -2027,1.0358,0.99068,1.032812,1.024131,1.015015,1.032291,1.034216,1.034262,1.03286,1.032865,1.039756,1.030999,1.032011,1.03812,1.034414,1.04314,1.030788 +YEAR,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS,ACGNS,ASOCSEC,AUCOMP,AIPD,ABENOTHER,ABENMCARE,ABENMCAID,ABENSSI,ABENSNAP,ABENWIC,ABENHOUSING,ABENTANF,ABENVET +2011,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2012,1.043862,0.950283,1.104992,1.0209,1.0365,1.032649,1.049023,0.956138,1.165922,0.926962,0.923588,1.327776,1.58966,1.02827,0.7711,0.9231,0.992359,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2013,1.012518,1.142179,1.033784,1.014791,1.024602,1.019984,0.99505,1.050098,0.997245,1.013128,0.893658,0.819381,0.776217,1.014786,0.728829,0.896219,0.992515,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2014,1.029476,0.931683,0.976566,1.015927,0.964218,1.039999,1.040616,1.030349,1.075978,0.991321,0.925886,1.17606,1.387522,1.004801,0.641103,0.970506,0.99257,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +2015,1.043858,0.508206,0.999544,1.001235,1.010449,1.042272,1.045643,1.045687,0.999528,0.999533,0.992874,1.157209,1.268161,1.015868,0.910908,1.052061,1.053858,1.023325,1.041528,1.019361,1.102667,1.007792,1.026748,1.132657,1.04693 +2016,1.027314,0.689296,0.990701,1.012621,1.01353,1.03404,1.031041,1.031132,0.990745,0.990685,1.000698,0.989028,0.889463,1.005343,0.782145,1.035752,1.097065,1.011695,1.010367,0.993375,0.989722,1.002577,1.01625,0.828168,1.105413 +2017,1.033861,0.813631,0.995785,1.022585,1.025269,1.037738,1.041126,1.041095,0.995835,0.995814,1.031828,1.012056,1.101495,1.005072,0.996884,1.042176,1.011911,1.030968,1.014601,0.981621,1.0,0.998715,1.063959,1.0,1.0 +2018,1.037313,1.48793,0.993846,1.022361,1.012742,1.036076,1.025419,1.025377,0.993871,0.993912,1.036421,1.043694,1.025287,1.024288,0.977335,1.045734,1.103035,1.045097,1.045897,1.005738,1.0,1.002574,1.034828,1.0,1.0 +2019,1.035569,1.296752,1.001475,1.023127,1.013316,1.030217,1.023213,1.023267,1.001456,1.001478,1.063017,1.034493,0.993445,1.037255,1.082367,1.043838,1.054052,1.052158,1.045866,1.000751,1.0,1.002567,1.034809,1.0,1.0 +2020,1.034169,1.205152,1.006471,1.023743,1.013866,1.026805,1.021165,1.021158,1.006439,1.006348,1.081241,1.024377,1.017719,1.035877,1.18212,1.042299,0.996727,1.050763,1.046106,1.00255,1.0,1.003841,1.034974,1.0,1.0 +2021,1.035865,1.16783,1.012885,1.02439,1.014213,1.028412,1.025171,1.025174,1.012827,1.01294,1.090913,1.019573,1.023735,1.033631,1.113125,1.04386,1.03007,1.047248,1.047927,1.001796,1.0,1.002551,1.034869,1.0,1.0 +2022,1.035881,1.107286,1.019598,1.023726,1.014102,1.030728,1.02925,1.02929,1.019656,1.019575,1.072062,1.019234,1.027913,1.034139,1.064851,1.043771,1.030159,1.048769,1.047573,0.999851,1.0,1.002545,1.034942,1.0,1.0 +2023,1.035254,1.063374,1.028614,1.023992,1.01434,1.031473,1.031689,1.031633,1.028548,1.028594,1.058859,1.019495,1.029178,1.035356,1.051938,1.043174,1.030193,1.050822,1.048715,1.000448,1.0,1.003807,1.034968,1.0,1.0 +2024,1.035337,1.048499,1.030505,1.023749,1.014395,1.031564,1.032954,1.032966,1.030531,1.030529,1.048357,1.023404,1.030403,1.036368,1.043358,1.043084,1.030334,1.048426,1.051767,0.99776,1.0,1.002528,1.034951,1.0,1.0 +2025,1.034629,1.044463,1.030914,1.023898,1.014528,1.031933,1.033635,1.033618,1.030967,1.030889,1.040376,1.026049,1.031554,1.034024,1.043478,1.042117,1.030635,1.046248,1.052213,1.002245,1.0,1.003783,1.034897,1.0,1.0 +2026,1.036122,1.016269,1.033285,1.023949,1.014736,1.032043,1.033896,1.033848,1.03325,1.033314,1.040659,1.028251,1.032329,1.035647,1.043508,1.043536,1.030633,1.072236,1.0,0.999552,1.0,1.002513,1.034808,1.0,1.0 +2027,1.0358,0.99068,1.032812,1.024131,1.015015,1.032291,1.034216,1.034262,1.03286,1.032865,1.039756,1.030999,1.032011,1.03812,1.034414,1.04314,1.030788,1.0,1.0,1.0,1.0,1.002506,1.034863,1.0,1.0 diff --git a/taxcalc/growfactors.py b/taxcalc/growfactors.py index db8ceb934..b4204c4bc 100644 --- a/taxcalc/growfactors.py +++ b/taxcalc/growfactors.py @@ -45,7 +45,10 @@ class instance: GrowFactors 'ADIVS', 'AINTS', 'AIPD', 'ASCHCI', 'ASCHCL', 'ASCHEI', 'ASCHEL', 'ASCHF', - 'ASOCSEC', 'ATXPY', 'AUCOMP', 'AWAGE', 'ABENEFITS']) + 'ASOCSEC', 'ATXPY', 'AUCOMP', 'AWAGE', + 'ABENOTHER', 'ABENMCARE', 'ABENMCAID', + 'ABENSSI', 'ABENSNAP', 'ABENWIC', + 'ABENHOUSING', 'ABENTANF', 'ABENVET']) def __init__(self, growfactors_filename=FILE_PATH): # read grow factors from specified growfactors_filename diff --git a/taxcalc/records.py b/taxcalc/records.py index 23e4ccf24..4582c1227 100644 --- a/taxcalc/records.py +++ b/taxcalc/records.py @@ -106,7 +106,6 @@ class instance: Records CPS_WEIGHTS_FILENAME = 'cps_weights.csv.gz' CPS_RATIOS_FILENAME = None VAR_INFO_FILENAME = 'records_variables.json' - CPS_BENEFITS_FILENAME = 'cps_benefits.csv.gz' def __init__(self, data='puf.csv', @@ -114,12 +113,11 @@ def __init__(self, gfactors=GrowFactors(), weights=PUF_WEIGHTS_FILENAME, adjust_ratios=PUF_RATIOS_FILENAME, - benefits=None, start_year=PUFCSV_YEAR): # pylint: disable=too-many-arguments,too-many-locals self.__data_year = start_year # read specified data - self._read_data(data, exact_calculations, (benefits is None)) + self._read_data(data, exact_calculations) # check that three sets of split-earnings variables have valid values msg = 'expression "{0} == {0}p + {0}s" is not true for every record' tol = 0.020001 # handles "%.2f" rounding errors @@ -157,9 +155,6 @@ def __init__(self, self._read_weights(weights) self.ADJ = None self._read_ratios(adjust_ratios) - # read extrapolated benefit variables - self.BEN = None - self._read_benefits(benefits) # weights must be same size as tax record data if self.WT.size > 0 and self.array_length != len(self.WT.index): # scale-up sub-sample weights by year-specific factor @@ -185,7 +180,6 @@ def __init__(self, @staticmethod def cps_constructor(data=None, - no_benefits=False, exact_calculations=False, gfactors=GrowFactors()): """ @@ -200,16 +194,11 @@ def cps_constructor(data=None, """ if data is None: data = os.path.join(Records.CUR_PATH, 'cps.csv.gz') - if no_benefits: - benefits_filename = None - else: - benefits_filename = Records.CPS_BENEFITS_FILENAME return Records(data=data, exact_calculations=exact_calculations, gfactors=gfactors, weights=Records.CPS_WEIGHTS_FILENAME, adjust_ratios=Records.CPS_RATIOS_FILENAME, - benefits=benefits_filename, start_year=Records.CPSCSV_YEAR) @property @@ -251,9 +240,6 @@ def increment_year(self): if self.WT.size > 0: wt_colname = 'WT{}'.format(self.__current_year) self.s006 = self.WT[wt_colname] * 0.01 - # extrapolate benefit values - if self.BEN.size > 0: - self._extrapolate_benefits(self.current_year) def set_current_year(self, new_current_year): """ @@ -404,6 +390,16 @@ def _blowup(self, year): self.e87530 *= ATXPY self.e87521 *= ATXPY self.cmbtp *= ATXPY + # BENEFITS + self.other_ben *= self.gfactors.factor_value('ABENOTHER', year) + self.mcare_ben *= self.gfactors.factor_value('ABENMCARE', year) + self.mcaid_ben *= self.gfactors.factor_value('ABENMCAID', year) + self.ssi_ben *= self.gfactors.factor_value('ABENSSI', year) + self.snap_ben *= self.gfactors.factor_value('ABENSNAP', year) + self.wic_ben *= self.gfactors.factor_value('ABENWIC', year) + self.housing_ben *= self.gfactors.factor_value('ABENHOUSING', year) + self.tanf_ben *= self.gfactors.factor_value('ABENTANF', year) + self.vet_ben *= self.gfactors.factor_value('ABENVET', year) def _adjust(self, year): """ @@ -414,25 +410,10 @@ def _adjust(self, year): # Interest income self.e00300 *= self.ADJ['INT{}'.format(year)][self.agi_bin].values - def _extrapolate_benefits(self, year): - """ - Extrapolate benefit variables - """ - setattr(self, 'housing_ben', self.BEN['housing_{}'.format(year)]) - setattr(self, 'ssi_ben', self.BEN['ssi_{}'.format(year)]) - setattr(self, 'snap_ben', self.BEN['snap_{}'.format(year)]) - setattr(self, 'tanf_ben', self.BEN['tanf_{}'.format(year)]) - setattr(self, 'vet_ben', self.BEN['vet_{}'.format(year)]) - setattr(self, 'wic_ben', self.BEN['wic_{}'.format(year)]) - setattr(self, 'mcare_ben', self.BEN['mcare_{}'.format(year)]) - setattr(self, 'mcaid_ben', self.BEN['mcaid_{}'.format(year)]) - self.other_ben *= self.gfactors.factor_value('ABENEFITS', year) - - def _read_data(self, data, exact_calcs, no_benefits): + def _read_data(self, data, exact_calcs): """ Read Records data from file or use specified DataFrame as data. Specifies exact array depending on boolean value of exact_calcs. - Set benefits to zero if no_benefits is True; otherwise do nothing. """ # pylint: disable=too-many-statements,too-many-branches if Records.INTEGER_VARS is None: @@ -494,17 +475,6 @@ def _read_data(self, data, exact_calcs, no_benefits): raise ValueError('not all EIC values in [0,3] range') # specify value of exact array self.exact[:] = np.where(exact_calcs is True, 1, 0) - # optionally set benefits to zero - if no_benefits: - self.housing_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.ssi_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.snap_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.tanf_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.vet_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.wic_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.mcare_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.mcaid_ben[:] = np.zeros(self.array_length, dtype=np.float64) - self.other_ben[:] = np.zeros(self.array_length, dtype=np.float64) # delete intermediate variables del READ_VARS del UNREAD_VARS @@ -573,40 +543,3 @@ def _read_ratios(self, ratios): self.ADJ = pd.DataFrame() setattr(self, 'ADJ', ADJ.astype(np.float32)) del ADJ - - def _read_benefits(self, benefits): - """ - Read Records extrapolated benefits from a file or uses a specified - DataFrame or creates an empty DataFrame if None. Should only be - used with the cps.csv file - """ - if benefits is None: - setattr(self, 'BEN', pd.DataFrame({'Nothing': []})) - return - if isinstance(benefits, pd.DataFrame): - BEN_partial = benefits - elif isinstance(benefits, six.string_types): - benefits_path = os.path.join(Records.CUR_PATH, benefits) - if os.path.isfile(benefits_path): - BEN_partial = pd.read_csv(benefits_path) - else: - # cannot call read_egg_ function in unit tests - b_path = os.path.basename(benefits_path) # pragma: no cover - BEN_partial = read_egg_csv(b_path) # pragma: no cover - else: - msg = 'benefits is not None or a string or a Pandas DataFrame' - raise ValueError(msg) - assert isinstance(BEN_partial, pd.DataFrame) - # expand benefits DataFrame to include those who don't receive benefits - recid_df = pd.DataFrame({'RECID': self.RECID}) - # merge benefits with DataFrame of RECID - full_df = recid_df.merge(BEN_partial, on='RECID', how='left') - # fill missing values - full_df.fillna(0, inplace=True) - assert len(recid_df.index) == len(full_df.index) - self.BEN = pd.DataFrame() - setattr(self, 'BEN', full_df.astype(np.float32)) - # delete intermediate DataFrame objects - del full_df - del recid_df - del BEN_partial diff --git a/taxcalc/taxcalcio.py b/taxcalc/taxcalcio.py index eda45346c..7febabaa2 100644 --- a/taxcalc/taxcalcio.py +++ b/taxcalc/taxcalcio.py @@ -334,15 +334,12 @@ def init(self, input_data, tax_year, baseline, reform, assump, # read input file contents into Records objects if aging_input_data: if self.cps_input_data: - nobenefits = self.growmodel.is_ever_active() recs = Records.cps_constructor( gfactors=gfactors_ref, - no_benefits=nobenefits, exact_calculations=exact_calculations ) recs_base = Records.cps_constructor( gfactors=gfactors_base, - no_benefits=nobenefits, exact_calculations=exact_calculations ) else: # if not cps_input_data but aging_input_data diff --git a/taxcalc/tests/benefits_expect.csv b/taxcalc/tests/benefits_expect.csv index 60374eadf..46acc782e 100644 --- a/taxcalc/tests/benefits_expect.csv +++ b/taxcalc/tests/benefits_expect.csv @@ -7,107 +7,107 @@ year,bname,benamt,bencnt,benavg 2014,tanf,29.347,8.532,3.4 2014,vet,127.424,8.41,15.2 2014,housing,30.321,8.747,3.5 -2015,ssi,54.762,13.693,4.0 -2015,mcare,602.434,67.018,9.0 -2015,mcaid,412.75,77.454,5.3 -2015,snap,82.557,51.063,1.6 -2015,wic,3.635,17.519,0.2 -2015,tanf,27.254,6.679,4.1 -2015,vet,152.295,9.56,15.9 -2015,housing,33.571,9.101,3.7 -2016,ssi,54.908,13.957,3.9 -2016,mcare,629.858,68.873,9.1 -2016,mcaid,384.074,78.372,4.9 -2016,snap,78.939,51.848,1.5 -2016,wic,3.616,17.639,0.2 -2016,tanf,27.404,8.073,3.4 -2016,vet,158.213,8.928,17.7 -2016,housing,33.884,9.232,3.7 -2017,ssi,55.254,13.8,4.0 -2017,mcare,667.881,70.76,9.4 -2017,mcaid,380.647,79.351,4.8 -2017,snap,78.939,52.647,1.5 -2017,wic,3.598,16.666,0.2 -2017,tanf,27.404,8.166,3.4 -2017,vet,158.991,9.176,17.3 -2017,housing,35.559,8.854,4.0 -2018,ssi,57.029,14.114,4.0 -2018,mcare,718.292,72.858,9.9 -2018,mcaid,392.292,80.345,4.9 -2018,snap,78.938,53.461,1.5 -2018,wic,3.617,16.802,0.2 -2018,tanf,27.404,8.255,3.3 -2018,vet,159.828,8.976,17.8 -2018,housing,36.524,8.998,4.1 -2019,ssi,58.911,13.657,4.3 -2019,mcare,777.92,75.141,10.4 -2019,mcaid,391.63,81.398,4.8 -2019,snap,78.939,51.703,1.5 -2019,wic,3.616,16.941,0.2 -2019,tanf,27.404,8.351,3.3 -2019,vet,160.709,9.19,17.5 -2019,housing,37.52,8.731,4.3 -2020,ssi,60.864,14.009,4.3 -2020,mcare,841.639,77.593,10.8 -2020,mcaid,391.666,82.434,4.8 -2020,snap,78.939,52.494,1.5 -2020,wic,3.616,17.056,0.2 -2020,tanf,27.404,8.032,3.4 -2020,vet,161.663,8.988,18.0 -2020,housing,38.542,8.898,4.3 -2021,ssi,62.833,14.359,4.4 -2021,mcare,907.087,79.975,11.3 -2021,mcaid,391.223,83.426,4.7 -2021,snap,78.939,53.296,1.5 -2021,wic,3.616,17.172,0.2 -2021,tanf,27.404,8.119,3.4 -2021,vet,162.676,9.202,17.7 -2021,housing,39.589,8.645,4.6 -2022,ssi,64.781,13.855,4.7 -2022,mcare,978.525,82.405,11.9 -2022,mcaid,391.039,84.446,4.6 -2022,snap,78.938,54.1,1.5 -2022,wic,3.616,17.291,0.2 -2022,tanf,27.404,8.187,3.3 -2022,vet,163.763,9.413,17.4 -2022,housing,40.666,8.801,4.6 -2023,ssi,66.911,14.193,4.7 -2023,mcare,1056.186,84.794,12.5 -2023,mcaid,390.891,85.465,4.6 -2023,snap,78.939,51.983,1.5 -2023,wic,3.616,17.397,0.2 -2023,tanf,27.404,8.262,3.3 -2023,vet,164.923,8.827,18.7 -2023,housing,41.773,8.523,4.9 -2024,ssi,69.076,14.518,4.8 -2024,mcare,1135.749,87.116,13.0 -2024,mcaid,391.001,86.492,4.5 -2024,snap,78.939,52.778,1.5 -2024,wic,3.617,17.513,0.2 -2024,tanf,27.404,8.342,3.3 -2024,vet,166.156,9.039,18.4 -2024,housing,42.908,8.669,4.9 -2025,ssi,71.472,14.273,5.0 -2025,mcare,1218.537,89.507,13.6 -2025,mcaid,391.665,87.532,4.5 -2025,snap,78.939,53.531,1.5 -2025,wic,3.616,17.638,0.2 -2025,tanf,27.404,7.942,3.5 -2025,vet,167.478,9.25,18.1 -2025,housing,44.073,8.119,5.4 -2026,ssi,73.739,14.559,5.1 -2026,mcare,1338.427,91.72,14.6 -2026,mcaid,392.291,88.509,4.4 -2026,snap,78.938,54.243,1.5 -2026,wic,3.617,16.64,0.2 -2026,tanf,27.404,8.014,3.4 -2026,vet,168.888,8.696,19.4 -2026,housing,45.275,8.231,5.5 -2027,ssi,73.739,14.846,5.0 -2027,mcare,1338.428,93.762,14.3 -2027,mcaid,392.292,89.469,4.4 -2027,snap,78.939,52.299,1.5 -2027,wic,3.617,16.771,0.2 -2027,tanf,27.404,8.078,3.4 -2027,vet,168.887,8.888,19.0 -2027,housing,46.505,8.345,5.6 +2015,ssi,48.169,12.368,3.9 +2015,mcare,555.018,62.298,8.9 +2015,mcaid,362.9,73.523,4.9 +2015,snap,81.945,51.063,1.6 +2015,wic,3.559,17.519,0.2 +2015,tanf,34.202,8.663,3.9 +2015,vet,140.934,8.954,15.7 +2015,housing,29.464,8.567,3.4 +2016,ssi,48.953,12.612,3.9 +2016,mcare,579.377,64.032,9.0 +2016,mcaid,372.226,74.362,5.0 +2016,snap,82.685,51.848,1.6 +2016,wic,3.597,17.639,0.2 +2016,tanf,28.777,8.771,3.3 +2016,vet,159.605,9.153,17.4 +2016,housing,30.477,8.684,3.5 +2017,ssi,49.28,12.872,3.8 +2017,mcare,615.978,65.822,9.4 +2017,mcaid,383.679,75.268,5.1 +2017,snap,84.334,52.647,1.6 +2017,wic,3.627,17.791,0.2 +2017,tanf,29.301,8.88,3.3 +2017,vet,164.428,9.408,17.5 +2017,housing,33.04,8.828,3.7 +2018,ssi,50.916,13.173,3.9 +2018,mcare,664.509,67.812,9.8 +2018,mcaid,408.687,76.187,5.4 +2018,snap,86.01,53.461,1.6 +2018,wic,3.67,17.941,0.2 +2018,tanf,29.575,8.973,3.3 +2018,vet,168.924,9.625,17.6 +2018,housing,34.865,8.97,3.9 +2019,ssi,52.317,13.508,3.9 +2019,mcare,723.103,69.962,10.3 +2019,mcaid,434.778,77.161,5.6 +2019,snap,87.637,54.316,1.6 +2019,wic,3.711,18.082,0.2 +2019,tanf,29.935,9.081,3.3 +2019,vet,173.794,9.863,17.6 +2019,housing,36.836,9.116,4.0 +2020,ssi,53.838,13.847,3.9 +2020,mcare,786.093,72.269,10.9 +2020,mcaid,462.657,78.11,5.9 +2020,snap,89.2,55.146,1.6 +2020,wic,3.748,18.181,0.2 +2020,tanf,30.219,9.187,3.3 +2020,vet,178.311,10.101,17.7 +2020,housing,38.924,9.283,4.2 +2021,ssi,55.345,14.19,3.9 +2021,mcare,848.656,74.514,11.4 +2021,mcaid,492.168,79.025,6.2 +2021,snap,90.723,55.985,1.6 +2021,wic,3.785,18.298,0.2 +2021,tanf,30.525,9.274,3.3 +2021,vet,182.788,10.335,17.7 +2021,housing,41.108,9.45,4.4 +2022,ssi,56.742,14.524,3.9 +2022,mcare,916.779,76.794,11.9 +2022,mcaid,523.474,79.962,6.5 +2022,snap,92.264,56.825,1.6 +2022,wic,3.823,18.422,0.2 +2022,tanf,30.788,9.359,3.3 +2022,vet,187.374,10.571,17.7 +2022,housing,43.407,9.618,4.5 +2023,ssi,58.174,14.878,3.9 +2023,mcare,991.325,79.039,12.5 +2023,mcaid,557.711,80.896,6.9 +2023,snap,93.836,57.683,1.6 +2023,wic,3.864,18.529,0.2 +2023,tanf,31.067,9.445,3.3 +2023,vet,191.873,10.815,17.7 +2023,housing,45.813,9.789,4.7 +2024,ssi,59.397,15.216,3.9 +2024,mcare,1067.237,81.221,13.1 +2024,mcaid,595.23,81.835,7.3 +2024,snap,95.398,58.561,1.6 +2024,wic,3.902,18.654,0.2 +2024,tanf,31.392,9.528,3.3 +2024,vet,196.103,11.037,17.8 +2024,housing,48.314,9.955,4.9 +2025,ssi,61.006,15.568,3.9 +2025,mcare,1147.959,83.47,13.8 +2025,mcaid,636.072,82.794,7.7 +2025,snap,96.953,59.405,1.6 +2025,wic,3.945,18.778,0.2 +2025,tanf,31.686,9.611,3.3 +2025,vet,200.49,11.266,17.8 +2025,housing,50.98,10.131,5.0 +2026,ssi,62.315,15.885,3.9 +2026,mcare,1262.615,85.559,14.8 +2026,mcaid,645.107,83.689,7.7 +2026,snap,98.445,60.191,1.6 +2026,wic,3.982,18.893,0.2 +2026,tanf,31.931,9.687,3.3 +2026,vet,205.006,11.491,17.8 +2026,housing,53.59,10.266,5.2 +2027,ssi,63.625,16.199,3.9 +2027,mcare,1291.178,87.48,14.8 +2027,mcaid,653.908,84.582,7.7 +2027,snap,99.944,60.985,1.6 +2027,wic,4.025,19.029,0.2 +2027,tanf,32.189,9.766,3.3 +2027,vet,209.456,11.715,17.9 +2027,housing,56.318,10.408,5.4 diff --git a/taxcalc/tests/tbi_cps_expect.txt b/taxcalc/tests/tbi_cps_expect.txt index 39bd057fe..ee9653e16 100644 --- a/taxcalc/tests/tbi_cps_expect.txt +++ b/taxcalc/tests/tbi_cps_expect.txt @@ -19,7 +19,7 @@ TABLE aggr_d RESULTS: TABLE diff_comb_xbin RESULTS: { "$0-10K_2": [ - "7055397.37", + "7097134.01", "0.00", "0.00", "0.00", @@ -28,12 +28,12 @@ TABLE diff_comb_xbin RESULTS: "0.00", "0.00", "0.00", - "11111298883.82", - "11111298883.82", + "13253906373.26", + "13253906373.26", "0.00" ], "$10-20K_2": [ - "9938119.72", + "10140515.40", "0.00", "0.00", "0.00", @@ -42,26 +42,26 @@ TABLE diff_comb_xbin RESULTS: "0.00", "0.00", "0.00", - "63930310914.46", - "63930310914.46", + "68081416942.16", + "68081416942.16", "0.00" ], "$100-200K_2": [ - "34218575.20", - "4703830.04", - "13.75", - "15849681.81", - "46.32", - "1365.92", - "46739671828.72", - "23.08", - "0.00", - "949404217553.27", - "949404217553.27", - "-3.62" + "34463641.87", + "4721773.83", + "13.70", + "15890338.06", + "46.11", + "1354.57", + "46683467274.03", + "23.05", + "0.00", + "989979381864.86", + "989979381864.86", + "-3.59" ], "$20-30K_2": [ - "16417030.77", + "16513396.06", "0.00", "0.00", "0.00", @@ -70,26 +70,26 @@ TABLE diff_comb_xbin RESULTS: "0.00", "0.00", "0.00", - "143776301950.59", - "143776301950.59", + "147683457154.30", + "147683457154.30", "0.00" ], "$200-500K_2": [ - "14431172.83", + "14396735.39", "388036.49", - "2.69", - "12104170.05", - "83.88", - "8550.11", - "123388111304.96", - "60.93", + "2.70", + "12127641.93", + "84.24", + "8576.05", + "123467083906.69", + "60.97", "0.00", - "652155627211.32", - "652155627211.32", - "-6.59" + "657027576977.81", + "657027576977.81", + "-6.58" ], "$30-40K_2": [ - "18183776.35", + "18103103.13", "0.00", "0.00", "0.00", @@ -98,12 +98,12 @@ TABLE diff_comb_xbin RESULTS: "0.00", "0.00", "0.00", - "203328102977.68", - "203328102977.68", + "194254539342.63", + "194254539342.63", "0.00" ], "$40-50K_2": [ - "17202793.42", + "16710572.33", "0.00", "0.00", "0.00", @@ -112,51 +112,51 @@ TABLE diff_comb_xbin RESULTS: "0.00", "0.00", "0.00", - "202248728462.06", - "202248728462.06", + "179286490599.42", + "179286490599.42", "0.00" ], "$50-75K_2": [ - "28789811.39", - "3494805.16", - "12.14", - "1536687.89", - "5.34", - "-34.88", - "-1004261791.30", + "29117029.96", + "3511751.87", + "12.06", + "1522621.89", + "5.23", + "-34.91", + "-1016496365.06", "-0.50", "0.00", - "492229829596.06", - "492229829596.06", - "-0.65" + "517879839081.99", + "517879839081.99", + "-0.64" ], "$500-1000K_2": [ - "1094620.54", + "1104498.07", "113792.95", - "10.40", + "10.30", "948614.66", - "86.66", - "17495.82", + "85.89", + "17339.36", "19151288159.87", "9.46", "0.00", - "35946183145.27", - "35946183145.27", - "-4.45" + "43222608390.81", + "43222608390.81", + "-4.39" ], "$75-100K_2": [ - "18949961.83", - "1062750.15", - "5.61", - "5544113.12", - "29.26", - "379.76", - "7196494814.11", + "18653492.43", + "1027859.64", + "5.51", + "5494051.00", + "29.45", + "385.23", + "7185961340.84", "3.55", "0.00", - "414675390041.52", - "414675390041.52", - "-1.88" + "391452582549.48", + "391452582549.48", + "-1.90" ], "<$0K_2": [ "35198.19", @@ -168,12 +168,12 @@ TABLE diff_comb_xbin RESULTS: "0.00", "0.00", "0.00", - "522066498.01", - "522066498.01", + "517345152.64", + "517345152.64", "0.00" ], "=$0K_2": [ - "778401.71", + "759542.49", "0.00", "0.00", "0.00", @@ -196,8 +196,8 @@ TABLE diff_comb_xbin RESULTS: "7026995709.06", "3.47", "0.00", - "5489004624.21", - "5489004624.21", + "5455983836.89", + "5455983836.89", "-1.25" ], "ALL_2": [ @@ -210,9 +210,9 @@ TABLE diff_comb_xbin RESULTS: "202498300025.42", "100.00", "0.00", - "3174817061858.27", - "3174817061858.27", - "-3.23" + "3208095128266.24", + "3208095128266.24", + "-3.22" ] } TABLE diff_comb_xdec RESULTS: @@ -232,7 +232,7 @@ TABLE diff_comb_xdec RESULTS: "nan" ], "0-10p_2": [ - "16746819.39", + "16739095.33", "0.00", "0.00", "0.00", @@ -241,8 +241,8 @@ TABLE diff_comb_xdec RESULTS: "0.00", "0.00", "0.00", - "69292875054.40", - "69292875054.40", + "72689857127.46", + "72689857127.46", "0.00" ], "0-10z_2": [ @@ -260,7 +260,7 @@ TABLE diff_comb_xdec RESULTS: "nan" ], "10-20_2": [ - "16745007.12", + "16762741.14", "0.00", "0.00", "0.00", @@ -269,12 +269,12 @@ TABLE diff_comb_xdec RESULTS: "0.00", "0.00", "0.00", - "142587407777.55", - "142587407777.55", + "145297587528.54", + "145297587528.54", "0.00" ], "20-30_2": [ - "16738848.72", + "16732868.23", "0.00", "0.00", "0.00", @@ -283,12 +283,12 @@ TABLE diff_comb_xdec RESULTS: "0.00", "0.00", "0.00", - "190161527801.93", - "190161527801.93", + "179945542399.33", + "179945542399.33", "0.00" ], "30-40_2": [ - "16766623.58", + "16765717.77", "0.00", "0.00", "0.00", @@ -297,121 +297,121 @@ TABLE diff_comb_xdec RESULTS: "0.00", "0.00", "0.00", - "195130965563.98", - "195130965563.98", + "179558944576.07", + "179558944576.07", "0.00" ], "40-50_2": [ - "16739738.92", - "915242.68", - "5.47", + "16739784.06", + "878383.90", + "5.25", "1199.22", "0.01", - "-29.54", - "-494571015.84", - "-0.24", + "-28.19", + "-471857039.92", + "-0.23", "0.00", - "242485896585.62", - "242485896585.62", - "-0.15" + "252142977102.42", + "252142977102.42", + "-0.14" ], "50-60_2": [ - "16754584.60", - "2839206.30", - "16.95", - "2134589.86", - "12.74", - "-7.38", - "-123667813.56", - "-0.06", - "0.00", - "314701643656.09", - "314701643656.09", - "-1.14" + "16763677.48", + "2870197.77", + "17.12", + "2042388.81", + "12.18", + "-12.49", + "-209305306.98", + "-0.10", + "0.00", + "329465219454.11", + "329465219454.11", + "-1.10" ], "60-70_2": [ - "16762218.04", - "803106.33", - "4.79", - "4882912.82", - "29.13", - "396.64", - "6648510321.08", - "3.28", - "0.00", - "377032952099.09", - "377032952099.09", - "-1.86" + "16746153.89", + "791029.84", + "4.72", + "4988470.56", + "29.79", + "411.61", + "6892928377.45", + "3.40", + "0.00", + "353429318501.13", + "353429318501.13", + "-1.92" ], "70-80_2": [ - "16655938.71", - "2677850.90", - "16.08", - "4603006.10", - "27.64", - "646.03", - "10760175662.94", - "5.31", - "0.00", - "435832722911.96", - "435832722911.96", - "-2.38" + "16750960.06", + "2783866.02", + "16.62", + "4747241.53", + "28.34", + "663.00", + "11105904004.85", + "5.48", + "0.00", + "443700774845.87", + "443700774845.87", + "-2.44" ], "80-90_2": [ - "16843561.73", - "2007633.06", - "11.92", - "10708459.48", - "63.58", - "1925.16", - "32426525078.34", - "16.01", - "0.00", - "486669183360.31", - "486669183360.31", - "-4.44" + "16757773.99", + "1919561.73", + "11.45", + "10583249.90", + "63.15", + "1916.72", + "32120015580.15", + "15.86", + "0.00", + "501439546995.33", + "501439546995.33", + "-4.38" ], "90-100_2": [ - "16758993.13", + "16753561.96", "527218.80", "3.15", - "13991886.95", - "83.49", - "9146.21", - "153281327792.45", - "75.70", + "13959504.41", + "83.32", + "9136.00", + "153060614409.87", + "75.59", "0.00", - "720921887047.33", - "720921887047.33", - "-5.58" + "750425359735.99", + "750425359735.99", + "-5.54" ], "90-95_2": [ - "8379167.47", + "8362551.67", "220834.36", "2.64", - "6764026.22", - "80.72", - "5675.22", - "47553634601.62", - "23.48", + "6870384.22", + "82.16", + "5837.96", + "48820265202.60", + "24.11", "0.00", - "333768367987.25", - "333768367987.25", - "-6.05" + "317453475733.64", + "317453475733.64", + "-6.15" ], "95-99_2": [ - "6703952.80", - "185046.35", + "6715358.48", + "185247.16", "2.76", - "5793518.61", - "86.42", - "11440.54", - "76696855469.02", - "37.88", + "5661771.58", + "84.31", + "11221.46", + "75356131787.95", + "37.21", "0.00", - "340328200668.67", - "340328200668.67", - "-6.99" + "380484483353.12", + "380484483353.12", + "-6.81" ], "ALL_2": [ "167512333.91", @@ -423,29 +423,29 @@ TABLE diff_comb_xdec RESULTS: "202498300025.42", "100.00", "0.00", - "3174817061858.27", - "3174817061858.27", - "-3.23" + "3208095128266.24", + "3208095128266.24", + "-3.22" ], "Top 1%_2": [ - "1675872.86", - "121338.10", - "7.24", - "1434342.11", - "85.59", - "17322.82", - "29030837721.81", - "14.34", - "0.00", - "46825318391.41", - "46825318391.41", - "-2.90" + "1675651.80", + "121137.29", + "7.23", + "1427348.61", + "85.18", + "17237.60", + "28884217419.32", + "14.26", + "0.00", + "52487400649.24", + "52487400649.24", + "-2.88" ] } TABLE diff_itax_xbin RESULTS: { "$0-10K_2": [ - "7055397.37", + "7097134.01", "0.00", "0.00", "0.00", @@ -454,12 +454,12 @@ TABLE diff_itax_xbin RESULTS: "0.00", "0.00", "0.00", - "11111298883.82", - "11111298883.82", + "13253906373.26", + "13253906373.26", "0.00" ], "$10-20K_2": [ - "9938119.72", + "10140515.40", "0.00", "0.00", "0.00", @@ -468,26 +468,26 @@ TABLE diff_itax_xbin RESULTS: "0.00", "0.00", "0.00", - "63930310914.46", - "63930310914.46", + "68081416942.16", + "68081416942.16", "0.00" ], "$100-200K_2": [ - "34218575.20", - "3426942.30", - "10.01", - "17126569.55", - "50.05", - "1667.81", - "57070153384.38", - "25.54", - "0.00", - "949404217553.27", - "949404217553.27", - "-3.62" + "34463641.87", + "3430406.52", + "9.95", + "17181705.37", + "49.85", + "1654.86", + "57032471784.27", + "25.53", + "0.00", + "989979381864.86", + "989979381864.86", + "-3.59" ], "$20-30K_2": [ - "16417030.77", + "16513396.06", "0.00", "0.00", "0.00", @@ -496,26 +496,26 @@ TABLE diff_itax_xbin RESULTS: "0.00", "0.00", "0.00", - "143776301950.59", - "143776301950.59", + "147683457154.30", + "147683457154.30", "0.00" ], "$200-500K_2": [ - "14431172.83", + "14396735.39", "328896.75", "2.28", - "12163309.79", - "84.28", - "9009.78", - "130021638264.50", - "58.19", + "12186781.67", + "84.65", + "9037.52", + "130110724613.13", + "58.23", "0.00", - "652155627211.32", - "652155627211.32", - "-6.59" + "657027576977.81", + "657027576977.81", + "-6.58" ], "$30-40K_2": [ - "18183776.35", + "18103103.13", "0.00", "0.00", "0.00", @@ -524,12 +524,12 @@ TABLE diff_itax_xbin RESULTS: "0.00", "0.00", "0.00", - "203328102977.68", - "203328102977.68", + "194254539342.63", + "194254539342.63", "0.00" ], "$40-50K_2": [ - "17202793.42", + "16710572.33", "0.00", "0.00", "0.00", @@ -538,51 +538,51 @@ TABLE diff_itax_xbin RESULTS: "0.00", "0.00", "0.00", - "202248728462.06", - "202248728462.06", + "179286490599.42", + "179286490599.42", "0.00" ], "$50-75K_2": [ - "28789811.39", - "2577414.31", - "8.95", - "2454078.74", - "8.52", - "15.40", - "443482382.43", - "0.20", - "0.00", - "492229829596.06", - "492229829596.06", - "-0.65" + "29117029.96", + "2573950.09", + "8.84", + "2460423.67", + "8.45", + "14.89", + "433621340.85", + "0.19", + "0.00", + "517879839081.99", + "517879839081.99", + "-0.64" ], "$500-1000K_2": [ - "1094620.54", + "1104498.07", "112308.28", - "10.26", + "10.17", "950099.33", - "86.80", - "17621.36", + "86.02", + "17463.77", "19288698600.87", "8.63", "0.00", - "35946183145.27", - "35946183145.27", - "-4.45" + "43222608390.81", + "43222608390.81", + "-4.39" ], "$75-100K_2": [ - "18949961.83", + "18653492.43", "734811.31", - "3.88", - "5872051.96", - "30.99", - "504.91", - "9568115993.35", - "4.28", + "3.94", + "5787099.33", + "31.02", + "510.71", + "9526572286.43", + "4.26", "0.00", - "414675390041.52", - "414675390041.52", - "-1.88" + "391452582549.48", + "391452582549.48", + "-1.90" ], "<$0K_2": [ "35198.19", @@ -594,12 +594,12 @@ TABLE diff_itax_xbin RESULTS: "0.00", "0.00", "0.00", - "522066498.01", - "522066498.01", + "517345152.64", + "517345152.64", "0.00" ], "=$0K_2": [ - "778401.71", + "759542.49", "0.00", "0.00", "0.00", @@ -622,8 +622,8 @@ TABLE diff_itax_xbin RESULTS: "7033979739.99", "3.15", "0.00", - "5489004624.21", - "5489004624.21", + "5455983836.89", + "5455983836.89", "-1.25" ], "ALL_2": [ @@ -636,9 +636,9 @@ TABLE diff_itax_xbin RESULTS: "223426068365.53", "100.00", "0.00", - "3174817061858.27", - "3174817061858.27", - "-3.23" + "3208095128266.24", + "3208095128266.24", + "-3.22" ] } TABLE diff_itax_xdec RESULTS: @@ -658,7 +658,7 @@ TABLE diff_itax_xdec RESULTS: "nan" ], "0-10p_2": [ - "16746819.39", + "16739095.33", "0.00", "0.00", "0.00", @@ -667,8 +667,8 @@ TABLE diff_itax_xdec RESULTS: "0.00", "0.00", "0.00", - "69292875054.40", - "69292875054.40", + "72689857127.46", + "72689857127.46", "0.00" ], "0-10z_2": [ @@ -686,7 +686,7 @@ TABLE diff_itax_xdec RESULTS: "nan" ], "10-20_2": [ - "16745007.12", + "16762741.14", "0.00", "0.00", "0.00", @@ -695,12 +695,12 @@ TABLE diff_itax_xdec RESULTS: "0.00", "0.00", "0.00", - "142587407777.55", - "142587407777.55", + "145297587528.54", + "145297587528.54", "0.00" ], "20-30_2": [ - "16738848.72", + "16732868.23", "0.00", "0.00", "0.00", @@ -709,12 +709,12 @@ TABLE diff_itax_xdec RESULTS: "0.00", "0.00", "0.00", - "190161527801.93", - "190161527801.93", + "179945542399.33", + "179945542399.33", "0.00" ], "30-40_2": [ - "16766623.58", + "16765717.77", "0.00", "0.00", "0.00", @@ -723,121 +723,121 @@ TABLE diff_itax_xdec RESULTS: "0.00", "0.00", "0.00", - "195130965563.98", - "195130965563.98", + "179558944576.07", + "179558944576.07", "0.00" ], "40-50_2": [ - "16739738.92", - "915242.68", - "5.47", + "16739784.06", + "878383.90", + "5.25", "1199.22", "0.01", - "-15.58", - "-260806600.59", - "-0.12", + "-14.78", + "-247374773.68", + "-0.11", "0.00", - "242485896585.62", - "242485896585.62", - "-0.15" + "252142977102.42", + "252142977102.42", + "-0.14" ], "50-60_2": [ - "16754584.60", - "1752458.85", - "10.46", - "3221337.31", - "19.23", - "81.18", - "1360072948.27", - "0.61", - "0.00", - "314701643656.09", - "314701643656.09", - "-1.14" + "16763677.48", + "1783450.32", + "10.64", + "3129136.26", + "18.67", + "74.34", + "1246167203.72", + "0.56", + "0.00", + "329465219454.11", + "329465219454.11", + "-1.10" ], "60-70_2": [ - "16762218.04", - "644524.10", - "3.85", - "5041495.05", - "30.08", - "520.78", - "8729413750.25", - "3.91", - "0.00", - "377032952099.09", - "377032952099.09", - "-1.86" + "16746153.89", + "646927.18", + "3.86", + "5132573.22", + "30.65", + "538.01", + "9009653394.40", + "4.03", + "0.00", + "353429318501.13", + "353429318501.13", + "-1.92" ], "70-80_2": [ - "16655938.71", - "2198256.95", - "13.20", - "5082600.05", - "30.52", - "840.13", - "13993097980.96", - "6.26", - "0.00", - "435832722911.96", - "435832722911.96", - "-2.38" + "16750960.06", + "2269308.54", + "13.55", + "5261799.01", + "31.41", + "864.65", + "14483792666.30", + "6.48", + "0.00", + "443700774845.87", + "443700774845.87", + "-2.44" ], "80-90_2": [ - "16843561.73", - "1210339.27", - "7.19", - "11505753.28", - "68.31", - "2328.81", - "39225486348.10", - "17.56", - "0.00", - "486669183360.31", - "486669183360.31", - "-4.44" + "16757773.99", + "1142751.90", + "6.82", + "11360059.73", + "67.79", + "2316.67", + "38822176568.91", + "17.38", + "0.00", + "501439546995.33", + "501439546995.33", + "-4.38" ], "90-100_2": [ - "16758993.13", + "16753561.96", "466594.40", - "2.78", - "14052511.35", - "83.85", - "9569.72", - "160378803938.53", - "71.78", + "2.79", + "14020128.81", + "83.68", + "9556.87", + "160111653305.88", + "71.66", "0.00", - "720921887047.33", - "720921887047.33", - "-5.58" + "750425359735.99", + "750425359735.99", + "-5.54" ], "90-95_2": [ - "8379167.47", + "8362551.67", "181123.08", - "2.16", - "6803737.50", - "81.20", - "6140.01", - "51448193040.44", - "23.03", + "2.17", + "6910095.49", + "82.63", + "6306.17", + "52735657906.17", + "23.60", "0.00", - "333768367987.25", - "333768367987.25", - "-6.05" + "317453475733.64", + "317453475733.64", + "-6.15" ], "95-99_2": [ - "6703952.80", - "165617.89", + "6715358.48", + "165818.70", "2.47", - "5812947.07", - "86.71", - "11894.07", - "79737304132.81", - "35.69", + "5681200.04", + "84.60", + "11664.22", + "78329388846.23", + "35.06", "0.00", - "340328200668.67", - "340328200668.67", - "-6.99" + "380484483353.12", + "380484483353.12", + "-6.81" ], "ALL_2": [ "167512333.91", @@ -849,29 +849,29 @@ TABLE diff_itax_xdec RESULTS: "223426068365.53", "100.00", "0.00", - "3174817061858.27", - "3174817061858.27", - "-3.23" + "3208095128266.24", + "3208095128266.24", + "-3.22" ], "Top 1%_2": [ - "1675872.86", - "119853.43", - "7.15", - "1435826.78", - "85.68", - "17419.76", - "29193306765.28", - "13.07", - "0.00", - "46825318391.41", - "46825318391.41", - "-2.90" + "1675651.80", + "119652.62", + "7.14", + "1428833.28", + "85.27", + "17334.51", + "29046606553.48", + "13.00", + "0.00", + "52487400649.24", + "52487400649.24", + "-2.88" ] } TABLE diff_ptax_xbin RESULTS: { "$0-10K_2": [ - "7055397.37", + "7097134.01", "0.00", "0.00", "0.00", @@ -880,12 +880,12 @@ TABLE diff_ptax_xbin RESULTS: "0.00", "-0.00", "0.00", - "11111298883.82", - "11111298883.82", + "13253906373.26", + "13253906373.26", "0.00" ], "$10-20K_2": [ - "9938119.72", + "10140515.40", "0.00", "0.00", "0.00", @@ -894,26 +894,26 @@ TABLE diff_ptax_xbin RESULTS: "0.00", "-0.00", "0.00", - "63930310914.46", - "63930310914.46", + "68081416942.16", + "68081416942.16", "0.00" ], "$100-200K_2": [ - "34218575.20", - "18470219.52", - "53.98", + "34463641.87", + "18516874.18", + "53.73", "0.00", "0.00", - "-301.90", - "-10330481555.66", - "49.36", + "-300.29", + "-10349004510.24", + "49.45", "0.00", - "949404217553.27", - "949404217553.27", - "-3.62" + "989979381864.86", + "989979381864.86", + "-3.59" ], "$20-30K_2": [ - "16417030.77", + "16513396.06", "0.00", "0.00", "0.00", @@ -922,26 +922,26 @@ TABLE diff_ptax_xbin RESULTS: "0.00", "-0.00", "0.00", - "143776301950.59", - "143776301950.59", + "147683457154.30", + "147683457154.30", "0.00" ], "$200-500K_2": [ - "14431172.83", - "9709119.52", - "67.28", + "14396735.39", + "9740098.05", + "67.65", "5026.56", "0.03", - "-459.67", - "-6633526959.54", - "31.70", + "-461.47", + "-6643640706.44", + "31.75", "0.00", - "652155627211.32", - "652155627211.32", - "-6.59" + "657027576977.81", + "657027576977.81", + "-6.58" ], "$30-40K_2": [ - "18183776.35", + "18103103.13", "0.00", "0.00", "0.00", @@ -950,12 +950,12 @@ TABLE diff_ptax_xbin RESULTS: "0.00", "-0.00", "0.00", - "203328102977.68", - "203328102977.68", + "194254539342.63", + "194254539342.63", "0.00" ], "$40-50K_2": [ - "17202793.42", + "16710572.33", "0.00", "0.00", "0.00", @@ -964,51 +964,51 @@ TABLE diff_ptax_xbin RESULTS: "0.00", "-0.00", "0.00", - "202248728462.06", - "202248728462.06", + "179286490599.42", + "179286490599.42", "0.00" ], "$50-75K_2": [ - "28789811.39", - "4918255.07", - "17.08", + "29117029.96", + "4920199.77", + "16.90", "0.00", "0.00", - "-50.29", - "-1447744173.73", - "6.92", + "-49.80", + "-1450117705.91", + "6.93", "0.00", - "492229829596.06", - "492229829596.06", - "-0.65" + "517879839081.99", + "517879839081.99", + "-0.64" ], "$500-1000K_2": [ - "1094620.54", + "1104498.07", "181445.04", - "16.58", + "16.43", "1259.63", - "0.12", - "-125.53", + "0.11", + "-124.41", "-137410441.00", "0.66", "0.00", - "35946183145.27", - "35946183145.27", - "-4.45" + "43222608390.81", + "43222608390.81", + "-4.39" ], "$75-100K_2": [ - "18949961.83", - "5962635.57", - "31.47", + "18653492.43", + "5883057.68", + "31.54", "0.00", "0.00", - "-125.15", - "-2371621179.24", - "11.33", + "-125.48", + "-2340610945.59", + "11.18", "0.00", - "414675390041.52", - "414675390041.52", - "-1.88" + "391452582549.48", + "391452582549.48", + "-1.90" ], "<$0K_2": [ "35198.19", @@ -1020,12 +1020,12 @@ TABLE diff_ptax_xbin RESULTS: "0.00", "-0.00", "0.00", - "522066498.01", - "522066498.01", + "517345152.64", + "517345152.64", "0.00" ], "=$0K_2": [ - "778401.71", + "759542.49", "0.00", "0.00", "0.00", @@ -1048,8 +1048,8 @@ TABLE diff_ptax_xbin RESULTS: "-6984030.93", "0.03", "0.00", - "5489004624.21", - "5489004624.21", + "5455983836.89", + "5455983836.89", "-1.25" ], "ALL_2": [ @@ -1062,9 +1062,9 @@ TABLE diff_ptax_xbin RESULTS: "-20927768340.11", "100.00", "0.00", - "3174817061858.27", - "3174817061858.27", - "-3.23" + "3208095128266.24", + "3208095128266.24", + "-3.22" ] } TABLE diff_ptax_xdec RESULTS: @@ -1084,7 +1084,7 @@ TABLE diff_ptax_xdec RESULTS: "nan" ], "0-10p_2": [ - "16746819.39", + "16739095.33", "0.00", "0.00", "0.00", @@ -1093,8 +1093,8 @@ TABLE diff_ptax_xdec RESULTS: "0.00", "-0.00", "0.00", - "69292875054.40", - "69292875054.40", + "72689857127.46", + "72689857127.46", "0.00" ], "0-10z_2": [ @@ -1112,7 +1112,7 @@ TABLE diff_ptax_xdec RESULTS: "nan" ], "10-20_2": [ - "16745007.12", + "16762741.14", "0.00", "0.00", "0.00", @@ -1121,12 +1121,12 @@ TABLE diff_ptax_xdec RESULTS: "0.00", "-0.00", "0.00", - "142587407777.55", - "142587407777.55", + "145297587528.54", + "145297587528.54", "0.00" ], "20-30_2": [ - "16738848.72", + "16732868.23", "0.00", "0.00", "0.00", @@ -1135,12 +1135,12 @@ TABLE diff_ptax_xdec RESULTS: "0.00", "-0.00", "0.00", - "190161527801.93", - "190161527801.93", + "179945542399.33", + "179945542399.33", "0.00" ], "30-40_2": [ - "16766623.58", + "16765717.77", "0.00", "0.00", "0.00", @@ -1149,121 +1149,121 @@ TABLE diff_ptax_xdec RESULTS: "0.00", "-0.00", "0.00", - "195130965563.98", - "195130965563.98", + "179558944576.07", + "179558944576.07", "0.00" ], "40-50_2": [ - "16739738.92", - "896936.10", - "5.36", + "16739784.06", + "860077.32", + "5.14", "0.00", "0.00", - "-13.96", - "-233764415.25", - "1.12", + "-13.41", + "-224482266.24", + "1.07", "0.00", - "242485896585.62", - "242485896585.62", - "-0.15" + "252142977102.42", + "252142977102.42", + "-0.14" ], "50-60_2": [ - "16754584.60", - "4773720.25", - "28.49", + "16763677.48", + "4716557.75", + "28.14", "0.00", "0.00", - "-88.56", - "-1483740761.83", - "7.09", + "-86.82", + "-1455472510.69", + "6.95", "0.00", - "314701643656.09", - "314701643656.09", - "-1.14" + "329465219454.11", + "329465219454.11", + "-1.10" ], "60-70_2": [ - "16762218.04", - "5170677.36", - "30.85", + "16746153.89", + "5237327.06", + "31.27", "0.00", "0.00", - "-124.14", - "-2080903429.17", - "9.94", + "-126.40", + "-2116725016.95", + "10.11", "0.00", - "377032952099.09", - "377032952099.09", - "-1.86" + "353429318501.13", + "353429318501.13", + "-1.92" ], "70-80_2": [ - "16655938.71", - "6454427.16", - "38.75", + "16750960.06", + "6784165.98", + "40.50", "0.00", "0.00", - "-194.10", - "-3232922318.02", - "15.45", + "-201.65", + "-3377888661.46", + "16.14", "0.00", - "435832722911.96", - "435832722911.96", - "-2.38" + "443700774845.87", + "443700774845.87", + "-2.44" ], "80-90_2": [ - "16843561.73", - "11583044.59", - "68.77", + "16757773.99", + "11301798.58", + "67.44", "0.00", "0.00", - "-403.65", - "-6798961269.76", - "32.49", + "-399.94", + "-6702160988.77", + "32.03", "0.00", - "486669183360.31", - "486669183360.31", - "-4.44" + "501439546995.33", + "501439546995.33", + "-4.38" ], "90-100_2": [ - "16758993.13", - "10388223.46", - "61.99", + "16753561.96", + "10367102.22", + "61.88", "10207.13", "0.06", - "-423.50", - "-7097476146.08", - "33.91", + "-420.87", + "-7051038896.01", + "33.69", "0.00", - "720921887047.33", - "720921887047.33", - "-5.58" + "750425359735.99", + "750425359735.99", + "-5.54" ], "90-95_2": [ - "8379167.47", - "5727642.61", - "68.36", + "8362551.67", + "5785213.70", + "69.18", "0.00", "0.00", - "-464.79", - "-3894558438.82", - "18.61", + "-468.21", + "-3915392703.57", + "18.71", "0.00", - "333768367987.25", - "333768367987.25", - "-6.05" + "317453475733.64", + "317453475733.64", + "-6.15" ], "95-99_2": [ - "6703952.80", - "4423702.26", - "65.99", + "6715358.48", + "4348985.97", + "64.76", "4028.15", "0.06", - "-453.53", - "-3040448663.78", - "14.53", + "-442.75", + "-2973257058.27", + "14.21", "0.00", - "340328200668.67", - "340328200668.67", - "-6.99" + "380484483353.12", + "380484483353.12", + "-6.81" ], "ALL_2": [ "167512333.91", @@ -1275,286 +1275,286 @@ TABLE diff_ptax_xdec RESULTS: "-20927768340.11", "100.00", "0.00", - "3174817061858.27", - "3174817061858.27", - "-3.23" + "3208095128266.24", + "3208095128266.24", + "-3.22" ], "Top 1%_2": [ - "1675872.86", - "236878.59", - "14.13", + "1675651.80", + "232902.55", + "13.90", "6178.98", "0.37", - "-96.95", - "-162469043.48", + "-96.91", + "-162389134.16", "0.78", "0.00", - "46825318391.41", - "46825318391.41", - "-2.90" + "52487400649.24", + "52487400649.24", + "-2.88" ] } TABLE dist1_xbin RESULTS: { "$0-10K_2": [ - "7055397.37", - "20330884086.67", - "7024719.23", - "70349642730.41", + "7097134.01", + "19721827596.25", + "7066455.87", + "70657109237.42", "30678.14", "133578206.96", "0.00", - "1064980454.11", - "69796681.62", - "20204767732.07", + "1070032194.50", + "68924236.32", + "19595711241.65", "0.00", "0.00", - "69796681.62", + "68924236.32", "0.00", "0.00", - "960922371.76", - "-891125690.14", - "2757051807.30", - "1865926117.16", + "959281423.18", + "-890357186.86", + "2650035209.87", + "1759678023.02", "0.00", - "11111298883.82", - "11111298883.82", - "31829322140.71", - "29963396023.55" + "13253906373.26", + "13253906373.26", + "33260775494.61", + "31501097471.60" ], "$10-20K_2": [ - "9938119.72", - "88457896971.53", - "9851326.27", - "138334770020.31", + "10140515.40", + "87466397928.89", + "10053721.95", + "141703801944.68", "86793.45", "1485396246.95", "0.00", - "9793265966.17", - "904020498.26", - "87198357434.09", + "9299474405.47", + "845182197.45", + "86206858391.44", "9710.91", "2350517.06", - "906371015.32", - "144648184.64", + "847532714.51", + "140887038.34", "0.00", - "6511002282.15", - "-5749279451.46", - "12634546406.24", - "6885266954.77", + "6698506263.00", + "-5991860586.84", + "12449069530.33", + "6457208943.49", "0.00", - "63930310914.46", - "63930310914.46", - "156243046855.91", - "149357779901.14" + "68081416942.16", + "68081416942.16", + "159179976988.79", + "152722768045.30" ], "$100-200K_2": [ - "34218575.20", - "3630348711326.80", - "21925030.61", - "503270486669.38", - "12293544.60", - "353209699837.60", - "0.00", - "2798982120855.16", - "403793580673.18", - "3389511450675.16", + "34463641.87", + "3629796665932.77", + "22113584.33", + "505346766346.38", + "12350057.54", + "354242161474.49", + "0.00", + "2798658620328.64", + "403757799748.30", + "3388252688158.25", "105379.83", "87561246.42", - "403881141919.60", - "34171726865.08", + "403845360994.72", + "34153159784.03", "0.00", - "3166556038.15", - "366542859016.37", - "435759347923.31", - "802302206939.68", + "2927695695.30", + "366764505515.39", + "435837369817.26", + "802601875332.65", "0.00", - "949404217553.27", - "949404217553.27", - "4721469939304.14", - "3919167732364.46" + "989979381864.86", + "989979381864.86", + "4762817235267.07", + "3960215359934.42" ], "$20-30K_2": [ - "16417030.77", - "249987975517.40", - "15934114.00", - "234557338087.09", + "16513396.06", + "246862738376.90", + "16030479.28", + "238255931411.90", "482916.77", "8092527685.16", "0.00", - "83276293671.31", - "8248442102.39", - "243193655007.61", + "80870714349.97", + "8039725795.50", + "240068417867.10", "55781.40", "163566254.06", - "8412008356.45", - "1106904688.68", + "8203292049.56", + "1023393869.46", "0.00", - "12845282666.26", - "-5540178998.49", - "36515875450.97", - "30975696452.48", + "12334713666.39", + "-5154815486.29", + "36217773251.15", + "31062957764.86", "0.00", - "143776301950.59", - "143776301950.59", - "412320746113.31", - "381345049660.84" + "147683457154.30", + "147683457154.30", + "413028419021.02", + "381965461256.15" ], "$200-500K_2": [ - "14431172.83", - "3194546113090.69", - "6351410.91", - "155529694073.74", - "8079761.92", - "268035774817.28", - "0.00", - "2770671213673.22", - "511267175360.72", - "3009570128660.99", + "14396735.39", + "3198966459801.37", + "6315551.87", + "154573617594.08", + "8081183.52", + "268075716837.55", + "0.00", + "2775225570030.50", + "511910292598.08", + "3013964233821.60", "116987.99", "391948003.33", - "511659123364.05", - "14432935177.32", + "512302240601.41", + "14543622630.78", "1737079430.38", - "716455658.46", - "498246811958.65", - "319625655043.53", - "817872467002.18", + "709173457.66", + "498786523943.35", + "320530302654.16", + "819316826597.51", "0.00", - "652155627211.32", - "652155627211.32", - "4010374780005.19", - "3192502313003.02" + "657027576977.81", + "657027576977.81", + "4020270948293.09", + "3200954121695.58" ], "$30-40K_2": [ - "18183776.35", - "397913395702.29", - "17595129.23", - "276430585893.48", - "588647.11", - "10143978216.69", - "0.00", - "179518970521.40", - "18872580580.91", - "389861776733.67", + "18103103.13", + "405122689022.49", + "17524451.38", + "273990784240.66", + "578651.75", + "10094772003.17", + "0.00", + "182702197855.53", + "19165383821.91", + "397112409674.84", "45967.92", "66025987.55", - "18938606568.46", - "3639617799.55", + "19231409809.46", + "3856954426.62", "0.00", - "16674007176.47", - "-1375018407.56", - "57768439302.55", - "56393420894.99", + "17456358870.37", + "-2081903487.53", + "58711213904.32", + "56629310416.78", "0.00", - "203328102977.68", - "203328102977.68", - "634024077460.83", - "577630656565.84" + "194254539342.63", + "194254539342.63", + "633490439350.25", + "576861128933.47" ], "$40-50K_2": [ - "17202793.42", - "532708072126.86", - "16085272.23", - "266393718884.21", - "1117521.19", - "19681823936.15", - "0.00", - "291380366271.65", - "31271923348.99", - "517792801852.05", - "18236.54", - "28071698.38", - "31299995047.37", - "6824974304.46", - "0.00", - "12844662317.66", - "11630358425.25", - "76090328449.39", - "87720686874.64", - "0.00", - "202248728462.06", - "202248728462.06", - "775250995131.65", - "687530308257.00" + "16710572.33", + "534353346575.01", + "15467047.95", + "259946497778.35", + "1243524.38", + "24953800607.34", + "0.00", + "288656233280.67", + "30986692148.53", + "514596083775.49", + "48846.98", + "27489458.86", + "31014181607.39", + "6752853282.05", + "0.00", + "13946762136.43", + "10314566188.92", + "76311377319.95", + "86625943508.87", + "0.00", + "179286490599.42", + "179286490599.42", + "753879345399.52", + "667253401890.65" ], "$50-75K_2": [ - "28789811.39", - "1202374167616.45", - "25186382.90", - "474626666537.36", - "3603428.49", - "70386224779.63", - "0.00", - "735425652643.65", - "84318331639.38", - "1150050158663.00", - "97791.53", - "153973308.45", - "84472304947.84", - "15872081383.34", - "0.00", - "19260969835.67", - "49339253728.82", - "162751782529.10", - "212091036257.92", - "0.00", - "492229829596.06", - "492229829596.06", - "1762147111193.28", - "1550056074935.36" + "29117029.96", + "1197216760568.01", + "25646609.46", + "479881281262.34", + "3470420.51", + "64927028147.12", + "0.00", + "736196479620.58", + "84322258057.27", + "1149851258926.53", + "67181.10", + "154555547.97", + "84476813605.24", + "15863419421.26", + "0.00", + "17428501623.59", + "51184892560.39", + "161698773470.58", + "212883666030.96", + "0.00", + "517879839081.99", + "517879839081.99", + "1782495225006.36", + "1569611558975.40" ], "$500-1000K_2": [ - "1094620.54", - "662624899858.65", - "287423.99", - "7288585650.61", + "1104498.07", + "662731894446.77", + "297301.52", + "7535344620.01", "807196.55", "32411352139.87", "0.00", - "619754254596.95", - "152173714697.40", - "638653236081.76", + "619765671630.34", + "152174856400.74", + "638760230669.87", "12044.29", "68668093.02", - "152242382790.42", - "37931737.63", + "152243524493.76", + "39073440.97", "1798278753.84", - "133767850.74", - "153868961955.89", - "36390209426.50", - "190259171382.40", + "152227263.65", + "153850502542.98", + "36406474895.67", + "190256977438.65", "0.00", - "35946183145.27", - "35946183145.27", - "721610596319.24", - "531351424936.85" + "43222608390.81", + "43222608390.81", + "729002148887.47", + "538745171448.82" ], "$75-100K_2": [ - "18949961.83", - "1183770533741.70", - "14985520.25", - "307374219989.16", - "3964441.58", - "88888258813.23", - "0.00", - "820858192981.03", - "106253392750.93", - "1121747674695.70", + "18653492.43", + "1180823869790.60", + "14729985.24", + "302500143135.88", + "3923507.19", + "88052281330.90", + "0.00", + "818280317938.46", + "105901843329.69", + "1119376115009.32", "52690.91", "282936969.27", - "106536329720.20", - "13765386316.12", + "106184780298.97", + "13622842563.30", "0.00", - "4420936718.27", - "88350006685.81", - "149484178613.41", - "237834185299.23", + "4921342516.02", + "87640595219.64", + "148965024899.00", + "236605620118.64", "0.00", - "414675390041.52", - "414675390041.52", - "1642644508238.49", - "1404810322939.26" + "391452582549.48", + "391452582549.48", + "1613806417595.23", + "1377200797476.59" ], "<$0K_2": [ "35198.19", @@ -1577,16 +1577,16 @@ TABLE dist1_xbin RESULTS: "19264377.37", "18002758.83", "0.00", - "522066498.01", - "522066498.01", - "-3844938564.95", - "-3862941323.79" + "517345152.64", + "517345152.64", + "-3849659910.32", + "-3867662669.15" ], "=$0K_2": [ - "778401.71", + "759542.49", "0.00", - "778401.71", - "12767442158.18", + "759542.49", + "12531873122.23", "0.00", "0.00", "0.00", @@ -1629,10 +1629,10 @@ TABLE dist1_xbin RESULTS: "29034472983.31", "297429402938.04", "0.00", - "5489004624.21", - "5489004624.21", - "892958114462.39", - "595528711524.35" + "5455983836.89", + "5455983836.89", + "892925093675.08", + "595495690737.03" ], "ALL_2": [ "167512333.91", @@ -1655,10 +1655,10 @@ TABLE dist1_xbin RESULTS: "1318831152312.98", "2741647469872.31", "0.00", - "3174817061858.27", - "3174817061858.27", - "15757028298660.20", - "13015380828787.88" + "3208095128266.24", + "3208095128266.24", + "15790306365068.16", + "13048658895195.85" ] } TABLE dist1_xdec RESULTS: @@ -1690,30 +1690,30 @@ TABLE dist1_xdec RESULTS: "0.00" ], "0-10p_2": [ - "16746819.39", - "90653744797.08", - "16641781.76", - "207381754058.08", + "16739095.33", + "87358750202.08", + "16634057.71", + "207202466940.08", "105037.63", "1210177607.42", "0.00", - "7640227736.96", - "657961029.44", - "89605300222.71", + "7316089698.02", + "615040821.79", + "86310305627.71", "9710.91", "2350517.06", - "660311546.50", - "100539223.46", + "617391338.85", + "90663454.93", "0.00", - "6801800675.72", - "-6242028352.68", - "13393433672.59", - "7151405319.91", + "6388531196.65", + "-5861803312.73", + "12855301922.52", + "6993498609.78", "0.00", - "69292875054.40", - "69292875054.40", - "163422937263.13", - "156271531943.23" + "72689857127.46", + "72689857127.46", + "163287964939.11", + "156294466329.33" ], "0-10z_2": [ "0.00", @@ -1742,290 +1742,290 @@ TABLE dist1_xdec RESULTS: "0.00" ], "10-20_2": [ - "16745007.12", - "250022054689.31", - "16275132.38", - "237791595803.60", - "469874.74", - "8072933367.15", - "0.00", - "82473180259.41", - "8174920842.91", - "243224141166.50", + "16762741.14", + "244351674337.14", + "16341767.15", + "241905849835.70", + "420973.99", + "7221378791.69", + "0.00", + "77118389108.27", + "7632589395.82", + "238242190162.20", "55781.40", "163566254.06", - "8338487096.97", - "1043040698.70", + "7796155649.88", + "981224195.02", "0.00", - "11923221853.41", - "-4627775455.14", - "36621249303.51", - "31993473848.38", + "12576890783.78", + "-5761959328.92", + "35764227334.72", + "30002268005.80", "0.00", - "142587407777.55", - "142587407777.55", - "411329759246.16", - "379336285397.79" + "145297587528.54", + "145297587528.54", + "407437062003.84", + "377434793998.04" ], "20-30_2": [ - "16738848.72", - "351104414835.87", - "16197877.24", - "255965132036.40", - "540971.47", - "8978596977.78", - "0.00", - "152914265051.08", - "15932976647.90", - "343967178845.48", + "16732868.23", + "358543384080.27", + "16152991.37", + "252891850991.76", + "579876.86", + "9780945339.72", + "0.00", + "157957404925.07", + "16472587736.63", + "350759058362.97", "45967.92", "66025987.55", - "15999002635.45", - "3246603236.24", + "16538613724.18", + "3322783205.86", "0.00", - "16374509100.89", - "-3622109701.68", - "50694165538.83", - "47072055837.15", + "16611491459.43", + "-3395660941.10", + "51839875790.22", + "48444214849.11", "0.00", - "190161527801.93", - "190161527801.93", - "570200919302.15", - "523128863465.00" + "179945542399.33", + "179945542399.33", + "569174772553.15", + "520730557704.03" ], "30-40_2": [ - "16766623.58", - "498505710077.98", - "15765887.57", - "258408356133.54", - "1000736.00", - "17700274038.97", - "0.00", - "267210159564.27", - "28614058201.00", - "485001484086.80", - "8189.40", - "18749412.85", - "28632807613.84", - "5632970811.19", - "0.00", - "12396774551.87", - "10603062250.78", - "71960951524.27", - "82564013775.05", - "0.00", - "195130965563.98", - "195130965563.98", - "732237506149.41", - "649673492374.36" + "16765717.77", + "514510018861.81", + "15638496.30", + "259878408912.53", + "1127221.48", + "22982518930.88", + "0.00", + "272466379772.32", + "29189293575.22", + "496157193581.79", + "48846.98", + "27489458.86", + "29216783034.08", + "5963457306.64", + "0.00", + "13566274404.24", + "9687051323.20", + "74353133584.08", + "84040184907.28", + "0.00", + "179558944576.07", + "179558944576.07", + "732964837476.21", + "648924652568.93" ], "40-50_2": [ - "16739738.92", - "626240834604.34", - "14845988.09", - "265476314620.37", - "1893750.83", - "34965345751.90", - "0.00", - "367724360661.32", - "40345903230.81", - "599925218443.12", - "86455.56", - "99559312.94", - "40445462543.76", - "8847787497.37", - "0.00", - "12795778590.37", - "18801896456.02", - "85761225270.83", - "104563121726.85", - "0.00", - "242485896585.62", - "242485896585.62", - "906037190200.70", - "801474068473.85" + "16739784.06", + "616646206928.94", + "14984524.16", + "267779326407.46", + "1755259.90", + "32810842369.80", + "0.00", + "361343738217.21", + "39587330884.83", + "591977617065.59", + "45797.98", + "90819266.93", + "39678150151.76", + "8593480208.50", + "0.00", + "12612169307.30", + "18472500635.95", + "83926275382.05", + "102398776018.01", + "0.00", + "252142977102.42", + "252142977102.42", + "905808395118.79", + "803409619100.78" ], "50-60_2": [ - "16754584.60", - "785865670750.93", - "14484264.37", - "281918800714.10", - "2270320.23", - "46018671065.78", - "0.00", - "501720829221.29", - "60094340103.93", - "752506542670.25", + "16763677.48", + "775850598974.37", + "14553818.68", + "282057120564.36", + "2209858.80", + "41529564298.85", + "0.00", + "496920516501.13", + "59356615011.06", + "746545030899.23", "34581.16", "114309631.53", - "60208649735.46", - "10305655781.87", + "59470924642.60", + "10230495506.96", "0.00", - "9381517625.10", - "40521476328.49", - "105938538089.90", - "146460014418.39", + "8629738196.13", + "40610690939.50", + "104261054160.19", + "144871745099.69", "0.00", - "314701643656.09", - "314701643656.09", - "1143632004062.87", - "997171989644.48" + "329465219454.11", + "329465219454.11", + "1146898357703.17", + "1002026612603.49" ], "60-70_2": [ - "16762218.04", - "1059736158817.05", - "13202736.75", - "273451640996.12", - "3559481.28", - "81230093007.63", - "0.00", - "734553121103.11", - "95072520040.08", - "1002795987349.75", + "16746153.89", + "1080923747780.87", + "13079874.49", + "270300406451.88", + "3666279.40", + "83381829552.62", + "0.00", + "751745616491.22", + "97425040518.81", + "1022573387720.19", "39492.88", "232363618.78", - "95304883658.86", - "12084240847.37", + "97657404137.59", + "12452180881.02", "0.00", - "3842771296.60", - "79377871514.90", - "132615664885.52", - "211993536400.41", + "3454766987.72", + "81750456268.85", + "135661957342.96", + "217412413611.82", "0.00", - "377032952099.09", - "377032952099.09", - "1474096044731.79", - "1262102508331.37" + "353429318501.13", + "353429318501.13", + "1471734722910.98", + "1254322309299.16" ], "70-80_2": [ - "16655938.71", - "1425884885163.13", - "11583820.94", - "256546510183.29", - "5072117.76", - "142246637621.33", - "0.00", - "1051232429978.87", - "140047936158.19", - "1325347552748.50", - "34949.26", - "57101866.86", - "140105038025.05", - "14124777934.83", - "0.00", - "2373395954.34", - "123606864135.88", - "173347180901.80", - "296954045037.68", - "0.00", - "435832722911.96", - "435832722911.96", - "1904016005847.10", - "1607061960809.42" + "16750960.06", + "1437402197441.03", + "11650560.93", + "257462269161.61", + "5100399.13", + "142299413054.03", + "0.00", + "1062870280511.28", + "142304984492.11", + "1337052567504.72", + "44039.81", + "61524765.82", + "142366509257.94", + "13699542682.18", + "0.00", + "1988385417.86", + "126678581157.89", + "175688611232.63", + "302367192390.52", + "0.00", + "443700774845.87", + "443700774845.87", + "1924995336243.46", + "1622628143852.94" ], "80-90_2": [ - "16843561.73", - "2086961406034.32", - "9881122.84", - "236132565684.94", - "6962438.89", - "202679566798.69", - "0.00", - "1648590665878.60", - "247088759041.30", - "1952211014367.54", - "63640.54", - "27283593.65", - "247116042634.95", - "18857040152.05", - "0.00", - "686380386.15", - "227572622096.75", - "248906261416.01", - "476478883512.76", - "0.00", - "486669183360.31", - "486669183360.31", - "2665659719288.15", - "2189180835775.39" + "16757773.99", + "2067787680199.17", + "9805756.65", + "233198547536.58", + "6952017.34", + "203218849333.91", + "0.00", + "1633198583059.67", + "244566453833.31", + "1932483427432.11", + "54549.98", + "22860694.69", + "244589314528.00", + "18906825790.78", + "0.00", + "736725069.21", + "224945763668.01", + "245636423969.17", + "470582187637.18", + "0.00", + "501439546995.33", + "501439546995.33", + "2660418996778.33", + "2189836809141.15" ], "90-100_2": [ - "16758993.13", - "4850697671309.07", - "7189168.77", - "175213993986.76", - "9569824.36", - "329984359414.08", - "0.00", - "4338307444284.03", - "943023492737.72", - "4619243029868.87", + "16753561.96", + "4842298292273.41", + "7225933.28", + "175610417415.26", + "9527628.68", + "328651136371.81", + "0.00", + "4331429685454.74", + "941902931763.69", + "4611726671412.99", "164521.23", "893750224.16", - "943917242961.88", - "15760747607.47", + "942796681987.85", + "15762750558.65", "9627617431.28", - "959674499.68", - "936824438286.02", - "399592481709.73", - "1336416919995.74", + "970851711.79", + "935690697148.69", + "398844291594.43", + "1334534988743.12", "0.00", - "720921887047.33", - "720921887047.33", - "5786396212568.73", - "4449979292572.99" + "750425359735.99", + "750425359735.99", + "5807585919341.13", + "4473050930598.01" ], "90-95_2": [ - "8379167.47", - "1469225832604.06", - "4203917.09", - "102061234316.46", - "4175250.37", - "132980457950.08", - "0.00", - "1235688564254.39", - "211795570547.53", - "1378915639277.25", - "56867.76", - "69742933.82", - "211865313481.36", - "8311302972.45", - "56678868.64", - "674651048.78", - "202936038328.77", - "162037251033.11", - "364973289361.87", - "0.00", - "333768367987.25", - "333768367987.25", - "1867595885975.42", - "1502622596613.54" + "8362551.67", + "1491727537452.35", + "4123515.71", + "100329661029.97", + "4239035.96", + "134700371825.21", + "0.00", + "1258078587799.70", + "216705178453.49", + "1400323554737.68", + "57348.38", + "70318987.52", + "216775497441.01", + "8418223490.44", + "63825145.67", + "330724460.38", + "208090374635.86", + "163992755242.52", + "372083129878.37", + "0.00", + "317453475733.64", + "317453475733.64", + "1875079048128.40", + "1502995918250.03" ], "95-99_2": [ - "6703952.80", - "1781403582759.28", - "2619894.78", - "64090027335.12", - "4084058.02", - "139914394935.23", - "0.00", - "1576798396444.13", - "303463681963.26", - "1683686311523.12", - "62616.91", - "316715389.07", - "303780397352.33", - "7348389597.46", - "1507434794.47", - "132796187.25", - "297806646362.09", - "167053743745.27", - "464860390107.35", - "0.00", - "340328200668.67", - "340328200668.67", - "2225692525612.39", - "1760832135505.03" + "6715358.48", + "1753555139412.02", + "2733305.69", + "66124750735.29", + "3982052.79", + "136927325910.57", + "0.00", + "1550305725839.91", + "298018863007.16", + "1657789997249.86", + "62136.29", + "316139335.37", + "298335002342.53", + "7236340223.84", + "1500353942.14", + "487899987.77", + "292111116073.06", + "164606722410.50", + "456717838483.56", + "0.00", + "380484483353.12", + "380484483353.12", + "2236837529239.95", + "1780119690756.39" ], "ALL_2": [ "167512333.91", @@ -2048,299 +2048,299 @@ TABLE dist1_xdec RESULTS: "1318831152312.98", "2741647469872.31", "0.00", - "3174817061858.27", - "3174817061858.27", - "15757028298660.20", - "13015380828787.88" + "3208095128266.24", + "3208095128266.24", + "15790306365068.16", + "13048658895195.85" ], "Top 1%_2": [ - "1675872.86", - "1600068255945.73", - "365356.89", - "9062732335.19", - "1310515.96", - "57089506528.77", - "0.00", - "1525820483585.50", - "427764240226.92", - "1556641079068.50", + "1675651.80", + "1597015615409.04", + "369111.88", + "9156005650.00", + "1306539.92", + "57023438636.04", + "0.00", + "1523045371815.13", + "427178890303.04", + "1553613119425.45", "45036.56", "507291901.27", - "428271532128.20", - "101055037.56", - "8063503768.17", + "427686182204.31", + "108186844.37", + "8063438343.47", "152227263.65", - "436081753595.17", - "70501486931.35", - "506583240526.52", - "0.00", - "46825318391.41", - "46825318391.41", - "1693107800980.93", - "1186524560454.41" + "435489206439.77", + "70244813941.42", + "505734020381.18", + "0.00", + "52487400649.24", + "52487400649.24", + "1695669341972.78", + "1189935321591.60" ] } TABLE dist2_xbin RESULTS: { "$0-10K_2": [ - "7055397.37", - "20330884086.67", - "7024719.23", - "70349642730.41", + "7097134.01", + "19721827596.25", + "7066455.87", + "70657109237.42", "30678.14", "133578206.96", "0.00", - "1064980454.11", - "69796681.62", - "20204767732.07", + "1070032194.50", + "68924236.32", + "19595711241.65", "0.00", "0.00", - "69796681.62", + "68924236.32", "0.00", "0.00", - "960922371.76", - "-891125690.14", - "2757051807.30", - "1865926117.16", + "959281423.18", + "-890357186.86", + "2650035209.87", + "1759678023.02", "0.00", - "11111298883.82", - "11111298883.82", - "31829322140.71", - "29963396023.55" + "13253906373.26", + "13253906373.26", + "33260775494.61", + "31501097471.60" ], "$10-20K_2": [ - "9938119.72", - "88457896971.53", - "9851326.27", - "138334770020.31", + "10140515.40", + "87466397928.89", + "10053721.95", + "141703801944.68", "86793.45", "1485396246.95", "0.00", - "9793265966.17", - "904020498.26", - "87198357434.09", + "9299474405.47", + "845182197.45", + "86206858391.44", "9710.91", "2350517.06", - "906371015.32", - "144648184.64", + "847532714.51", + "140887038.34", "0.00", - "6511002282.15", - "-5749279451.46", - "12634546406.24", - "6885266954.77", + "6698506263.00", + "-5991860586.84", + "12449069530.33", + "6457208943.49", "0.00", - "63930310914.46", - "63930310914.46", - "156243046855.91", - "149357779901.14" + "68081416942.16", + "68081416942.16", + "159179976988.79", + "152722768045.30" ], "$100-200K_2": [ - "34218575.20", - "3539875765720.45", - "22534270.88", - "515907150696.32", - "11684304.33", - "331465203334.74", - "0.00", - "2717614203388.42", - "460924765686.97", - "3315769945326.96", + "34463641.87", + "3539234943722.64", + "22722824.60", + "517983430373.32", + "11740817.27", + "332464993721.89", + "0.00", + "2717234597507.86", + "460851303161.97", + "3314455077456.01", "2493.36", "20833275.90", - "460945598962.87", - "34165072321.78", + "460872136437.87", + "34146505240.73", "0.00", - "3167514240.33", - "423613012400.76", - "425428866367.64", - "849041878768.40", + "2928653897.48", + "423796977299.66", + "425488365307.02", + "849285342606.68", "0.00", - "949404217553.27", - "949404217553.27", - "4626253924564.01", - "3777212045795.61" + "989979381864.86", + "989979381864.86", + "4667503182445.86", + "3818217839839.18" ], "$20-30K_2": [ - "16417030.77", - "249987975517.40", - "15934114.00", - "234557338087.09", + "16513396.06", + "246862738376.90", + "16030479.28", + "238255931411.90", "482916.77", "8092527685.16", "0.00", - "83276293671.31", - "8248442102.39", - "243193655007.61", + "80870714349.97", + "8039725795.50", + "240068417867.10", "55781.40", "163566254.06", - "8412008356.45", - "1106904688.68", + "8203292049.56", + "1023393869.46", "0.00", - "12845282666.26", - "-5540178998.49", - "36515875450.97", - "30975696452.48", + "12334713666.39", + "-5154815486.29", + "36217773251.15", + "31062957764.86", "0.00", - "143776301950.59", - "143776301950.59", - "412320746113.31", - "381345049660.84" + "147683457154.30", + "147683457154.30", + "413028419021.02", + "381965461256.15" ], "$200-500K_2": [ - "14431172.83", - "3110852278512.08", - "6756694.16", - "166185635301.45", - "7674478.67", - "250491632942.25", + "14396735.39", + "3115161472107.08", + "6720835.12", + "165229558821.79", + "7675900.27", + "250531854314.85", "0.00", - "2692882523743.60", - "642045462536.52", - "2939190202205.89", + "2697325447632.87", + "642777666122.51", + "2943472874898.50", "0.00", "0.00", - "642045462536.52", - "14472205732.62", + "642777666122.51", + "14582893186.08", "1411649077.71", - "716455658.46", - "628268450223.15", - "312992128083.99", - "941260578307.14", + "709173457.66", + "628897248556.48", + "313886661947.72", + "942783910504.20", "0.00", - "652155627211.32", - "652155627211.32", - "3923456075011.19", - "2982195496704.05" + "657027576977.81", + "657027576977.81", + "3933236033309.95", + "2990452122805.75" ], "$30-40K_2": [ - "18183776.35", - "397913395702.29", - "17595129.23", - "276430585893.48", - "588647.11", - "10143978216.69", - "0.00", - "179518970521.40", - "18872580580.91", - "389861776733.67", + "18103103.13", + "405122689022.49", + "17524451.38", + "273990784240.66", + "578651.75", + "10094772003.17", + "0.00", + "182702197855.53", + "19165383821.91", + "397112409674.84", "45967.92", "66025987.55", - "18938606568.46", - "3639617799.55", + "19231409809.46", + "3856954426.62", "0.00", - "16674007176.47", - "-1375018407.56", - "57768439302.55", - "56393420894.99", + "17456358870.37", + "-2081903487.53", + "58711213904.32", + "56629310416.78", "0.00", - "203328102977.68", - "203328102977.68", - "634024077460.83", - "577630656565.84" + "194254539342.63", + "194254539342.63", + "633490439350.25", + "576861128933.47" ], "$40-50K_2": [ - "17202793.42", - "532708072126.86", - "16085272.23", - "266393718884.21", - "1117521.19", - "19681823936.15", - "0.00", - "291380366271.65", - "31271923348.99", - "517792801852.05", - "18236.54", - "28071698.38", - "31299995047.37", - "6824974304.46", - "0.00", - "12844662317.66", - "11630358425.25", - "76090328449.39", - "87720686874.64", - "0.00", - "202248728462.06", - "202248728462.06", - "775250995131.65", - "687530308257.00" + "16710572.33", + "534353346575.01", + "15467047.95", + "259946497778.35", + "1243524.38", + "24953800607.34", + "0.00", + "288656233280.67", + "30986692148.53", + "514596083775.49", + "48846.98", + "27489458.86", + "31014181607.39", + "6752853282.05", + "0.00", + "13946762136.43", + "10314566188.92", + "76311377319.95", + "86625943508.87", + "0.00", + "179286490599.42", + "179286490599.42", + "753879345399.52", + "667253401890.65" ], "$50-75K_2": [ - "28789811.39", - "1191660138275.40", - "25317461.45", - "476263958195.03", - "3472349.94", - "68025868674.23", - "0.00", - "725434687750.33", - "84814140853.90", - "1140994680893.94", - "97791.53", - "101646476.37", - "84915787330.27", - "15858766427.24", - "0.00", - "19274284791.78", - "49782736111.25", - "161304038355.37", - "211086774466.62", - "0.00", - "492229829596.06", - "492229829596.06", - "1751116381259.82", - "1540029606793.21" + "29117029.96", + "1186501562211.06", + "25777688.01", + "481518572920.01", + "3339341.96", + "62566672041.73", + "0.00", + "726204345711.36", + "84808206230.20", + "1140794612141.57", + "67181.10", + "102228715.89", + "84910434946.08", + "15850104465.16", + "0.00", + "17441816579.69", + "51618513901.23", + "160248655764.67", + "211867169665.90", + "0.00", + "517879839081.99", + "517879839081.99", + "1771462139290.92", + "1559594969625.01" ], "$500-1000K_2": [ - "1094620.54", - "658208615573.94", - "288951.14", - "7326736731.57", + "1104498.07", + "658315610162.05", + "298828.67", + "7573495700.97", "805669.40", "32140076023.52", "0.00", - "615562304506.83", - "171613515997.99", - "634492331629.61", + "615573721540.21", + "171614657701.33", + "634599326217.72", "3232.21", "14540256.96", - "171628056254.95", - "45060440.19", + "171629197958.29", + "46202143.53", "1708432592.74", - "133767850.74", - "173157660556.76", - "36252798985.51", - "209410459542.26", + "152227263.65", + "173139201143.85", + "36269064454.67", + "209408265598.52", "0.00", - "35946183145.27", - "35946183145.27", - "717126307757.12", - "507715848214.86" + "43222608390.81", + "43222608390.81", + "724517860325.35", + "515109594726.83" ], "$75-100K_2": [ - "18949961.83", - "1165647432570.22", - "15105225.97", - "308870622033.36", - "3844735.86", - "85764184859.30", - "0.00", - "804362763719.27", - "116027185384.94", - "1106038831651.93", + "18653492.43", + "1162901867354.49", + "14849690.96", + "303996545180.08", + "3803801.46", + "84960599274.40", + "0.00", + "801953595514.65", + "115634092256.78", + "1103835978803.49", "52690.91", "77260328.62", - "116104445713.55", - "13755775456.03", + "115711352585.39", + "13613231703.22", "0.00", - "4430547578.36", - "97918122679.17", - "147112557434.17", - "245030680113.34", + "4930953376.11", + "97167167506.07", + "146624413953.41", + "243791581459.48", "0.00", - "414675390041.52", - "414675390041.52", - "1623470840746.90", - "1378440160633.56" + "391452582549.48", + "391452582549.48", + "1594849353955.85", + "1351057772496.37" ], "<$0K_2": [ "35198.19", @@ -2363,16 +2363,16 @@ TABLE dist2_xbin RESULTS: "19264377.37", "18002758.83", "0.00", - "522066498.01", - "522066498.01", - "-3844938564.95", - "-3862941323.79" + "517345152.64", + "517345152.64", + "-3849659910.32", + "-3867662669.15" ], "=$0K_2": [ - "778401.71", + "759542.49", "0.00", - "778401.71", - "12767442158.18", + "759542.49", + "12531873122.23", "0.00", "0.00", "0.00", @@ -2415,10 +2415,10 @@ TABLE dist2_xbin RESULTS: "29027488952.38", "304456398647.10", "0.00", - "5489004624.21", - "5489004624.21", - "892529079342.94", - "588072680695.84" + "5455983836.89", + "5455983836.89", + "892496058555.62", + "588039659908.52" ], "ALL_2": [ "167512333.91", @@ -2439,12 +2439,12 @@ TABLE dist2_xbin RESULTS: "77559708552.48", "1646242385924.86", "1297903383972.87", - "2944145769897.73", + "2944145769897.74", "0.00", - "3174817061858.27", - "3174817061858.27", - "15539775857819.45", - "12595630087921.71" + "3208095128266.24", + "3208095128266.24", + "15573053924227.42", + "12628908154329.68" ] } TABLE dist2_xdec RESULTS: @@ -2476,30 +2476,30 @@ TABLE dist2_xdec RESULTS: "0.00" ], "0-10p_2": [ - "16746819.39", - "90653744797.08", - "16641781.76", - "207381754058.08", + "16739095.33", + "87358750202.08", + "16634057.71", + "207202466940.08", "105037.63", "1210177607.42", "0.00", - "7640227736.96", - "657961029.44", - "89605300222.71", + "7316089698.02", + "615040821.79", + "86310305627.71", "9710.91", "2350517.06", - "660311546.50", - "100539223.46", + "617391338.85", + "90663454.93", "0.00", - "6801800675.72", - "-6242028352.68", - "13393433672.59", - "7151405319.91", + "6388531196.65", + "-5861803312.73", + "12855301922.52", + "6993498609.78", "0.00", - "69292875054.40", - "69292875054.40", - "163422937263.13", - "156271531943.23" + "72689857127.46", + "72689857127.46", + "163287964939.11", + "156294466329.33" ], "0-10z_2": [ "0.00", @@ -2528,290 +2528,290 @@ TABLE dist2_xdec RESULTS: "0.00" ], "10-20_2": [ - "16745007.12", - "250022054689.31", - "16275132.38", - "237791595803.60", - "469874.74", - "8072933367.15", - "0.00", - "82473180259.41", - "8174920842.91", - "243224141166.50", + "16762741.14", + "244351674337.14", + "16341767.15", + "241905849835.70", + "420973.99", + "7221378791.69", + "0.00", + "77118389108.27", + "7632589395.82", + "238242190162.20", "55781.40", "163566254.06", - "8338487096.97", - "1043040698.70", + "7796155649.88", + "981224195.02", "0.00", - "11923221853.41", - "-4627775455.14", - "36621249303.51", - "31993473848.38", + "12576890783.78", + "-5761959328.92", + "35764227334.72", + "30002268005.80", "0.00", - "142587407777.55", - "142587407777.55", - "411329759246.16", - "379336285397.79" + "145297587528.54", + "145297587528.54", + "407437062003.84", + "377434793998.04" ], "20-30_2": [ - "16738848.72", - "351104414835.87", - "16197877.24", - "255965132036.40", - "540971.47", - "8978596977.78", - "0.00", - "152914265051.08", - "15932976647.90", - "343967178845.48", + "16732868.23", + "358543384080.27", + "16152991.37", + "252891850991.76", + "579876.86", + "9780945339.72", + "0.00", + "157957404925.07", + "16472587736.63", + "350759058362.97", "45967.92", "66025987.55", - "15999002635.45", - "3246603236.24", + "16538613724.18", + "3322783205.86", "0.00", - "16374509100.89", - "-3622109701.68", - "50694165538.83", - "47072055837.15", + "16611491459.43", + "-3395660941.10", + "51839875790.22", + "48444214849.11", "0.00", - "190161527801.93", - "190161527801.93", - "570200919302.15", - "523128863465.00" + "179945542399.33", + "179945542399.33", + "569174772553.15", + "520730557704.03" ], "30-40_2": [ - "16766623.58", - "498505710077.98", - "15765887.57", - "258408356133.54", - "1000736.00", - "17700274038.97", - "0.00", - "267210159564.27", - "28614058201.00", - "485001484086.80", - "8189.40", - "18749412.85", - "28632807613.84", - "5632970811.19", - "0.00", - "12396774551.87", - "10603062250.78", - "71960951524.27", - "82564013775.05", - "0.00", - "195130965563.98", - "195130965563.98", - "732237506149.41", - "649673492374.36" + "16765717.77", + "514510018861.81", + "15638496.30", + "259878408912.53", + "1127221.48", + "22982518930.88", + "0.00", + "272466379772.32", + "29189293575.22", + "496157193581.79", + "48846.98", + "27489458.86", + "29216783034.08", + "5963457306.64", + "0.00", + "13566274404.24", + "9687051323.20", + "74353133584.08", + "84040184907.28", + "0.00", + "179558944576.07", + "179558944576.07", + "732964837476.21", + "648924652568.93" ], "40-50_2": [ - "16739738.92", - "624672955047.56", - "14896913.20", - "266112416108.96", - "1842825.72", - "34289073562.68", - "0.00", - "366196651805.17", - "40107714764.66", - "598763133937.89", - "86455.56", - "76941178.51", - "40184655943.17", - "8834472541.27", - "0.00", - "12809093546.47", - "18541089855.43", - "85527460855.58", - "104068550711.01", - "0.00", - "242485896585.62", - "242485896585.62", - "904352428436.29", - "800283877725.28" + "16739784.06", + "615139697497.05", + "15035449.27", + "268415427896.05", + "1704334.79", + "32134570180.58", + "0.00", + "359877399485.95", + "39362574245.58", + "590876902685.25", + "45797.98", + "68201132.50", + "39430775378.08", + "8580165252.40", + "0.00", + "12625484263.40", + "18225125862.27", + "83701793115.82", + "101926918978.09", + "0.00", + "252142977102.42", + "252142977102.42", + "904189644553.78", + "802262725575.69" ], "50-60_2": [ - "16754584.60", - "774693980624.13", - "14564417.80", - "282919990883.19", - "2190166.79", - "44146585210.01", - "0.00", - "491420034781.18", - "61511913443.28", - "742774936945.50", + "16763677.48", + "764865336011.62", + "14633972.12", + "283058310733.45", + "2129705.36", + "39689882569.83", + "0.00", + "486773745098.32", + "60660282605.86", + "736967448211.78", "34581.16", "56809240.45", - "61568722683.73", - "10305655781.87", + "60717091846.31", + "10230495506.96", "0.00", - "9381517625.10", - "41881549276.76", - "104454797328.07", - "146336346604.83", + "8629738196.13", + "41856858143.21", + "102805581649.50", + "144662439792.71", "0.00", - "314701643656.09", - "314701643656.09", - "1132150609959.30", - "985814263354.46" + "329465219454.11", + "329465219454.11", + "1135617524889.23", + "990955085096.52" ], "60-70_2": [ - "16762218.04", - "1043849055027.87", - "13322442.48", - "274948043040.32", - "3439775.56", - "78318074483.65", - "0.00", - "720081633793.70", - "103979818737.56", - "989111760316.31", + "16746153.89", + "1064724945572.85", + "13199580.22", + "271796808496.08", + "3546573.67", + "80439242921.56", + "0.00", + "736992998870.07", + "106612578860.44", + "1008608030375.00", "39492.88", "54478671.55", - "104034297409.11", - "12074629987.29", + "106667057531.99", + "12442570020.94", "0.00", - "3852382156.68", - "88107285265.14", - "130534761456.35", - "218642046721.49", + "3464377847.80", + "90760109663.25", + "133545232326.02", + "224305341989.27", "0.00", - "377032952099.09", - "377032952099.09", - "1457278738587.86", - "1238636691866.36" + "353429318501.13", + "353429318501.13", + "1454587807554.33", + "1230282465565.06" ], "70-80_2": [ - "16655938.71", - "1399998920643.80", - "11867639.64", - "262016865719.34", - "4788299.07", - "134206700239.64", - "0.00", - "1027916047305.18", - "154077302730.12", - "1305439106404.69", + "16750960.06", + "1410556436603.27", + "11934379.63", + "262932624697.66", + "4816580.43", + "134194737239.86", + "0.00", + "1038658839951.64", + "156829468648.34", + "1316249063274.96", "2493.36", "20833275.90", - "154098136006.02", - "14124777934.83", + "156850301924.24", + "13699542682.18", "0.00", - "2373395954.34", - "137599962116.84", - "170114258583.78", - "307714220700.62", + "1988385417.86", + "141162373824.20", + "172310722571.17", + "313473096395.37", "0.00", - "435832722911.96", - "435832722911.96", - "1876597828920.96", - "1568883608220.34" + "443700774845.87", + "443700774845.87", + "1896544879827.17", + "1583071783431.80" ], "80-90_2": [ - "16843561.73", - "2025352787053.93", - "10183856.19", - "242725426933.34", - "6659705.54", - "189837638711.97", + "16757773.99", + "2006920903157.26", + "10107459.40", + "239765662402.37", + "6650314.60", + "190413354406.73", "0.00", - "1593228309400.23", - "286335832641.93", - "1900721611478.46", + "1578567381742.84", + "283405794755.79", + "1881716453941.62", "0.00", "0.00", - "286335832641.93", - "18850385608.75", + "283405794755.79", + "18900171247.49", "0.00", - "687338588.33", - "266798108444.85", - "242107300146.25", - "508905408591.10", + "737683271.38", + "263767940236.92", + "238934262980.40", + "502702203217.33", "0.00", - "486669183360.31", - "486669183360.31", - "2600989542564.74", - "2092084133973.64" + "501439546995.33", + "501439546995.33", + "2596539062133.89", + "2093836858916.56" ], "90-100_2": [ - "16758993.13", - "4758972946196.62", - "7621116.95", - "186549230417.70", - "9137876.18", - "311207994415.04", - "0.00", - "4253032000913.78", - "1104594629404.68", - "4541795117051.73", + "16753561.96", + "4750855422670.79", + "7658912.07", + "186971400228.80", + "9094649.89", + "309901240626.03", + "0.00", + "4246383881958.47", + "1103206917797.99", + "4534517124232.78", "21742.59", "174919890.45", - "1104769549295.13", - "15807146865.33", + "1103381837688.44", + "15809149816.52", "9200514294.44", - "959674499.68", - "1097203242224.55", - "392495005563.64", - "1489698247788.19", + "970851711.79", + "1095802350454.56", + "391793252698.42", + "1487595603152.99", "0.00", - "720921887047.33", - "720921887047.33", - "5691215587389.45", - "4201517339601.25" + "750425359735.99", + "750425359735.99", + "5712710368296.72", + "4225114765143.73" ], "90-95_2": [ - "8379167.47", - "1427838890629.53", - "4372822.29", - "106404956592.64", - "4006345.17", - "124921107765.17", - "0.00", - "1197439105877.32", - "263346843291.14", - "1343843606373.73", - "0.00", - "0.00", - "263346843291.14", - "8335570663.00", - "47609789.86", - "674651048.78", - "254384231369.21", - "158142692594.29", - "412526923963.50", - "0.00", - "333768367987.25", - "333768367987.25", - "1824261696858.48", - "1411734772894.98" + "8362551.67", + "1450000504124.23", + "4295022.15", + "104738367010.02", + "4067529.52", + "126566751343.91", + "0.00", + "1219498324661.57", + "269544762316.88", + "1364955403886.99", + "0.00", + "0.00", + "269544762316.88", + "8442491181.03", + "54485866.55", + "330724460.38", + "260826032542.03", + "160077362538.95", + "420903395080.98", + "0.00", + "317453475733.64", + "317453475733.64", + "1831394396250.26", + "1410491001169.28" ], "95-99_2": [ - "6703952.80", - "1736373479861.09", - "2873171.42", - "70815688559.73", - "3830781.38", - "129696375886.02", - "0.00", - "1534969079065.54", - "383837869287.54", - "1646220774909.10", - "0.00", - "0.00", - "383837869287.54", - "7358725956.92", - "1197603351.53", - "132796187.25", - "377543950494.89", - "164013295081.48", - "541557245576.38", - "0.00", - "340328200668.67", - "340328200668.67", - "2179233651350.80", - "1637676405774.43" + "6715358.48", + "1709141801278.29", + "2989697.71", + "72940679320.06", + "3725660.77", + "126712248391.96", + "0.00", + "1508969461703.74", + "376984350789.09", + "1620902782975.57", + "0.00", + "0.00", + "376984350789.09", + "7246676583.27", + "1190730701.24", + "487899987.77", + "370440504919.29", + "161633465352.22", + "532073970271.51", + "0.00", + "380484483353.12", + "380484483353.12", + "2191028917396.99", + "1658954947125.48" ], "ALL_2": [ "167512333.91", @@ -2832,37 +2832,37 @@ TABLE dist2_xdec RESULTS: "77559708552.48", "1646242385924.86", "1297903383972.87", - "2944145769897.73", + "2944145769897.74", "0.00", - "3174817061858.27", - "3174817061858.27", - "15539775857819.45", - "12595630087921.71" + "3208095128266.24", + "3208095128266.24", + "15573053924227.41", + "12628908154329.68" ], "Top 1%_2": [ - "1675872.86", - "1594760575706.00", - "375123.24", - "9328585265.32", - "1300749.62", - "56590510763.85", - "0.00", - "1520623815970.93", - "457409916826.00", - "1551730735768.90", + "1675651.80", + "1591713117268.26", + "374192.21", + "9292353898.72", + "1301459.59", + "56622240890.17", + "0.00", + "1517916095593.15", + "456677804692.01", + "1548658937370.23", "21742.59", "174919890.45", - "457584836716.45", - "112850245.41", - "7955301153.05", + "456852724582.46", + "119982052.22", + "7955297726.65", "152227263.65", - "465275060360.45", - "70339017887.87", - "535614078248.32", - "0.00", - "46825318391.41", - "46825318391.41", - "1687720239180.17", - "1152106160931.84" + "464535812993.25", + "70082424807.25", + "534618237800.50", + "0.00", + "52487400649.24", + "52487400649.24", + "1690287054649.47", + "1155668816848.97" ] } diff --git a/taxcalc/tests/test_behavior.py b/taxcalc/tests/test_behavior.py index 88ea9512c..542812275 100644 --- a/taxcalc/tests/test_behavior.py +++ b/taxcalc/tests/test_behavior.py @@ -19,7 +19,7 @@ def test_incorrect_behavior_instantiation(): def test_behavioral_response_calculator(cps_subsample): # create Records object - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) year = rec.current_year # create Policy object pol = Policy() diff --git a/taxcalc/tests/test_calculate.py b/taxcalc/tests/test_calculate.py index f723b735c..99379492c 100644 --- a/taxcalc/tests/test_calculate.py +++ b/taxcalc/tests/test_calculate.py @@ -59,7 +59,7 @@ def test_make_calculator(cps_subsample): syr = 2014 pol = Policy(start_year=syr, num_years=9) assert pol.current_year == syr - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) consump = Consumption() consump.update_consumption({syr: {'_MPC_e20400': [0.05]}}) assert consump.current_year == Consumption.JSON_START_YEAR @@ -80,14 +80,14 @@ def test_make_calculator(cps_subsample): def test_make_calculator_deepcopy(cps_subsample): pol = Policy() - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) calc1 = Calculator(policy=pol, records=rec) calc2 = copy.deepcopy(calc1) assert isinstance(calc2, Calculator) def test_make_calculator_with_policy_reform(cps_subsample): - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) year = rec.current_year # create a Policy object and apply a policy reform pol = Policy() @@ -111,7 +111,7 @@ def test_make_calculator_with_policy_reform(cps_subsample): def test_make_calculator_with_multiyear_reform(cps_subsample): - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) year = rec.current_year # create a Policy object and apply a policy reform pol = Policy() @@ -137,7 +137,7 @@ def test_make_calculator_with_multiyear_reform(cps_subsample): def test_calculator_advance_to_year(cps_subsample): - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) pol = Policy() calc = Calculator(policy=pol, records=rec) calc.advance_to_year(2016) @@ -147,13 +147,13 @@ def test_calculator_advance_to_year(cps_subsample): def test_make_calculator_raises_on_no_policy(cps_subsample): - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) with pytest.raises(ValueError): Calculator(records=rec) def test_calculator_mtr(cps_subsample): - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) calcx = Calculator(policy=Policy(), records=rec) calcx.calc_all() combinedx = calcx.array('combined') @@ -234,7 +234,7 @@ def test_make_calculator_increment_years_first(cps_subsample): reform[2016]['_II_em_cpi'] = False pol.implement_reform(reform) # create Calculator object with Policy object as modified by reform - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=pol, records=rec) # compare expected policy parameter values with those embedded in calc irates = pol.inflation_rates() @@ -259,7 +259,7 @@ def test_ID_HC_vs_BS(cps_subsample): Test that complete haircut of itemized deductions produces same results as a 100% benefit surtax with no benefit deduction. """ - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) # specify complete-haircut reform policy and Calculator object hc_reform = {2013: {'_ID_Medical_hc': [1.0], '_ID_StateLocalTax_hc': [1.0], @@ -294,7 +294,7 @@ def test_ID_StateLocal_HC_vs_CRT(cps_subsample): of AGI is equivalent to a complete haircut on the same state/local tax deductions. """ - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) # specify state/local complete haircut reform policy and Calculator object hc_reform = {2013: {'_ID_StateLocalTax_hc': [1.0]}} hc_policy = Policy() @@ -320,7 +320,7 @@ def test_ID_RealEstate_HC_vs_CRT(cps_subsample): at 0 percent of AGI is equivalent to a complete haircut on the same real estate tax deductions. """ - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) # specify real estate complete haircut reform policy and Calculator object hc_reform = {2013: {'_ID_RealEstate_hc': [1.0]}} hc_policy = Policy() @@ -933,14 +933,14 @@ def test_difference_table(cps_subsample): def test_diagnostic_table(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs) adt = calc.diagnostic_table(3) assert isinstance(adt, pd.DataFrame) def test_mtr_graph(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs) fig = calc.mtr_graph(calc, mars=2, @@ -954,7 +954,7 @@ def test_mtr_graph(cps_subsample): def test_atr_graph(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs) fig = calc.atr_graph(calc, mars=2, atr_measure='itax') assert fig @@ -963,7 +963,7 @@ def test_atr_graph(cps_subsample): def test_privacy_of_embedded_objects(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs) with pytest.raises(AttributeError): cyr = calc.__policy.current_year @@ -976,6 +976,6 @@ def test_privacy_of_embedded_objects(cps_subsample): def test_n65(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs) assert calc.n65().sum() > 1500 diff --git a/taxcalc/tests/test_compare.py b/taxcalc/tests/test_compare.py index 78a1a3381..339bd07b8 100644 --- a/taxcalc/tests/test_compare.py +++ b/taxcalc/tests/test_compare.py @@ -271,7 +271,7 @@ def test_itax_compare(tests_path, using_puf, puf_fullsample, cps_fullsample): else: recs = Records(data=puf_fullsample, adjust_ratios=None) else: - recs = Records.cps_constructor(data=cps_fullsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_fullsample) calc = Calculator(policy=Policy(), records=recs, verbose=False) calc.advance_to_year(2015) calc.calc_all() diff --git a/taxcalc/tests/test_consumption.py b/taxcalc/tests/test_consumption.py index 8b12761e9..a9c74af38 100644 --- a/taxcalc/tests/test_consumption.py +++ b/taxcalc/tests/test_consumption.py @@ -110,7 +110,7 @@ def test_consumption_response(cps_subsample): with pytest.raises(ValueError): consump.response(list(), 1) # test correct call to response method - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) pre = copy.deepcopy(rec.e20400) consump.response(rec, 1.0) post = rec.e20400 @@ -118,7 +118,7 @@ def test_consumption_response(cps_subsample): expected_diff = np.ones(rec.array_length) * mpc assert np.allclose(actual_diff, expected_diff) # compute earnings mtr with no consumption response - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) ided0 = copy.deepcopy(rec.e20400) calc0 = Calculator(policy=Policy(), records=rec, consumption=None) (mtr0_ptax, mtr0_itax, _) = calc0.mtr(variable_str='e00200p', diff --git a/taxcalc/tests/test_cpscsv.py b/taxcalc/tests/test_cpscsv.py index 6af2fa718..952486fd0 100644 --- a/taxcalc/tests/test_cpscsv.py +++ b/taxcalc/tests/test_cpscsv.py @@ -36,7 +36,7 @@ def test_agg(tests_path, cps_fullsample): baseline_policy = Policy() baseline_policy.implement_reform(pre_tcja['policy']) # create a Records object (rec) containing all cps.csv input records - recs = Records.cps_constructor(data=cps_fullsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_fullsample) # create a Calculator object using baseline policy and cps records calc = Calculator(policy=baseline_policy, records=recs) calc_start_year = calc.current_year @@ -73,7 +73,7 @@ def test_agg(tests_path, cps_fullsample): rn_seed = 180 # to ensure sub-sample is always the same subfrac = 0.03 # sub-sample fraction subsample = cps_fullsample.sample(frac=subfrac, random_state=rn_seed) - recs_subsample = Records.cps_constructor(data=subsample, no_benefits=True) + recs_subsample = Records.cps_constructor(data=subsample) calc_subsample = Calculator(policy=baseline_policy, records=recs_subsample) adt_subsample = calc_subsample.diagnostic_table(nyrs) # compare combined tax liability from full and sub samples for each year diff --git a/taxcalc/tests/test_macro_elasticity.py b/taxcalc/tests/test_macro_elasticity.py index 072aed071..1879a464d 100644 --- a/taxcalc/tests/test_macro_elasticity.py +++ b/taxcalc/tests/test_macro_elasticity.py @@ -14,7 +14,7 @@ def test_proportional_change_in_gdp(cps_subsample): """ Test correct and incorrect calls to proportional_change_in_gdp function. """ - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) pol = Policy() calc1 = Calculator(policy=pol, records=rec) reform = {2015: {'_II_em': [0.0]}} # reform increases taxes and MTRs diff --git a/taxcalc/tests/test_records.py b/taxcalc/tests/test_records.py index e2f9d3972..e4ad47283 100644 --- a/taxcalc/tests/test_records.py +++ b/taxcalc/tests/test_records.py @@ -24,9 +24,6 @@ def test_incorrect_Records_instantiation(cps_subsample): with pytest.raises(ValueError): recs = Records(data=cps_subsample, gfactors=None, weights=None, adjust_ratios=list()) - with pytest.raises(ValueError): - recs = Records(data=cps_subsample, gfactors=None, weights=None, - adjust_ratios=None, benefits=list()) def test_correct_Records_instantiation(cps_subsample): @@ -40,15 +37,11 @@ def test_correct_Records_instantiation(cps_subsample): assert sum_e00200_in_cps_year_plus_one == sum_e00200_in_cps_year wghts_path = os.path.join(Records.CUR_PATH, Records.CPS_WEIGHTS_FILENAME) wghts_df = pd.read_csv(wghts_path) - benefit_path = os.path.join(Records.CUR_PATH, - Records.CPS_BENEFITS_FILENAME) - benefit_df = pd.read_csv(benefit_path) rec2 = Records(data=cps_subsample, exact_calculations=False, gfactors=GrowFactors(), weights=wghts_df, adjust_ratios=None, - benefits=benefit_df, start_year=Records.CPSCSV_YEAR) assert rec2 assert np.all(rec2.MARS != 0) diff --git a/taxcalc/tests/test_utils.py b/taxcalc/tests/test_utils.py index be0fc2e9a..110a64264 100644 --- a/taxcalc/tests/test_utils.py +++ b/taxcalc/tests/test_utils.py @@ -639,7 +639,7 @@ def test_diff_table_sum_row(cps_subsample): def test_mtr_graph_data(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs) year = calc.current_year, with pytest.raises(ValueError): @@ -672,7 +672,7 @@ def test_mtr_graph_data(cps_subsample): def test_atr_graph_data(cps_subsample): pol = Policy() - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=pol, records=rec) year = calc.current_year with pytest.raises(ValueError): @@ -695,7 +695,7 @@ def test_atr_graph_data(cps_subsample): def test_xtr_graph_plot(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs, behavior=Behavior()) mtr = 0.20 * np.ones_like(cps_subsample['e00200']) vdf = calc.dataframe(['s006', 'MARS', 'c00100']) @@ -722,7 +722,7 @@ def temporary_filename(suffix=''): def test_write_graph_file(cps_subsample): - recs = Records.cps_constructor(data=cps_subsample, no_benefits=True) + recs = Records.cps_constructor(data=cps_subsample) calc = Calculator(policy=Policy(), records=recs) mtr = 0.20 * np.ones_like(cps_subsample['e00200']) vdf = calc.dataframe(['s006', 'e00200', 'c00100']) @@ -763,7 +763,7 @@ def test_ce_aftertax_income(cps_subsample): cmin = 1000 assert con == round(certainty_equivalent(con, 0, cmin), 6) # test with require_no_agg_tax_change equal to False - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) cyr = 2020 # specify calc1 and calc_all() for cyr pol = Policy() @@ -838,7 +838,7 @@ def test_table_columns_labels(): def test_dec_graph_plots(cps_subsample): pol = Policy() - rec = Records.cps_constructor(data=cps_subsample, no_benefits=True) + rec = Records.cps_constructor(data=cps_subsample) calc1 = Calculator(policy=pol, records=rec) year = 2020 calc1.advance_to_year(year)