diff --git a/taxcalc/__init__.py b/taxcalc/__init__.py index 0daa7de10..615d43f6c 100644 --- a/taxcalc/__init__.py +++ b/taxcalc/__init__.py @@ -14,6 +14,6 @@ from taxcalc.utils import * from taxcalc.cli import * -__version__ = '4.3.3' +__version__ = '4.3.3a' __min_python3_version__ = 10 __max_python3_version__ = 12 diff --git a/taxcalc/calcfunctions.py b/taxcalc/calcfunctions.py index 800aa12ba..12441c610 100644 --- a/taxcalc/calcfunctions.py +++ b/taxcalc/calcfunctions.py @@ -157,11 +157,11 @@ def EI_PayrollTax(SS_Earnings_c, e00200p, e00200s, pencon_p, pencon_s, Partner self-employment earnings/loss for spouse (included in e26270 total) payrolltax: float Total (employee and employer) payroll tax liability - payrolltax = ptax_was + setax + ptax_amc + payrolltax = ptax_was ptax_was: float Employee and employer OASDI plus HI FICA tax setax: float - Self-employment tax + Self-employment tax (included in othertaxes and iitax) c03260: float Deductible part of self-employment tax c03260 = (1 - ALD_SelfEmploymentTax_hc) * 0.5 * setax @@ -187,11 +187,11 @@ def EI_PayrollTax(SS_Earnings_c, e00200p, e00200s, pencon_p, pencon_s, Total self-employment income for filing unit payrolltax: float Total (employee and employer) payroll tax liability - payrolltax = ptax_was + setax + ptax_amc + payrolltax = ptax_was ptax_was: float Employee and employer OASDI plus HI FICA tax setax: float - Self-employment tax + Self-employment tax (included in othertaxes and iitax) c03260: float Deductible part of self-employment tax c03260 = (1 - ALD_SelfEmploymentTax_hc) * 0.5 * setax @@ -260,9 +260,7 @@ def EI_PayrollTax(SS_Earnings_c, e00200p, e00200s, pencon_p, pencon_s, extra_ss_income_s * (FICA_ss_trt_employer + FICA_ss_trt_employee)) # compute part of total payroll taxes for filing unit - # (the ptax_amc part of total payroll taxes for the filing unit is - # computed in the AdditionalMedicareTax function below) - payrolltax = ptax_was + setax + extra_payrolltax + payrolltax = ptax_was + extra_payrolltax # compute OASDI part of payroll taxes ptax_oasdi = (ptax_ss_was_p + ptax_ss_was_s + @@ -1088,9 +1086,9 @@ def AdditionalMedicareTax(e00200, MARS, AMEDT_ec, sey, AMEDT_rt, FICA_mc_trt_employer, FICA_mc_trt_employee, FICA_ss_trt_employer, FICA_ss_trt_employee, - ptax_amc, payrolltax): + ptax_amc): """ - Computes Additional Medicare Tax (Form 8959) included in payroll taxes. + Computes Additional Medicare Tax (Form 8959) included in othertaxes. Parameters ----- @@ -1113,23 +1111,18 @@ def AdditionalMedicareTax(e00200, MARS, sey: float Self-employment income ptax_amc: float - Additional Medicare Tax - payrolltax: float - payroll tax augmented by Additional Medicare Tax + Additional Medicare Tax (included in othertaxes and iitax) Returns ------- ptax_amc: float - Additional Medicare Tax - payrolltax: float - payroll tax augmented by Additional Medicare Tax + Additional Medicare Tax (included in othertaxes and iitax) """ line8 = max(0., sey) * (1. - 0.5 * (FICA_mc_trt_employer + FICA_mc_trt_employee + FICA_ss_trt_employer + FICA_ss_trt_employee)) line11 = max(0., AMEDT_ec[MARS - 1] - e00200) ptax_amc = AMEDT_rt * (max(0., e00200 - AMEDT_ec[MARS - 1]) + max(0., line8 - line11)) - payrolltax += ptax_amc - return (ptax_amc, payrolltax) + return ptax_amc @iterate_jit(nopython=True) @@ -3150,8 +3143,8 @@ def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd, @iterate_jit(nopython=True) def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300, - c07400, c07600, c08000, e09700, e09800, e09900, niit, othertaxes, - c07100, c09200, odc, charity_credit, + c07400, c07600, c08000, e09700, e09800, e09900, niit, setax, + ptax_amc, othertaxes, c07100, c09200, odc, charity_credit, personal_nonrefundable_credit, CTC_is_refundable, ODC_is_refundable): """ @@ -3190,8 +3183,12 @@ def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300, Penalty tax on qualified retirement plans niit: float Net Investment Income Tax from Form 8960 + setax: float + Self-employment tax + ptax_amc: float + Additional Medicare tax othertaxes: float - Sum of niit, e09700, e09800, and e09900 + Sum of niit, setax, ptax_amc, e09700, e09800, and e09900 c07100: float Total non-refundable credits used to reduce positive tax liability c09200: float @@ -3221,7 +3218,7 @@ def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300, # tax after credits (2016 Form 1040, line 56) tax_net_nonrefundable_credits = max(0., c05800 - c07100) # tax (including othertaxes) before refundable credits - othertaxes = e09700 + e09800 + e09900 + niit + othertaxes = e09700 + e09800 + e09900 + niit + setax + ptax_amc c09200 = othertaxes + tax_net_nonrefundable_credits return (c07100, othertaxes, c09200) diff --git a/taxcalc/records_variables.json b/taxcalc/records_variables.json index 5fbdf3df6..3ca5694ac 100644 --- a/taxcalc/records_variables.json +++ b/taxcalc/records_variables.json @@ -736,9 +736,8 @@ }, "payrolltax": { "type": "float", - "desc": "Total (employee + employer) payroll tax liability; appears as PAYTAX variable in tc CLI minimal output (payrolltax = ptax_was + setax + ptax_amc)", - "form": {"2013-2013": "OASDI+HI FICA plus 1040 lines 56 and 60a", - "2014-2016": "OASDI+HI FICA plus 1040 lines 57 and 62a"} + "desc": "Total (employee + employer) payroll tax liability; appears as PAYTAX variable in tc CLI minimal output (payrolltax = ptax_was)", + "form": {"2013-20??": "OASDI+HI FICA"} }, "refund": { "type": "float", @@ -1133,13 +1132,13 @@ }, "ptax_amc": { "type": "float", - "desc": "Additional Medicare Tax from Form 8959 (included in payrolltax)", + "desc": "Additional Medicare Tax from Form 8959 (included in othertaxes and iitax)", "form": {"2013-2013": "1040 line 60a", "2014-2016": "1040 line 62a"} }, "ptax_oasdi": { "type": "float", - "desc": "Employee + employer OASDI FICA tax plus self-employment tax (excludes HI FICA so positive ptax_oasdi is less than ptax_was plus setax)", + "desc": "Employee + employer OASDI FICA tax plus self-employment tax", "form": {"2013-2013": "OASDI FICA plus 1040 line 56", "2014-2016": "OASDI FICA plus 1040 line 57"} }, @@ -1151,7 +1150,7 @@ }, "setax": { "type": "float", - "desc": "Self-employment tax", + "desc": "Self-employment tax (included in othertaxes and iitax)", "form": {"2013-2013": "1040 line 56", "2014-2016": "1040 line 57"} }, diff --git a/taxcalc/reforms/2017_law.out.csv b/taxcalc/reforms/2017_law.out.csv index b084176c4..b5d112313 100644 --- a/taxcalc/reforms/2017_law.out.csv +++ b/taxcalc/reforms/2017_law.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6723.42,18988.43,554.60,4590.00 12,60000.00,6723.42,48988.43,5935.27,9180.00 -13,460000.00,6723.42,453276.58,132718.27,32754.80 +13,460000.00,6723.42,453276.58,135058.27,30414.80 21,60000.00,13446.83,29400.57,-2177.25,9180.00 22,120000.00,13446.83,89400.57,8226.47,18360.00 23,240000.00,13446.83,209400.57,44745.39,36720.00 diff --git a/taxcalc/reforms/ARPA.out.csv b/taxcalc/reforms/ARPA.out.csv index 5acc80dbc..03b237185 100644 --- a/taxcalc/reforms/ARPA.out.csv +++ b/taxcalc/reforms/ARPA.out.csv @@ -1,10 +1,10 @@ -RECID,c00100,standard,c04800,iitax,payrolltax -11,30000,12400,17600,114.5,4590 -12,60000,12400,47600,4462,9180 -13,460000,12400,447600,131455,32754.8 -21,60000,24800,35200,-3771,9180 -22,120000,24800,95200,4924,18360 -23,240000,24800,215200,35807,36720 -31,30000,18650,11350,-4543.93,4590 -32,60000,18650,41350,880,9180 -33,120000,18650,101350,13537,18360 \ No newline at end of file +RECID,c00100,standard,c04800,iitax,payrolltax +11,30000.00,12400.00,17600.00,114.50,4590.00 +12,60000.00,12400.00,47600.00,4462.00,9180.00 +13,460000.00,12400.00,447600.00,133795.00,30414.80 +21,60000.00,24800.00,35200.00,-3771.00,9180.00 +22,120000.00,24800.00,95200.00,4924.00,18360.00 +23,240000.00,24800.00,215200.00,35807.00,36720.00 +31,30000.00,18650.00,11350.00,-4543.93,4590.00 +32,60000.00,18650.00,41350.00,880.00,9180.00 +33,120000.00,18650.00,101350.00,13537.00,18360.00 diff --git a/taxcalc/reforms/BrownKhanna.out.csv b/taxcalc/reforms/BrownKhanna.out.csv index 109b0e5ce..c40751a2c 100644 --- a/taxcalc/reforms/BrownKhanna.out.csv +++ b/taxcalc/reforms/BrownKhanna.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6723.42,18988.43,-930.89,4590.00 12,60000.00,6723.42,48988.43,5935.27,9180.00 -13,460000.00,6723.42,453276.58,132718.27,32754.80 +13,460000.00,6723.42,453276.58,135058.27,30414.80 21,60000.00,13446.83,29400.57,-6296.60,9180.00 22,120000.00,13446.83,89400.57,8226.47,18360.00 23,240000.00,13446.83,209400.57,44745.39,36720.00 diff --git a/taxcalc/reforms/CARES.out.csv b/taxcalc/reforms/CARES.out.csv index 4bde32138..2d8d0c7dc 100644 --- a/taxcalc/reforms/CARES.out.csv +++ b/taxcalc/reforms/CARES.out.csv @@ -1,10 +1,10 @@ -RECID,c00100,standard,c04800,iitax,payrolltax -11,30000,12400,17600,714.5,4590 -12,60000,12400,47600,5062,9180 -13,460000,12400,447600,131455,32754.8 -21,60000,24800,35200,-2571,9180 -22,120000,24800,95200,6124,18360 -23,240000,24800,215200,35807,36720 -31,30000,18650,11350,-3943.93,4590 -32,60000,18650,41350,1480,9180 -33,120000,18650,101350,14137,18360 \ No newline at end of file +RECID,c00100,standard,c04800,iitax,payrolltax +11,30000.00,12400.00,17600.00,714.50,4590.00 +12,60000.00,12400.00,47600.00,5062.00,9180.00 +13,460000.00,12400.00,447600.00,133795.00,30414.80 +21,60000.00,24800.00,35200.00,-2571.00,9180.00 +22,120000.00,24800.00,95200.00,6124.00,18360.00 +23,240000.00,24800.00,215200.00,35807.00,36720.00 +31,30000.00,18650.00,11350.00,-3943.93,4590.00 +32,60000.00,18650.00,41350.00,1480.00,9180.00 +33,120000.00,18650.00,101350.00,14137.00,18360.00 diff --git a/taxcalc/reforms/ConsolidatedAppropriationsAct2021.out.csv b/taxcalc/reforms/ConsolidatedAppropriationsAct2021.out.csv index 7e782967b..03b237185 100644 --- a/taxcalc/reforms/ConsolidatedAppropriationsAct2021.out.csv +++ b/taxcalc/reforms/ConsolidatedAppropriationsAct2021.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,12400.00,17600.00,114.50,4590.00 12,60000.00,12400.00,47600.00,4462.00,9180.00 -13,460000.00,12400.00,447600.00,131455.00,32754.80 +13,460000.00,12400.00,447600.00,133795.00,30414.80 21,60000.00,24800.00,35200.00,-3771.00,9180.00 22,120000.00,24800.00,95200.00,4924.00,18360.00 23,240000.00,24800.00,215200.00,35807.00,36720.00 diff --git a/taxcalc/reforms/Larson2019.out.csv b/taxcalc/reforms/Larson2019.out.csv index 628bbf6e6..76ca96ac8 100644 --- a/taxcalc/reforms/Larson2019.out.csv +++ b/taxcalc/reforms/Larson2019.out.csv @@ -1,10 +1,10 @@ -RECID,c00100,standard,c04800,iitax,payrolltax -11,30000,12400,17600,114.5,4620 -12,60000,12400,47600,4462,9240 -13,460000,12400,447600,131455,40392.5 -21,60000,24800,35200,-3771,9240 -22,120000,24800,95200,4924,18480 -23,240000,24800,215200,35807,36960 -31,30000,18650,11350,-4543.93,4620 -32,60000,18650,41350,880,9240 -33,120000,18650,101350,13537,18480 \ No newline at end of file +RECID,c00100,standard,c04800,iitax,payrolltax +11,30000.00,12400.00,17600.00,114.50,4620.00 +12,60000.00,12400.00,47600.00,4462.00,9240.00 +13,460000.00,12400.00,447600.00,133795.00,38052.50 +21,60000.00,24800.00,35200.00,-3771.00,9240.00 +22,120000.00,24800.00,95200.00,4924.00,18480.00 +23,240000.00,24800.00,215200.00,35807.00,36960.00 +31,30000.00,18650.00,11350.00,-4543.93,4620.00 +32,60000.00,18650.00,41350.00,880.00,9240.00 +33,120000.00,18650.00,101350.00,13537.00,18480.00 diff --git a/taxcalc/reforms/Renacci.out.csv b/taxcalc/reforms/Renacci.out.csv index b2e21cc66..048e8a404 100644 --- a/taxcalc/reforms/Renacci.out.csv +++ b/taxcalc/reforms/Renacci.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,15882.08,8823.89,-917.61,4590.00 12,60000.00,15882.08,38823.89,2082.39,9180.00 -13,460000.00,15882.08,444117.92,103088.44,32754.80 +13,460000.00,15882.08,444117.92,105428.44,30414.80 21,60000.00,31764.18,7059.70,-5920.62,9180.00 22,120000.00,31764.18,67059.70,1605.97,18360.00 23,240000.00,31764.18,187059.70,30882.84,36720.00 diff --git a/taxcalc/reforms/SandersDeFazio.out.csv b/taxcalc/reforms/SandersDeFazio.out.csv index 4f11ca981..e4a82c9b3 100644 --- a/taxcalc/reforms/SandersDeFazio.out.csv +++ b/taxcalc/reforms/SandersDeFazio.out.csv @@ -1,10 +1,10 @@ -RECID,c00100,standard,c04800,iitax,payrolltax -11,30000,12400,17600,114.5,4590 -12,60000,12400,47600,4462,9180 -13,460000,12400,447600,131455,58794.8 -21,60000,24800,35200,-3771,9180 -22,120000,24800,95200,4924,18360 -23,240000,24800,215200,35807,36720 -31,30000,18650,11350,-4543.93,4590 -32,60000,18650,41350,880,9180 -33,120000,18650,101350,13537,18360 \ No newline at end of file +RECID,c00100,standard,c04800,iitax,payrolltax +11,30000.00,12400.00,17600.00,114.50,4590.00 +12,60000.00,12400.00,47600.00,4462.00,9180.00 +13,460000.00,12400.00,447600.00,133795.00,56454.80 +21,60000.00,24800.00,35200.00,-3771.00,9180.00 +22,120000.00,24800.00,95200.00,4924.00,18360.00 +23,240000.00,24800.00,215200.00,35807.00,36720.00 +31,30000.00,18650.00,11350.00,-4543.93,4590.00 +32,60000.00,18650.00,41350.00,880.00,9180.00 +33,120000.00,18650.00,101350.00,13537.00,18360.00 diff --git a/taxcalc/reforms/TCJA.out.csv b/taxcalc/reforms/TCJA.out.csv index eab7d6637..c30c1f41f 100644 --- a/taxcalc/reforms/TCJA.out.csv +++ b/taxcalc/reforms/TCJA.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,12404.02,17595.98,114.60,4590.00 12,60000.00,12404.02,47595.98,4473.91,9180.00 -13,460000.00,12404.02,447595.98,131529.61,32754.80 +13,460000.00,12404.02,447595.98,133869.61,30414.80 21,60000.00,24808.03,35191.97,-3770.79,9180.00 22,120000.00,24808.03,95191.97,4947.82,18360.00 23,240000.00,24808.03,215191.97,35840.55,36720.00 diff --git a/taxcalc/reforms/Trump2016.out.csv b/taxcalc/reforms/Trump2016.out.csv index 6b51e78b7..e17cc9198 100644 --- a/taxcalc/reforms/Trump2016.out.csv +++ b/taxcalc/reforms/Trump2016.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,15882.08,14117.92,-105.85,4590.00 12,60000.00,15882.08,44117.92,4067.80,9180.00 -13,460000.00,15882.08,444117.92,131867.98,32754.80 +13,460000.00,15882.08,444117.92,134207.98,30414.80 21,60000.00,31764.18,28235.82,-2211.70,9180.00 22,120000.00,31764.18,88235.82,6635.60,18360.00 23,240000.00,31764.18,208235.82,41735.60,36720.00 diff --git a/taxcalc/reforms/Trump2017.out.csv b/taxcalc/reforms/Trump2017.out.csv index 33a3d9ce1..34d292244 100644 --- a/taxcalc/reforms/Trump2017.out.csv +++ b/taxcalc/reforms/Trump2017.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,13446.83,12265.02,-573.50,4590.00 12,60000.00,13446.83,42265.02,2739.00,9180.00 -13,460000.00,13446.83,446553.17,106145.92,32754.80 +13,460000.00,13446.83,446553.17,108485.92,30414.80 21,60000.00,26893.67,15953.73,-4004.63,9180.00 22,120000.00,26893.67,75953.73,2495.37,18360.00 23,240000.00,26893.67,195953.73,36933.93,36720.00 diff --git a/taxcalc/reforms/clp.out.csv b/taxcalc/reforms/clp.out.csv index 5acc80dbc..03b237185 100644 --- a/taxcalc/reforms/clp.out.csv +++ b/taxcalc/reforms/clp.out.csv @@ -1,10 +1,10 @@ -RECID,c00100,standard,c04800,iitax,payrolltax -11,30000,12400,17600,114.5,4590 -12,60000,12400,47600,4462,9180 -13,460000,12400,447600,131455,32754.8 -21,60000,24800,35200,-3771,9180 -22,120000,24800,95200,4924,18360 -23,240000,24800,215200,35807,36720 -31,30000,18650,11350,-4543.93,4590 -32,60000,18650,41350,880,9180 -33,120000,18650,101350,13537,18360 \ No newline at end of file +RECID,c00100,standard,c04800,iitax,payrolltax +11,30000.00,12400.00,17600.00,114.50,4590.00 +12,60000.00,12400.00,47600.00,4462.00,9180.00 +13,460000.00,12400.00,447600.00,133795.00,30414.80 +21,60000.00,24800.00,35200.00,-3771.00,9180.00 +22,120000.00,24800.00,95200.00,4924.00,18360.00 +23,240000.00,24800.00,215200.00,35807.00,36720.00 +31,30000.00,18650.00,11350.00,-4543.93,4590.00 +32,60000.00,18650.00,41350.00,880.00,9180.00 +33,120000.00,18650.00,101350.00,13537.00,18360.00 diff --git a/taxcalc/reforms/ptaxes0.out.csv b/taxcalc/reforms/ptaxes0.out.csv index 03af61e26..c0aea62fd 100644 --- a/taxcalc/reforms/ptaxes0.out.csv +++ b/taxcalc/reforms/ptaxes0.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6723.42,18988.43,554.60,5100.00 12,60000.00,6723.42,48988.43,5935.27,10200.00 -13,460000.00,6723.42,453276.58,132718.27,35418.00 +13,460000.00,6723.42,453276.58,135058.27,33078.00 21,60000.00,13446.83,29400.57,-2177.25,10200.00 22,120000.00,13446.83,89400.57,8226.47,20400.00 23,240000.00,13446.83,209400.57,44745.39,40800.00 diff --git a/taxcalc/reforms/ptaxes1.out.csv b/taxcalc/reforms/ptaxes1.out.csv index 444eaa196..dc4a35838 100644 --- a/taxcalc/reforms/ptaxes1.out.csv +++ b/taxcalc/reforms/ptaxes1.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6723.42,18988.43,554.60,4590.00 12,60000.00,6723.42,48988.43,5935.27,9180.00 -13,460000.00,6723.42,453276.58,132718.27,46680.00 +13,460000.00,6723.42,453276.58,135058.27,44340.00 21,60000.00,13446.83,29400.57,-2177.25,9180.00 22,120000.00,13446.83,89400.57,8226.47,18360.00 23,240000.00,13446.83,209400.57,44745.39,36720.00 diff --git a/taxcalc/reforms/ptaxes2.out.csv b/taxcalc/reforms/ptaxes2.out.csv index 6d4e3d52e..1e4d9ec57 100644 --- a/taxcalc/reforms/ptaxes2.out.csv +++ b/taxcalc/reforms/ptaxes2.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6723.42,18988.43,554.60,4590.00 12,60000.00,6723.42,48988.43,5935.27,9180.00 -13,460000.00,6723.42,453276.58,132718.27,72720.00 +13,460000.00,6723.42,453276.58,135058.27,70380.00 21,60000.00,13446.83,29400.57,-2177.25,9180.00 22,120000.00,13446.83,89400.57,8226.47,18360.00 23,240000.00,13446.83,209400.57,44745.39,36720.00 diff --git a/taxcalc/reforms/ptaxes3.out.csv b/taxcalc/reforms/ptaxes3.out.csv index 7477d4486..4bffb821b 100644 --- a/taxcalc/reforms/ptaxes3.out.csv +++ b/taxcalc/reforms/ptaxes3.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,6723.42,18988.43,554.60,4590.00 12,60000.00,6723.42,48988.43,5935.27,9180.00 -13,460000.00,6723.42,453276.58,132718.27,32475.05 +13,460000.00,6723.42,453276.58,134778.52,30414.80 21,60000.00,13446.83,29400.57,-2177.25,9180.00 22,120000.00,13446.83,89400.57,8226.47,18360.00 23,240000.00,13446.83,209400.57,44745.39,36720.00 diff --git a/taxcalc/reforms/rounding.out.csv b/taxcalc/reforms/rounding.out.csv index 7e782967b..03b237185 100644 --- a/taxcalc/reforms/rounding.out.csv +++ b/taxcalc/reforms/rounding.out.csv @@ -1,7 +1,7 @@ RECID,c00100,standard,c04800,iitax,payrolltax 11,30000.00,12400.00,17600.00,114.50,4590.00 12,60000.00,12400.00,47600.00,4462.00,9180.00 -13,460000.00,12400.00,447600.00,131455.00,32754.80 +13,460000.00,12400.00,447600.00,133795.00,30414.80 21,60000.00,24800.00,35200.00,-3771.00,9180.00 22,120000.00,24800.00,95200.00,4924.00,18360.00 23,240000.00,24800.00,215200.00,35807.00,36720.00 diff --git a/taxcalc/tests/cmpi_cps_expect.txt b/taxcalc/tests/cmpi_cps_expect.txt index faa63c79f..b9f572174 100644 --- a/taxcalc/tests/cmpi_cps_expect.txt +++ b/taxcalc/tests/cmpi_cps_expect.txt @@ -66,26 +66,26 @@ AGI category T-C SOI %diff ALL 6.179 22.043 -72.0 TABLE for ITAX AGI category T-C SOI %diff -[-9e+99, 1) -0.020 0.242 -108.0 -[1, 5000) -1.630 0.041 -4085.6 -[5000, 10000) -7.182 0.368 -2051.5 -[10000, 15000) -10.397 1.381 -852.7 -[15000, 20000) -8.674 3.524 -346.2 -[20000, 25000) -6.331 6.191 -202.3 -[25000, 30000) -1.413 8.753 -116.1 -[30000, 40000) 12.198 25.168 -51.5 -[40000, 50000) 25.845 32.530 -20.6 -[50000, 75000) 84.127 99.792 -15.7 -[75000, 100000) 91.075 105.901 -14.0 -[100000, 200000) 343.323 316.350 +8.5 -[200000, 500000) 239.244 299.832 -20.2 -[500000, 1000000) 62.869 154.389 -59.3 -[1000000, 1500000) 26.106 66.324 -60.6 -[1500000, 2000000) 5.167 39.672 -87.0 -[2000000, 5000000) 7.754 101.489 -92.4 -[5000000, 10000000) 7.473 56.334 -86.7 -[10000000, 9e+99) 49.446 139.611 -64.6 -ALL 918.982 1457.891 -37.0 +[-9e+99, 1) -0.006 0.242 -102.3 +[1, 5000) -1.529 0.041 -3838.6 +[5000, 10000) -6.862 0.368 -1964.8 +[10000, 15000) -9.652 1.381 -798.8 +[15000, 20000) -7.815 3.524 -321.8 +[20000, 25000) -4.865 6.191 -178.6 +[25000, 30000) 2.983 8.753 -65.9 +[30000, 40000) 19.526 25.168 -22.4 +[40000, 50000) 31.720 32.530 -2.5 +[50000, 75000) 91.782 99.792 -8.0 +[75000, 100000) 95.223 105.901 -10.1 +[100000, 200000) 352.848 316.350 +11.5 +[200000, 500000) 245.326 299.832 -18.2 +[500000, 1000000) 64.372 154.389 -58.3 +[1000000, 1500000) 26.700 66.324 -59.7 +[1500000, 2000000) 5.214 39.672 -86.9 +[2000000, 5000000) 7.827 101.489 -92.3 +[5000000, 10000000) 7.520 56.334 -86.7 +[10000000, 9e+99) 49.547 139.611 -64.5 +ALL 969.859 1457.891 -33.5 TABLE for SETAX AGI category T-C SOI %diff [-9e+99, 1) 0.014 0.656 -97.9 diff --git a/taxcalc/tests/cmpi_puf_expect.txt b/taxcalc/tests/cmpi_puf_expect.txt index 56131e971..e1796af58 100644 --- a/taxcalc/tests/cmpi_puf_expect.txt +++ b/taxcalc/tests/cmpi_puf_expect.txt @@ -66,26 +66,26 @@ AGI category T-C SOI %diff ALL 27.149 22.043 +23.2 TABLE for ITAX AGI category T-C SOI %diff -[-9e+99, 1) 3.729 0.242 +1437.7 -[1, 5000) -2.402 0.041 -5973.3 -[5000, 10000) -7.413 0.368 -2114.3 -[10000, 15000) -22.411 1.381 -1722.4 -[15000, 20000) -19.575 3.524 -655.5 -[20000, 25000) -10.028 6.191 -262.0 -[25000, 30000) -3.804 8.753 -143.5 -[30000, 40000) 11.438 25.168 -54.6 -[40000, 50000) 26.142 32.530 -19.6 -[50000, 75000) 97.223 99.792 -2.6 -[75000, 100000) 105.118 105.901 -0.7 -[100000, 200000) 329.752 316.350 +4.2 -[200000, 500000) 331.839 299.832 +10.7 -[500000, 1000000) 172.070 154.389 +11.5 -[1000000, 1500000) 75.630 66.324 +14.0 -[1500000, 2000000) 44.087 39.672 +11.1 -[2000000, 5000000) 114.164 101.489 +12.5 -[5000000, 10000000) 64.082 56.334 +13.8 -[10000000, 9e+99) 96.814 139.611 -30.7 -ALL 1406.456 1457.891 -3.5 +[-9e+99, 1) 4.502 0.242 +1756.7 +[1, 5000) -1.776 0.041 -4442.6 +[5000, 10000) -5.779 0.368 -1670.5 +[10000, 15000) -18.011 1.381 -1403.9 +[15000, 20000) -15.938 3.524 -552.3 +[20000, 25000) -7.806 6.191 -226.1 +[25000, 30000) -1.816 8.753 -120.7 +[30000, 40000) 14.520 25.168 -42.3 +[40000, 50000) 29.057 32.530 -10.7 +[50000, 75000) 103.019 99.792 +3.2 +[75000, 100000) 109.819 105.901 +3.7 +[100000, 200000) 339.089 316.350 +7.2 +[200000, 500000) 339.270 299.832 +13.2 +[500000, 1000000) 175.513 154.389 +13.7 +[1000000, 1500000) 76.857 66.324 +15.9 +[1500000, 2000000) 44.655 39.672 +12.6 +[2000000, 5000000) 115.347 101.489 +13.7 +[5000000, 10000000) 64.604 56.334 +14.7 +[10000000, 9e+99) 97.259 139.611 -30.3 +ALL 1462.385 1457.891 +0.3 TABLE for SETAX AGI category T-C SOI %diff [-9e+99, 1) 0.761 0.656 +16.1 diff --git a/taxcalc/tests/cpscsv_agg_expect.csv b/taxcalc/tests/cpscsv_agg_expect.csv index a4187a91a..60f302ffa 100644 --- a/taxcalc/tests/cpscsv_agg_expect.csv +++ b/taxcalc/tests/cpscsv_agg_expect.csv @@ -15,11 +15,11 @@ Tax before Credits ($b),1116.0,1380.4,1449.4,1497.9,1764.3,1838.0,1939.7,2018.7, Refundable Credits ($b),70.8,102.5,102.7,655.0,827.1,98.5,106.2,111.9,112.8,97.8 Nonrefundable Credits ($b),32.7,97.2,99.2,99.2,0.0,107.7,108.4,109.4,111.2,30.0 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -Other Taxes ($b),5.5,10.7,11.3,12.6,13.9,14.4,16.5,17.6,18.8,19.9 -Ind Income Tax ($b),1018.1,1191.4,1258.9,756.3,951.0,1646.2,1741.7,1815.1,1918.2,2256.9 -Payroll Taxes ($b),1040.8,1141.6,1194.9,1217.9,1318.7,1421.6,1509.2,1585.1,1660.8,1735.0 +Other Taxes ($b),61.3,70.4,72.7,75.9,82.3,87.9,91.9,97.0,102.3,107.8 +Ind Income Tax ($b),1073.9,1251.1,1320.2,819.6,1019.4,1719.7,1817.1,1894.4,2001.7,2344.7 +Payroll Taxes ($b),985.0,1081.8,1133.6,1154.6,1250.3,1348.0,1433.8,1505.8,1577.3,1647.1 Combined Liability ($b),2059.0,2333.0,2453.8,1974.2,2269.7,3067.8,3250.9,3400.2,3578.9,3991.9 -With Income Tax <= 0 (#m),88.1,96.2,97.0,135.4,127.8,96.1,97.8,99.1,99.6,97.3 +With Income Tax <= 0 (#m),86.2,94.6,95.3,133.1,126.0,94.5,96.1,97.4,97.9,95.7 With Combined Tax <= 0 (#m),62.8,65.4,66.4,98.2,97.7,67.9,69.3,70.4,71.3,70.7 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 "Total Benefits, Consumption Value ($b)",2790.7,3225.5,3429.9,3617.0,3993.0,4069.6,4390.5,4696.3,4983.2,5266.5 diff --git a/taxcalc/tests/puf_var_correl_coeffs_2016.csv b/taxcalc/tests/puf_var_correl_coeffs_2016.csv index c9d374373..8e3052e0f 100644 --- a/taxcalc/tests/puf_var_correl_coeffs_2016.csv +++ b/taxcalc/tests/puf_var_correl_coeffs_2016.csv @@ -1,42 +1,42 @@ ,c00100,c02500,c04470,c04600,c04800,c05200,c07180,c07220,c09600,c11070,c21040,cmbtp,data_source,e00200,e00300,e00400,e00600,e00650,e00700,e00800,e00900,e01100,e01200,e01400,e01500,e01700,e02000,e02100,e02300,e02400,e03150,e03210,e03220,e03230,e03240,e03270,e03290,e03300,e03400,e03500,e07240,e07260,e07300,e07400,e07600,e09700,e09800,e09900,e11200,e17500,e18400,e18500,e19200,e19800,e20100,e20400,e24515,e24518,e26270,e27200,e32800,e58990,e62900,e87521,e87530,eitc,elderly_dependents,g20500,iitax,k1bx14p,k1bx14s,nu06,nu13,p08000,p22250,p23250,payrolltax,pencon_p,pencon_s -c00100, 1.00, 0.09, 0.55, -0.21, 0.99, 0.99, -0.00, -0.05, 0.06, -0.05, 0.89, 0.02, 0.06, 0.44, 0.41, 0.25, 0.38, 0.33, 0.32, -0.00, 0.08, 0.01, 0.11, 0.10, 0.03, 0.05, 0.45, -0.03, -0.03, 0.04, 0.01, -0.03, -0.02, -0.02, 0.23, 0.15, 0.04, 0.07, 0.00, -0.00, -0.02, 0.04, 0.22, 0.16, 0.06, 0.01, -0.00, 0.00, 0.10, -0.01, 0.60, 0.45, 0.30, 0.32, 0.23, 0.39, 0.14, 0.09, 0.40, 0.01, -0.00, 0.06, 0.23, -0.04, -0.01, -0.05, -0.00, 0.00, 0.95, -0.09, -0.01, 0.00, 0.03, 0.02, 0.09, 0.77, 0.45, 0.18, 0.20 -c02500, 0.09, 1.00, 0.09, -0.13, 0.08, 0.08, -0.05, -0.08, 0.03, -0.08, 0.08, 0.02, 0.08, -0.00, 0.05, 0.13, 0.08, 0.07, 0.04, -0.00, 0.02, 0.00, 0.01, 0.16, 0.13, 0.22, 0.05, -0.01, -0.03, 0.80, 0.01, -0.05, -0.02, -0.02, 0.03, 0.05, -0.02, 0.01, -0.00, 0.00, -0.03, 0.01, 0.00, 0.02, 0.02, -0.00, -0.00, -0.01, 0.00, 0.14, 0.05, 0.17, 0.05, 0.07, 0.03, 0.08, 0.03, 0.01, 0.03, 0.03, -0.05, 0.02, 0.00, -0.06, -0.02, -0.08, -0.00, 0.00, 0.08, -0.02, -0.01, -0.10, -0.14, 0.01, -0.01, 0.05, -0.01, -0.06, 0.09 -c04470, 0.55, 0.09, 1.00, -0.14, 0.46, 0.46, -0.00, -0.04, 0.10, -0.04, 0.66, 0.02, 0.04, 0.30, 0.46, 0.27, 0.33, 0.29, 0.35, -0.00, 0.03, 0.00, 0.03, 0.07, 0.03, 0.05, 0.33, -0.04, -0.02, 0.05, 0.01, -0.02, -0.01, -0.01, 0.15, 0.11, 0.03, 0.06, 0.00, -0.00, -0.02, 0.03, 0.10, 0.13, 0.06, 0.00, -0.00, 0.01, 0.06, 0.02, 0.74, 0.42, 0.37, 0.63, 0.52, 0.53, 0.05, 0.04, 0.29, 0.00, -0.00, 0.08, 0.11, -0.03, -0.01, -0.04, -0.00, 0.01, 0.49, -0.05, -0.00, 0.00, 0.02, 0.01, 0.02, 0.29, 0.30, 0.12, 0.14 -c04600, -0.21, -0.13, -0.14, 1.00, -0.21, -0.20, 0.14, 0.50, -0.02, 0.42, -0.20, -0.01, 0.04, -0.17, -0.06, -0.09, -0.08, -0.07, -0.08, -0.00, -0.06, -0.01, -0.02, -0.07, -0.04, -0.06, -0.14, 0.02, 0.07, -0.10, -0.01, 0.09, 0.10, 0.05, -0.06, -0.13, -0.06, -0.11, -0.01, 0.01, 0.07, -0.02, -0.06, -0.04, -0.03, -0.01, 0.01, 0.01, -0.10, -0.00, -0.15, -0.25, -0.10, -0.07, -0.03, -0.09, -0.03, -0.01, -0.12, -0.01, 0.15, -0.03, -0.06, 0.19, 0.03, 0.32, 0.01, -0.01, -0.22, 0.06, 0.02, 0.35, 0.48, -0.01, -0.01, -0.10, -0.17, -0.18, -0.14 -c04800, 0.99, 0.08, 0.46, -0.21, 1.00, 1.00, -0.01, -0.05, 0.06, -0.05, 0.87, 0.04, 0.05, 0.44, 0.38, 0.24, 0.37, 0.32, 0.30, -0.00, 0.06, 0.01, 0.08, 0.10, 0.03, 0.05, 0.42, -0.03, -0.03, 0.03, 0.01, -0.03, -0.02, -0.01, 0.23, 0.15, 0.04, 0.07, 0.00, -0.01, -0.02, 0.04, 0.23, 0.15, 0.06, 0.01, -0.00, 0.00, 0.10, -0.01, 0.55, 0.43, 0.28, 0.25, 0.18, 0.36, 0.14, 0.09, 0.36, 0.01, -0.00, 0.06, 0.23, -0.04, -0.01, -0.06, -0.00, 0.00, 0.96, -0.09, -0.01, 0.00, 0.03, 0.02, 0.09, 0.79, 0.45, 0.18, 0.19 -c05200, 0.99, 0.08, 0.46, -0.20, 1.00, 1.00, -0.01, -0.05, 0.06, -0.05, 0.87, 0.04, 0.05, 0.43, 0.38, 0.24, 0.37, 0.32, 0.30, -0.00, 0.05, 0.01, 0.08, 0.10, 0.02, 0.05, 0.41, -0.03, -0.03, 0.03, 0.01, -0.03, -0.02, -0.01, 0.22, 0.14, 0.04, 0.07, 0.00, -0.01, -0.02, 0.04, 0.23, 0.15, 0.06, 0.01, -0.00, 0.00, 0.09, -0.01, 0.55, 0.42, 0.27, 0.25, 0.18, 0.36, 0.14, 0.09, 0.36, 0.01, -0.00, 0.06, 0.23, -0.04, -0.01, -0.05, -0.00, 0.00, 0.96, -0.08, -0.01, 0.00, 0.03, 0.02, 0.09, 0.79, 0.44, 0.17, 0.19 +c00100, 1.00, 0.09, 0.55, -0.21, 0.99, 0.99, -0.00, -0.05, 0.06, -0.05, 0.89, 0.02, 0.06, 0.44, 0.41, 0.25, 0.38, 0.33, 0.32, -0.00, 0.08, 0.01, 0.11, 0.10, 0.03, 0.05, 0.45, -0.03, -0.03, 0.04, 0.01, -0.03, -0.02, -0.02, 0.23, 0.15, 0.04, 0.07, 0.00, -0.00, -0.02, 0.04, 0.22, 0.16, 0.06, 0.01, -0.00, 0.00, 0.10, -0.01, 0.60, 0.45, 0.30, 0.32, 0.23, 0.39, 0.14, 0.09, 0.40, 0.01, -0.00, 0.06, 0.23, -0.04, -0.01, -0.05, -0.00, 0.00, 0.95, -0.09, -0.01, 0.00, 0.03, 0.02, 0.09, 0.77, 0.44, 0.18, 0.20 +c02500, 0.09, 1.00, 0.09, -0.13, 0.08, 0.08, -0.05, -0.08, 0.03, -0.08, 0.08, 0.02, 0.08, -0.00, 0.05, 0.13, 0.08, 0.07, 0.04, -0.00, 0.02, 0.00, 0.01, 0.16, 0.13, 0.22, 0.05, -0.01, -0.03, 0.80, 0.01, -0.05, -0.02, -0.02, 0.03, 0.05, -0.02, 0.01, -0.00, 0.00, -0.03, 0.01, 0.00, 0.02, 0.02, -0.00, -0.00, -0.01, 0.00, 0.14, 0.05, 0.17, 0.05, 0.07, 0.03, 0.08, 0.03, 0.01, 0.03, 0.03, -0.05, 0.02, 0.00, -0.06, -0.02, -0.08, -0.00, 0.00, 0.08, -0.02, -0.01, -0.10, -0.14, 0.01, -0.01, 0.05, -0.02, -0.06, 0.09 +c04470, 0.55, 0.09, 1.00, -0.14, 0.46, 0.46, -0.00, -0.04, 0.10, -0.04, 0.66, 0.02, 0.04, 0.30, 0.46, 0.27, 0.33, 0.29, 0.35, -0.00, 0.03, 0.00, 0.03, 0.07, 0.03, 0.05, 0.33, -0.04, -0.02, 0.05, 0.01, -0.02, -0.01, -0.01, 0.15, 0.11, 0.03, 0.06, 0.00, -0.00, -0.02, 0.03, 0.10, 0.13, 0.06, 0.00, -0.00, 0.01, 0.06, 0.02, 0.74, 0.42, 0.37, 0.63, 0.52, 0.53, 0.05, 0.04, 0.29, 0.00, -0.00, 0.08, 0.11, -0.03, -0.01, -0.04, -0.00, 0.01, 0.49, -0.05, -0.00, 0.00, 0.02, 0.01, 0.02, 0.29, 0.29, 0.12, 0.14 +c04600, -0.21, -0.13, -0.14, 1.00, -0.21, -0.20, 0.14, 0.50, -0.02, 0.42, -0.20, -0.01, 0.04, -0.17, -0.06, -0.09, -0.08, -0.07, -0.08, -0.00, -0.06, -0.01, -0.02, -0.07, -0.04, -0.06, -0.14, 0.02, 0.07, -0.10, -0.01, 0.09, 0.10, 0.05, -0.06, -0.13, -0.06, -0.11, -0.01, 0.01, 0.07, -0.02, -0.06, -0.04, -0.03, -0.01, 0.01, 0.01, -0.10, -0.00, -0.15, -0.25, -0.10, -0.07, -0.03, -0.09, -0.03, -0.01, -0.12, -0.01, 0.15, -0.03, -0.06, 0.19, 0.03, 0.32, 0.01, -0.01, -0.22, 0.06, 0.02, 0.35, 0.48, -0.01, -0.01, -0.10, -0.16, -0.18, -0.14 +c04800, 0.99, 0.08, 0.46, -0.21, 1.00, 1.00, -0.01, -0.05, 0.06, -0.05, 0.87, 0.04, 0.05, 0.44, 0.38, 0.24, 0.37, 0.32, 0.30, -0.00, 0.06, 0.01, 0.08, 0.10, 0.03, 0.05, 0.42, -0.03, -0.03, 0.03, 0.01, -0.03, -0.02, -0.01, 0.23, 0.15, 0.04, 0.07, 0.00, -0.01, -0.02, 0.04, 0.23, 0.15, 0.06, 0.01, -0.00, 0.00, 0.10, -0.01, 0.55, 0.43, 0.28, 0.25, 0.18, 0.36, 0.14, 0.09, 0.36, 0.01, -0.00, 0.06, 0.23, -0.04, -0.01, -0.06, -0.00, 0.00, 0.96, -0.09, -0.01, 0.00, 0.03, 0.02, 0.09, 0.79, 0.44, 0.18, 0.19 +c05200, 0.99, 0.08, 0.46, -0.20, 1.00, 1.00, -0.01, -0.05, 0.06, -0.05, 0.87, 0.04, 0.05, 0.43, 0.38, 0.24, 0.37, 0.32, 0.30, -0.00, 0.05, 0.01, 0.08, 0.10, 0.02, 0.05, 0.41, -0.03, -0.03, 0.03, 0.01, -0.03, -0.02, -0.01, 0.22, 0.14, 0.04, 0.07, 0.00, -0.01, -0.02, 0.04, 0.23, 0.15, 0.06, 0.01, -0.00, 0.00, 0.09, -0.01, 0.55, 0.42, 0.27, 0.25, 0.18, 0.36, 0.14, 0.09, 0.36, 0.01, -0.00, 0.06, 0.23, -0.04, -0.01, -0.05, -0.00, 0.00, 0.95, -0.08, -0.01, 0.00, 0.03, 0.02, 0.09, 0.79, 0.43, 0.17, 0.19 c07180, -0.00, -0.05, -0.00, 0.14, -0.01, -0.01, 1.00, 0.19, -0.01, 0.05, -0.01, -0.00, 0.04, 0.01, -0.01, -0.01, -0.01, -0.01, -0.00, -0.00, 0.00, -0.00, 0.00, -0.01, -0.01, -0.02, -0.00, 0.00, -0.01, -0.06, -0.00, 0.03, 0.05, 0.00, -0.01, 0.01, 0.00, 0.01, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.01, -0.01, -0.00, 0.00, 0.01, -0.01, -0.00, -0.01, -0.00, 0.00, 0.00, -0.00, 0.86, -0.00, -0.00, -0.00, 0.01, 0.00, -0.00, -0.00, -0.01, 0.01, 0.00, 0.09, 0.15, 0.00, 0.00, -0.01, 0.04, 0.05, 0.04 -c07220, -0.05, -0.08, -0.04, 0.50, -0.05, -0.05, 0.19, 1.00, -0.00, 0.03, -0.05, 0.00, 0.08, -0.04, -0.02, -0.03, -0.02, -0.02, -0.02, -0.00, -0.01, -0.00, 0.00, -0.02, -0.03, -0.04, -0.03, 0.01, 0.02, -0.12, -0.01, 0.09, 0.08, 0.00, -0.02, -0.05, -0.02, -0.04, -0.00, -0.00, 0.05, -0.01, -0.01, -0.01, -0.01, -0.00, -0.00, 0.00, -0.03, -0.01, -0.04, -0.07, -0.02, -0.02, -0.01, -0.02, -0.01, -0.00, -0.03, -0.01, 0.22, -0.01, -0.01, 0.00, 0.02, -0.01, -0.00, -0.00, -0.06, 0.02, 0.00, 0.23, 0.35, -0.00, 0.00, -0.02, -0.02, -0.04, -0.03 +c07220, -0.05, -0.08, -0.04, 0.50, -0.05, -0.05, 0.19, 1.00, -0.00, 0.03, -0.05, 0.00, 0.08, -0.04, -0.02, -0.03, -0.02, -0.02, -0.02, -0.00, -0.01, -0.00, 0.00, -0.02, -0.03, -0.04, -0.03, 0.01, 0.02, -0.12, -0.01, 0.09, 0.08, 0.00, -0.02, -0.05, -0.02, -0.04, -0.00, -0.00, 0.05, -0.01, -0.01, -0.01, -0.01, -0.00, -0.00, 0.00, -0.03, -0.01, -0.04, -0.07, -0.02, -0.02, -0.01, -0.02, -0.01, -0.00, -0.03, -0.01, 0.22, -0.01, -0.01, 0.00, 0.02, -0.01, -0.00, -0.00, -0.06, 0.02, 0.00, 0.23, 0.35, -0.00, 0.00, -0.02, -0.01, -0.04, -0.03 c09600, 0.06, 0.03, 0.10, -0.02, 0.06, 0.06, -0.01, -0.00, 1.00, -0.01, 0.05, 0.96, 0.01, 0.01, 0.07, 0.06, 0.07, 0.06, 0.05, -0.00, -0.06, -0.00, 0.01, 0.01, 0.00, 0.01, -0.02, -0.01, -0.01, 0.02, -0.00, -0.01, -0.01, -0.00, 0.00, 0.01, 0.00, -0.00, 0.00, -0.00, -0.00, 0.00, 0.00, 0.01, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.10, 0.04, 0.04, 0.02, 0.02, 0.09, 0.09, 0.01, -0.04, 0.00, -0.01, 0.03, 0.01, -0.00, 0.00, -0.01, -0.00, 0.00, 0.26, -0.00, 0.00, -0.00, -0.00, 0.01, -0.00, 0.07, 0.01, 0.00, 0.01 -c11070, -0.05, -0.08, -0.04, 0.42, -0.05, -0.05, 0.05, 0.03, -0.01, 1.00, -0.04, -0.01, 0.08, -0.05, -0.01, -0.02, -0.02, -0.02, -0.02, -0.01, -0.01, -0.00, -0.02, -0.02, -0.03, -0.04, -0.04, -0.00, 0.02, -0.10, -0.03, -0.02, -0.02, 0.00, -0.01, -0.04, -0.03, -0.03, -0.00, -0.01, 0.04, -0.01, -0.01, -0.01, -0.01, -0.00, 0.02, -0.01, -0.03, -0.02, -0.04, -0.08, -0.04, -0.02, -0.01, -0.02, -0.01, -0.00, -0.03, -0.00, 0.05, -0.01, -0.01, 0.06, -0.01, 0.69, -0.00, -0.00, -0.05, 0.02, 0.01, 0.26, 0.37, -0.00, -0.00, -0.02, -0.07, -0.09, -0.08 -c21040, 0.89, 0.08, 0.66, -0.20, 0.87, 0.87, -0.01, -0.05, 0.05, -0.04, 1.00, 0.02, 0.05, 0.48, 0.47, 0.27, 0.38, 0.32, 0.38, -0.00, 0.06, 0.01, 0.07, 0.10, 0.02, 0.05, 0.46, -0.03, -0.03, 0.04, 0.01, -0.03, -0.02, -0.01, 0.24, 0.15, 0.04, 0.08, 0.01, -0.01, -0.02, 0.05, 0.21, 0.17, 0.06, 0.00, -0.00, 0.00, 0.09, -0.01, 0.71, 0.48, 0.34, 0.37, 0.28, 0.45, 0.11, 0.08, 0.41, 0.01, -0.01, 0.07, 0.22, -0.04, -0.01, -0.05, -0.00, 0.00, 0.87, -0.08, -0.01, 0.00, 0.03, 0.02, 0.07, 0.59, 0.48, 0.17, 0.19 +c11070, -0.05, -0.08, -0.04, 0.42, -0.05, -0.05, 0.05, 0.03, -0.01, 1.00, -0.04, -0.01, 0.08, -0.05, -0.01, -0.02, -0.02, -0.02, -0.02, -0.01, -0.01, -0.00, -0.02, -0.02, -0.03, -0.04, -0.04, -0.00, 0.02, -0.10, -0.03, -0.02, -0.02, 0.00, -0.01, -0.04, -0.03, -0.03, -0.00, -0.01, 0.04, -0.01, -0.01, -0.01, -0.01, -0.00, 0.02, -0.01, -0.03, -0.02, -0.04, -0.08, -0.04, -0.02, -0.01, -0.02, -0.01, -0.00, -0.03, -0.00, 0.05, -0.01, -0.01, 0.06, -0.01, 0.69, -0.00, -0.00, -0.05, 0.02, 0.01, 0.26, 0.37, -0.00, -0.00, -0.02, -0.08, -0.09, -0.08 +c21040, 0.89, 0.08, 0.66, -0.20, 0.87, 0.87, -0.01, -0.05, 0.05, -0.04, 1.00, 0.02, 0.05, 0.48, 0.47, 0.27, 0.38, 0.32, 0.38, -0.00, 0.06, 0.01, 0.07, 0.10, 0.02, 0.05, 0.46, -0.03, -0.03, 0.04, 0.01, -0.03, -0.02, -0.01, 0.24, 0.15, 0.04, 0.08, 0.01, -0.01, -0.02, 0.05, 0.21, 0.17, 0.06, 0.00, -0.00, 0.00, 0.09, -0.01, 0.71, 0.48, 0.34, 0.37, 0.28, 0.45, 0.11, 0.08, 0.41, 0.01, -0.01, 0.07, 0.22, -0.04, -0.01, -0.05, -0.00, 0.00, 0.87, -0.08, -0.01, 0.00, 0.03, 0.02, 0.07, 0.59, 0.46, 0.17, 0.19 cmbtp, 0.02, 0.02, 0.02, -0.01, 0.04, 0.04, -0.00, 0.00, 0.96, -0.01, 0.02, 1.00, 0.01, 0.01, 0.07, 0.03, 0.04, 0.04, 0.03, -0.00, -0.06, -0.00, -0.02, 0.01, -0.00, 0.00, -0.03, -0.01, -0.00, 0.02, -0.00, -0.00, -0.00, 0.00, 0.01, 0.01, 0.00, -0.00, 0.00, -0.00, 0.00, 0.00, 0.00, 0.00, -0.01, 0.00, -0.00, 0.00, -0.00, -0.00, 0.01, 0.00, 0.01, 0.01, 0.01, 0.02, 0.07, 0.00, -0.05, 0.00, -0.01, 0.02, 0.01, 0.00, 0.00, -0.01, -0.00, 0.00, 0.24, 0.00, -0.00, -0.00, -0.00, 0.01, 0.01, 0.03, 0.01, 0.00, 0.00 -data_source, 0.06, 0.08, 0.04, 0.04, 0.05, 0.05, 0.04, 0.08, 0.01, 0.08, 0.05, 0.01, 1.00, 0.06, 0.02, 0.03, 0.02, 0.02, 0.02, 0.01, 0.02, 0.01, -0.00, 0.02, 0.03, 0.04, 0.03, -0.00, 0.06, -0.12, 0.03, 0.05, 0.04, 0.02, 0.02, 0.07, 0.03, 0.04, 0.00, 0.01, 0.04, 0.01, 0.01, 0.01, 0.01, 0.00, 0.00, 0.01, 0.03, 0.03, 0.04, 0.08, 0.05, 0.02, 0.01, 0.03, 0.01, 0.00, 0.02, 0.01, 0.05, 0.01, 0.01, 0.07, 0.02, 0.08, -0.02, 0.00, 0.05, -0.02, -0.00, 0.06, 0.09, 0.01, -0.00, 0.02, 0.11, 0.12, 0.09 -e00200, 0.44, -0.00, 0.30, -0.17, 0.44, 0.43, 0.01, -0.04, 0.01, -0.05, 0.48, 0.01, 0.06, 1.00, 0.07, 0.10, 0.09, 0.08, 0.16, -0.01, 0.02, 0.01, 0.01, 0.04, 0.03, 0.03, 0.07, -0.02, -0.02, -0.03, 0.00, -0.02, -0.01, -0.01, 0.03, 0.02, 0.01, 0.01, 0.00, -0.00, -0.02, 0.02, 0.16, 0.04, 0.03, 0.00, -0.00, -0.00, 0.16, -0.02, 0.41, 0.33, 0.11, 0.11, 0.12, 0.13, 0.00, 0.02, 0.06, -0.00, 0.02, 0.01, 0.16, -0.04, -0.01, -0.05, -0.00, 0.00, 0.50, -0.04, -0.00, 0.02, 0.06, 0.01, 0.01, 0.08, 0.98, 0.32, 0.32 +data_source, 0.06, 0.08, 0.04, 0.04, 0.05, 0.05, 0.04, 0.08, 0.01, 0.08, 0.05, 0.01, 1.00, 0.06, 0.02, 0.03, 0.02, 0.02, 0.02, 0.01, 0.02, 0.01, -0.00, 0.02, 0.03, 0.04, 0.03, -0.00, 0.06, -0.12, 0.03, 0.05, 0.04, 0.02, 0.02, 0.07, 0.03, 0.04, 0.00, 0.01, 0.04, 0.01, 0.01, 0.01, 0.01, 0.00, 0.00, 0.01, 0.03, 0.03, 0.04, 0.08, 0.05, 0.02, 0.01, 0.03, 0.01, 0.00, 0.02, 0.01, 0.05, 0.01, 0.01, 0.07, 0.02, 0.08, -0.02, 0.00, 0.06, -0.02, -0.00, 0.06, 0.09, 0.01, -0.00, 0.02, 0.12, 0.12, 0.09 +e00200, 0.44, -0.00, 0.30, -0.17, 0.44, 0.43, 0.01, -0.04, 0.01, -0.05, 0.48, 0.01, 0.06, 1.00, 0.07, 0.10, 0.09, 0.08, 0.16, -0.01, 0.02, 0.01, 0.01, 0.04, 0.03, 0.03, 0.07, -0.02, -0.02, -0.03, 0.00, -0.02, -0.01, -0.01, 0.03, 0.02, 0.01, 0.01, 0.00, -0.00, -0.02, 0.02, 0.16, 0.04, 0.03, 0.00, -0.00, -0.00, 0.16, -0.02, 0.41, 0.33, 0.11, 0.11, 0.12, 0.13, 0.00, 0.02, 0.06, -0.00, 0.02, 0.01, 0.16, -0.04, -0.01, -0.05, -0.00, 0.00, 0.51, -0.04, -0.00, 0.02, 0.06, 0.01, 0.01, 0.08, 0.97, 0.32, 0.32 e00300, 0.41, 0.05, 0.46, -0.06, 0.38, 0.38, -0.01, -0.02, 0.07, -0.01, 0.47, 0.07, 0.02, 0.07, 1.00, 0.23, 0.27, 0.21, 0.26, -0.00, 0.00, 0.00, 0.02, 0.04, 0.01, 0.03, 0.11, -0.01, -0.01, 0.04, 0.00, -0.01, -0.01, -0.00, 0.11, 0.05, 0.01, 0.01, 0.02, -0.00, -0.01, 0.04, 0.10, 0.08, 0.04, 0.00, -0.00, -0.00, 0.02, -0.00, 0.39, 0.25, 0.35, 0.25, 0.18, 0.41, 0.05, 0.01, 0.07, 0.00, -0.01, 0.09, 0.11, -0.01, -0.00, -0.02, -0.00, 0.00, 0.40, -0.01, -0.00, -0.01, -0.00, 0.01, 0.05, 0.26, 0.07, 0.04, 0.05 -e00400, 0.25, 0.13, 0.27, -0.09, 0.24, 0.24, -0.01, -0.03, 0.06, -0.02, 0.27, 0.03, 0.03, 0.10, 0.23, 1.00, 0.25, 0.23, 0.14, -0.00, 0.01, -0.00, 0.01, 0.07, 0.02, 0.07, 0.10, -0.01, -0.02, 0.09, 0.00, -0.02, -0.01, -0.01, 0.09, 0.05, 0.02, 0.02, -0.00, -0.00, -0.01, 0.03, 0.06, 0.04, 0.08, 0.00, -0.00, -0.00, 0.02, 0.04, 0.22, 0.30, 0.12, 0.18, 0.11, 0.29, 0.03, 0.04, 0.08, 0.01, -0.01, 0.02, 0.06, -0.02, -0.00, -0.03, -0.00, 0.00, 0.24, -0.02, -0.00, -0.01, -0.01, 0.02, -0.00, 0.16, 0.10, 0.03, 0.06 -e00600, 0.38, 0.08, 0.33, -0.08, 0.37, 0.37, -0.01, -0.02, 0.07, -0.02, 0.38, 0.04, 0.02, 0.09, 0.27, 0.25, 1.00, 0.94, 0.13, -0.00, -0.01, 0.01, 0.02, 0.05, 0.01, 0.04, 0.06, -0.04, -0.01, 0.05, 0.00, -0.01, -0.01, -0.01, 0.07, 0.04, 0.01, 0.01, 0.00, -0.00, -0.01, 0.02, 0.17, 0.04, 0.01, 0.00, -0.00, -0.00, 0.02, 0.01, 0.25, 0.26, 0.22, 0.18, 0.17, 0.34, 0.02, 0.02, 0.04, 0.01, -0.01, 0.05, 0.17, -0.02, -0.00, -0.02, -0.00, 0.00, 0.34, -0.02, 0.00, -0.01, -0.01, 0.01, 0.02, 0.20, 0.10, 0.04, 0.06 -e00650, 0.33, 0.07, 0.29, -0.07, 0.32, 0.32, -0.01, -0.02, 0.06, -0.02, 0.32, 0.04, 0.02, 0.08, 0.21, 0.23, 0.94, 1.00, 0.11, -0.00, -0.01, 0.01, 0.02, 0.05, 0.01, 0.03, 0.05, -0.04, -0.01, 0.05, 0.00, -0.01, -0.01, -0.01, 0.07, 0.03, 0.01, 0.01, -0.00, -0.00, -0.01, 0.01, 0.15, 0.03, 0.01, 0.00, -0.00, -0.00, 0.01, 0.01, 0.21, 0.22, 0.15, 0.16, 0.16, 0.27, 0.01, 0.02, 0.03, 0.01, -0.01, 0.05, 0.15, -0.01, -0.00, -0.02, -0.00, 0.00, 0.28, -0.01, 0.00, -0.01, -0.01, 0.01, 0.01, 0.16, 0.09, 0.03, 0.05 -e00700, 0.32, 0.04, 0.35, -0.08, 0.30, 0.30, -0.00, -0.02, 0.05, -0.02, 0.38, 0.03, 0.02, 0.16, 0.26, 0.14, 0.13, 0.11, 1.00, -0.00, 0.01, 0.00, 0.00, 0.05, 0.01, 0.02, 0.31, -0.01, -0.01, 0.02, 0.01, -0.01, -0.01, -0.01, 0.22, 0.10, 0.02, 0.04, 0.00, -0.00, -0.01, 0.02, 0.12, 0.16, 0.05, 0.00, -0.00, 0.00, 0.05, -0.01, 0.46, 0.22, 0.13, 0.16, 0.05, 0.14, 0.02, 0.00, 0.27, 0.01, -0.00, 0.02, 0.12, -0.02, -0.01, -0.02, -0.00, 0.00, 0.33, -0.02, 0.00, 0.00, 0.01, 0.01, 0.03, 0.10, 0.17, 0.08, 0.08 -e00800, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, 0.01, -0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 1.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.01, 0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.01, -0.00, -0.01, -0.00, -0.00, -0.00, 0.00, 0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.01, -0.01, -0.01 -e00900, 0.08, 0.02, 0.03, -0.06, 0.06, 0.05, 0.00, -0.01, -0.06, -0.01, 0.06, -0.06, 0.02, 0.02, 0.00, 0.01, -0.01, -0.01, 0.01, -0.00, 1.00, 0.01, -0.01, 0.01, 0.00, 0.01, -0.01, 0.01, -0.01, 0.00, 0.02, -0.01, -0.00, -0.02, -0.01, 0.12, 0.04, 0.20, -0.00, -0.00, -0.01, 0.00, 0.04, -0.02, 0.00, 0.00, -0.00, -0.00, 0.01, -0.00, 0.04, 0.08, 0.03, 0.02, 0.00, 0.02, 0.01, -0.00, -0.01, -0.00, 0.01, -0.00, 0.04, -0.01, -0.00, -0.01, -0.00, 0.00, 0.05, -0.73, -0.25, 0.00, 0.01, 0.00, -0.00, 0.00, 0.03, 0.00, 0.02 +e00400, 0.25, 0.13, 0.27, -0.09, 0.24, 0.24, -0.01, -0.03, 0.06, -0.02, 0.27, 0.03, 0.03, 0.10, 0.23, 1.00, 0.25, 0.23, 0.14, -0.00, 0.01, -0.00, 0.01, 0.07, 0.02, 0.07, 0.10, -0.01, -0.02, 0.09, 0.00, -0.02, -0.01, -0.01, 0.09, 0.05, 0.02, 0.02, -0.00, -0.00, -0.01, 0.03, 0.06, 0.04, 0.08, 0.00, -0.00, -0.00, 0.02, 0.04, 0.22, 0.30, 0.12, 0.18, 0.11, 0.29, 0.03, 0.04, 0.08, 0.01, -0.01, 0.02, 0.06, -0.02, -0.00, -0.03, -0.00, 0.00, 0.24, -0.02, -0.00, -0.01, -0.01, 0.02, -0.00, 0.16, 0.09, 0.03, 0.06 +e00600, 0.38, 0.08, 0.33, -0.08, 0.37, 0.37, -0.01, -0.02, 0.07, -0.02, 0.38, 0.04, 0.02, 0.09, 0.27, 0.25, 1.00, 0.94, 0.13, -0.00, -0.01, 0.01, 0.02, 0.05, 0.01, 0.04, 0.06, -0.04, -0.01, 0.05, 0.00, -0.01, -0.01, -0.01, 0.07, 0.04, 0.01, 0.01, 0.00, -0.00, -0.01, 0.02, 0.17, 0.04, 0.01, 0.00, -0.00, -0.00, 0.02, 0.01, 0.25, 0.26, 0.22, 0.18, 0.17, 0.34, 0.02, 0.02, 0.04, 0.01, -0.01, 0.05, 0.17, -0.02, -0.00, -0.02, -0.00, 0.00, 0.34, -0.02, 0.00, -0.01, -0.01, 0.01, 0.02, 0.20, 0.09, 0.04, 0.06 +e00650, 0.33, 0.07, 0.29, -0.07, 0.32, 0.32, -0.01, -0.02, 0.06, -0.02, 0.32, 0.04, 0.02, 0.08, 0.21, 0.23, 0.94, 1.00, 0.11, -0.00, -0.01, 0.01, 0.02, 0.05, 0.01, 0.03, 0.05, -0.04, -0.01, 0.05, 0.00, -0.01, -0.01, -0.01, 0.07, 0.03, 0.01, 0.01, -0.00, -0.00, -0.01, 0.01, 0.15, 0.03, 0.01, 0.00, -0.00, -0.00, 0.01, 0.01, 0.21, 0.22, 0.15, 0.16, 0.16, 0.27, 0.01, 0.02, 0.03, 0.01, -0.01, 0.05, 0.15, -0.01, -0.00, -0.02, -0.00, 0.00, 0.28, -0.01, 0.00, -0.01, -0.01, 0.01, 0.01, 0.16, 0.08, 0.03, 0.05 +e00700, 0.32, 0.04, 0.35, -0.08, 0.30, 0.30, -0.00, -0.02, 0.05, -0.02, 0.38, 0.03, 0.02, 0.16, 0.26, 0.14, 0.13, 0.11, 1.00, -0.00, 0.01, 0.00, 0.00, 0.05, 0.01, 0.02, 0.31, -0.01, -0.01, 0.02, 0.01, -0.01, -0.01, -0.01, 0.22, 0.10, 0.02, 0.04, 0.00, -0.00, -0.01, 0.02, 0.12, 0.16, 0.05, 0.00, -0.00, 0.00, 0.05, -0.01, 0.46, 0.22, 0.13, 0.16, 0.05, 0.14, 0.02, 0.00, 0.27, 0.01, -0.00, 0.02, 0.12, -0.02, -0.01, -0.02, -0.00, 0.00, 0.33, -0.02, 0.00, 0.00, 0.01, 0.01, 0.03, 0.10, 0.16, 0.08, 0.08 +e00800, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, 0.01, -0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 1.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.01, 0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.01, -0.00, -0.01, -0.00, -0.00, -0.01, 0.00, 0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.01, -0.01, -0.01 +e00900, 0.08, 0.02, 0.03, -0.06, 0.06, 0.05, 0.00, -0.01, -0.06, -0.01, 0.06, -0.06, 0.02, 0.02, 0.00, 0.01, -0.01, -0.01, 0.01, -0.00, 1.00, 0.01, -0.01, 0.01, 0.00, 0.01, -0.01, 0.01, -0.01, 0.00, 0.02, -0.01, -0.00, -0.02, -0.01, 0.12, 0.04, 0.20, -0.00, -0.00, -0.01, 0.00, 0.04, -0.02, 0.00, 0.00, -0.00, -0.00, 0.01, -0.00, 0.04, 0.08, 0.03, 0.02, 0.00, 0.02, 0.01, -0.00, -0.01, -0.00, 0.01, -0.00, 0.04, -0.01, -0.00, -0.01, -0.00, 0.00, 0.05, -0.73, -0.25, 0.00, 0.01, 0.00, -0.00, 0.00, 0.02, 0.00, 0.02 e01100, 0.01, 0.00, 0.00, -0.01, 0.01, 0.01, -0.00, -0.00, -0.00, -0.00, 0.01, -0.00, 0.01, 0.01, 0.00, -0.00, 0.01, 0.01, 0.00, -0.00, 0.01, 1.00, 0.00, 0.00, 0.00, 0.00, 0.01, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, 0.02, 0.01, 0.00, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.01, 0.00, -0.00, -0.00, -0.00, 0.00, -0.00, 0.01, 0.01, -0.00, 0.00, -0.00, 0.00, -0.00, -0.00, 0.01, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, 0.00, 0.01, -0.01, 0.00, -0.00, -0.00, -0.00, 0.00, -0.00, 0.01, 0.01, 0.00 e01200, 0.11, 0.01, 0.03, -0.02, 0.08, 0.08, 0.00, 0.00, 0.01, -0.02, 0.07, -0.02, -0.00, 0.01, 0.02, 0.01, 0.02, 0.02, 0.00, 0.00, -0.01, 0.00, 1.00, -0.00, 0.00, -0.00, -0.03, 0.01, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.01, -0.01, -0.01, 0.00, 0.00, 0.00, 0.00, -0.00, -0.00, -0.01, 0.00, -0.00, 0.00, -0.00, -0.01, 0.00, 0.02, 0.03, 0.05, 0.03, 0.02, 0.03, 0.01, -0.00, -0.02, 0.01, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.00, 0.07, 0.00, 0.00, -0.00, -0.00, 0.00, -0.00, 0.05, 0.01, 0.00, 0.00 e01400, 0.10, 0.16, 0.07, -0.07, 0.10, 0.10, -0.01, -0.02, 0.01, -0.02, 0.10, 0.01, 0.02, 0.04, 0.04, 0.07, 0.05, 0.05, 0.05, -0.00, 0.01, 0.00, -0.00, 1.00, 0.05, 0.05, 0.02, -0.00, -0.01, 0.12, 0.00, -0.01, -0.01, -0.01, 0.01, 0.04, 0.03, 0.02, 0.00, -0.00, -0.01, 0.02, 0.02, 0.01, 0.02, 0.00, -0.00, 0.12, 0.01, 0.02, 0.07, 0.13, 0.04, 0.03, 0.03, 0.07, 0.00, 0.00, 0.01, 0.00, -0.01, 0.01, 0.02, -0.02, -0.01, -0.02, -0.00, 0.01, 0.10, -0.01, -0.01, -0.02, -0.02, 0.00, -0.00, 0.04, 0.04, 0.02, 0.04 e01500, 0.03, 0.13, 0.03, -0.04, 0.03, 0.02, -0.01, -0.03, 0.00, -0.03, 0.02, -0.00, 0.03, 0.03, 0.01, 0.02, 0.01, 0.01, 0.01, -0.00, 0.00, 0.00, 0.00, 0.05, 1.00, 0.24, 0.00, -0.01, 0.01, 0.10, 0.00, -0.02, -0.00, -0.01, -0.00, 0.02, 0.02, 0.02, -0.00, -0.00, -0.01, 0.01, 0.00, 0.00, 0.00, -0.00, -0.00, 0.03, 0.04, 0.02, 0.03, 0.06, 0.02, 0.02, 0.00, 0.02, -0.00, 0.00, 0.00, -0.00, -0.01, 0.01, 0.00, -0.02, -0.01, -0.03, -0.00, 0.00, 0.03, -0.00, -0.00, -0.02, -0.03, -0.00, -0.00, 0.01, 0.04, 0.04, 0.07 e01700, 0.05, 0.22, 0.05, -0.06, 0.05, 0.05, -0.02, -0.04, 0.01, -0.04, 0.05, 0.00, 0.04, 0.03, 0.03, 0.07, 0.04, 0.03, 0.02, -0.00, 0.01, 0.00, -0.00, 0.05, 0.24, 1.00, -0.00, -0.01, -0.01, 0.18, -0.00, -0.02, 0.00, -0.01, 0.00, 0.01, -0.00, 0.01, -0.00, 0.00, -0.02, 0.01, 0.01, 0.01, 0.00, 0.00, -0.00, 0.07, 0.02, 0.04, 0.04, 0.09, 0.03, 0.03, 0.02, 0.05, 0.00, 0.00, -0.00, 0.00, -0.02, 0.01, 0.01, -0.03, -0.01, -0.04, -0.00, 0.00, 0.05, -0.01, -0.00, -0.04, -0.05, 0.00, -0.01, 0.02, 0.03, 0.00, 0.04 -e02000, 0.45, 0.05, 0.33, -0.14, 0.42, 0.41, -0.00, -0.03, -0.02, -0.04, 0.46, -0.03, 0.03, 0.07, 0.11, 0.10, 0.06, 0.05, 0.31, -0.00, -0.01, 0.01, -0.03, 0.02, 0.00, -0.00, 1.00, -0.04, -0.02, 0.01, 0.02, -0.02, -0.01, -0.01, 0.43, 0.19, 0.05, 0.11, 0.00, -0.00, -0.01, 0.01, 0.13, 0.28, 0.08, 0.00, -0.00, -0.00, 0.04, -0.01, 0.38, 0.22, 0.10, 0.25, 0.12, 0.07, -0.04, -0.01, 0.97, 0.01, 0.00, -0.02, 0.14, -0.03, -0.01, -0.03, -0.00, 0.00, 0.49, 0.01, 0.02, 0.01, 0.02, 0.01, -0.05, 0.01, 0.09, 0.08, 0.07 +e02000, 0.45, 0.05, 0.33, -0.14, 0.42, 0.41, -0.00, -0.03, -0.02, -0.04, 0.46, -0.03, 0.03, 0.07, 0.11, 0.10, 0.06, 0.05, 0.31, -0.00, -0.01, 0.01, -0.03, 0.02, 0.00, -0.00, 1.00, -0.04, -0.02, 0.01, 0.02, -0.02, -0.01, -0.01, 0.43, 0.19, 0.05, 0.11, 0.00, -0.00, -0.01, 0.01, 0.13, 0.28, 0.08, 0.00, -0.00, -0.00, 0.04, -0.01, 0.38, 0.22, 0.10, 0.25, 0.12, 0.07, -0.04, -0.01, 0.97, 0.01, 0.00, -0.02, 0.14, -0.03, -0.01, -0.03, -0.00, 0.00, 0.48, 0.01, 0.02, 0.01, 0.02, 0.01, -0.05, 0.01, 0.08, 0.08, 0.07 e02100, -0.03, -0.01, -0.04, 0.02, -0.03, -0.03, 0.00, 0.01, -0.01, -0.00, -0.03, -0.01, -0.00, -0.02, -0.01, -0.01, -0.04, -0.04, -0.01, 0.00, 0.01, 0.00, 0.01, -0.00, -0.01, -0.01, -0.04, 1.00, 0.00, -0.01, 0.02, -0.00, 0.00, -0.00, -0.00, 0.03, 0.01, 0.01, -0.00, -0.00, -0.00, 0.00, -0.00, -0.02, -0.00, -0.00, -0.00, -0.03, -0.00, 0.00, -0.02, -0.02, -0.01, -0.03, -0.03, -0.03, -0.02, 0.00, -0.04, 0.00, 0.00, -0.04, -0.00, 0.00, 0.00, 0.00, 0.00, 0.00, -0.03, -0.06, -0.06, 0.00, 0.00, 0.00, -0.00, -0.02, -0.02, -0.01, -0.01 e02300, -0.03, -0.03, -0.02, 0.07, -0.03, -0.03, -0.01, 0.02, -0.01, 0.02, -0.03, -0.00, 0.06, -0.02, -0.01, -0.02, -0.01, -0.01, -0.01, -0.00, -0.01, -0.00, -0.00, -0.01, 0.01, -0.01, -0.02, 0.00, 1.00, -0.04, -0.00, 0.01, -0.00, 0.01, -0.01, -0.04, -0.02, -0.02, -0.00, 0.00, 0.00, -0.00, -0.01, -0.01, -0.00, -0.00, -0.00, 0.02, -0.01, 0.00, -0.02, -0.04, -0.02, -0.01, -0.01, -0.01, -0.01, -0.00, -0.02, -0.00, 0.00, -0.00, -0.01, 0.05, 0.00, 0.03, -0.00, -0.00, -0.03, 0.01, 0.00, 0.01, 0.01, -0.00, 0.00, -0.01, -0.03, -0.04, -0.02 -e02400, 0.04, 0.80, 0.05, -0.10, 0.03, 0.03, -0.06, -0.12, 0.02, -0.10, 0.04, 0.02, -0.12, -0.03, 0.04, 0.09, 0.05, 0.05, 0.02, -0.01, 0.00, -0.00, -0.00, 0.12, 0.10, 0.18, 0.01, -0.01, -0.04, 1.00, -0.01, -0.07, -0.04, -0.03, 0.02, 0.01, -0.04, -0.01, -0.00, -0.00, -0.04, 0.00, -0.01, 0.01, 0.01, 0.00, -0.01, -0.02, -0.02, 0.12, 0.02, 0.10, 0.02, 0.05, 0.02, 0.05, 0.02, 0.01, -0.00, 0.02, -0.07, 0.01, -0.01, -0.09, -0.03, -0.11, 0.01, -0.00, 0.04, -0.00, -0.00, -0.14, -0.19, 0.00, -0.01, 0.03, -0.07, -0.12, 0.02 +e02400, 0.04, 0.80, 0.05, -0.10, 0.03, 0.03, -0.06, -0.12, 0.02, -0.10, 0.04, 0.02, -0.12, -0.03, 0.04, 0.09, 0.05, 0.05, 0.02, -0.01, 0.00, -0.00, -0.00, 0.12, 0.10, 0.18, 0.01, -0.01, -0.04, 1.00, -0.01, -0.07, -0.04, -0.03, 0.02, 0.01, -0.04, -0.01, -0.00, -0.00, -0.04, 0.00, -0.01, 0.01, 0.01, 0.00, -0.01, -0.02, -0.02, 0.12, 0.02, 0.10, 0.02, 0.05, 0.02, 0.05, 0.02, 0.01, -0.00, 0.02, -0.07, 0.01, -0.01, -0.09, -0.03, -0.11, 0.01, -0.00, 0.03, -0.00, -0.00, -0.14, -0.19, 0.00, -0.01, 0.03, -0.08, -0.12, 0.02 e03150, 0.01, 0.01, 0.01, -0.01, 0.01, 0.01, -0.00, -0.01, -0.00, -0.03, 0.01, -0.00, 0.03, 0.00, 0.00, 0.00, 0.00, 0.00, 0.01, 0.00, 0.02, 0.00, -0.00, 0.00, 0.00, -0.00, 0.02, 0.02, -0.00, -0.01, 1.00, -0.01, 0.00, 0.00, 0.01, 0.09, 0.07, -0.01, -0.00, -0.00, 0.07, 0.00, 0.00, 0.02, 0.01, -0.00, -0.00, -0.00, 0.01, 0.01, 0.01, 0.03, 0.01, 0.00, -0.00, -0.00, 0.00, -0.00, 0.02, 0.00, 0.00, 0.00, 0.00, -0.00, 0.00, -0.03, -0.00, -0.00, 0.01, -0.02, -0.01, 0.00, 0.01, 0.01, -0.00, 0.00, 0.02, 0.02, 0.03 -e03210, -0.03, -0.05, -0.02, 0.09, -0.03, -0.03, 0.03, 0.09, -0.01, -0.02, -0.03, -0.00, 0.05, -0.02, -0.01, -0.02, -0.01, -0.01, -0.01, -0.00, -0.01, -0.00, 0.00, -0.01, -0.02, -0.02, -0.02, -0.00, 0.01, -0.07, -0.01, 1.00, 0.10, 0.03, -0.01, -0.03, -0.02, -0.02, 0.00, -0.00, 0.01, -0.00, -0.01, -0.01, -0.01, -0.00, -0.00, -0.00, -0.02, -0.01, -0.02, -0.05, -0.02, -0.01, -0.00, -0.01, -0.01, -0.00, -0.02, -0.00, 0.04, -0.00, -0.01, 0.05, 0.05, -0.03, -0.00, -0.00, -0.03, 0.01, 0.00, 0.01, 0.00, -0.00, 0.00, -0.01, -0.02, -0.02, -0.02 -e03220, -0.02, -0.02, -0.01, 0.10, -0.02, -0.02, 0.05, 0.08, -0.01, -0.02, -0.02, -0.00, 0.04, -0.01, -0.01, -0.01, -0.01, -0.01, -0.01, -0.00, -0.00, -0.00, 0.00, -0.01, -0.00, 0.00, -0.01, 0.00, -0.00, -0.04, 0.00, 0.10, 1.00, 0.05, -0.01, -0.02, -0.01, -0.01, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, -0.00, -0.00, 0.00, -0.01, 0.00, -0.01, -0.02, -0.00, -0.01, -0.00, -0.01, -0.00, 0.00, -0.01, -0.00, 0.06, -0.00, -0.01, 0.03, 0.05, -0.03, -0.00, -0.00, -0.02, 0.01, 0.00, 0.03, 0.04, 0.00, 0.00, -0.01, 0.01, 0.02, 0.02 +e03210, -0.03, -0.05, -0.02, 0.09, -0.03, -0.03, 0.03, 0.09, -0.01, -0.02, -0.03, -0.00, 0.05, -0.02, -0.01, -0.02, -0.01, -0.01, -0.01, -0.00, -0.01, -0.00, 0.00, -0.01, -0.02, -0.02, -0.02, -0.00, 0.01, -0.07, -0.01, 1.00, 0.10, 0.03, -0.01, -0.03, -0.02, -0.02, 0.00, -0.00, 0.01, -0.00, -0.01, -0.01, -0.01, -0.00, -0.00, -0.00, -0.02, -0.01, -0.02, -0.05, -0.02, -0.01, -0.00, -0.01, -0.01, -0.00, -0.02, -0.00, 0.04, -0.00, -0.01, 0.05, 0.05, -0.03, -0.00, -0.00, -0.03, 0.01, 0.00, 0.01, 0.00, -0.00, 0.00, -0.01, -0.01, -0.02, -0.02 +e03220, -0.02, -0.02, -0.01, 0.10, -0.02, -0.02, 0.05, 0.08, -0.01, -0.02, -0.02, -0.00, 0.04, -0.01, -0.01, -0.01, -0.01, -0.01, -0.01, -0.00, -0.00, -0.00, 0.00, -0.01, -0.00, 0.00, -0.01, 0.00, -0.00, -0.04, 0.00, 0.10, 1.00, 0.05, -0.01, -0.02, -0.01, -0.01, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, -0.00, -0.00, 0.00, -0.01, 0.00, -0.01, -0.02, -0.00, -0.01, -0.00, -0.01, -0.00, 0.00, -0.01, -0.00, 0.06, -0.00, -0.01, 0.03, 0.05, -0.03, -0.00, -0.00, -0.02, 0.01, 0.00, 0.03, 0.04, 0.00, 0.00, -0.01, 0.02, 0.02, 0.02 e03230, -0.02, -0.02, -0.01, 0.05, -0.01, -0.01, 0.00, 0.00, -0.00, 0.00, -0.01, 0.00, 0.02, -0.01, -0.00, -0.01, -0.01, -0.01, -0.01, -0.00, -0.02, -0.00, 0.00, -0.01, -0.01, -0.01, -0.01, -0.00, 0.01, -0.03, 0.00, 0.03, 0.05, 1.00, -0.00, -0.01, -0.00, -0.01, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.02, 0.00, -0.01, 0.00, -0.01, -0.02, -0.01, -0.01, -0.00, -0.01, -0.00, -0.00, -0.01, -0.00, 0.01, -0.00, -0.00, 0.00, 0.03, 0.00, -0.00, 0.01, -0.02, 0.01, 0.00, 0.01, 0.02, -0.00, -0.00, -0.01, -0.01, -0.01, -0.01 e03240, 0.23, 0.03, 0.15, -0.06, 0.23, 0.22, -0.01, -0.02, 0.00, -0.01, 0.24, 0.01, 0.02, 0.03, 0.11, 0.09, 0.07, 0.07, 0.22, -0.00, -0.01, 0.02, 0.01, 0.01, -0.00, 0.00, 0.43, -0.00, -0.01, 0.02, 0.01, -0.01, -0.01, -0.00, 1.00, 0.07, 0.02, -0.00, -0.00, -0.00, -0.01, 0.00, 0.05, 0.21, 0.02, 0.00, -0.00, -0.00, 0.01, -0.01, 0.19, 0.10, 0.07, 0.11, 0.03, 0.03, 0.01, 0.00, 0.39, 0.01, -0.01, 0.00, 0.05, -0.01, -0.00, -0.02, -0.00, -0.00, 0.26, -0.01, 0.01, -0.00, 0.01, 0.01, -0.00, 0.04, 0.04, 0.05, 0.05 -e03270, 0.15, 0.05, 0.11, -0.13, 0.15, 0.14, 0.01, -0.05, 0.01, -0.04, 0.15, 0.01, 0.07, 0.02, 0.05, 0.05, 0.04, 0.03, 0.10, -0.01, 0.12, 0.01, -0.01, 0.04, 0.02, 0.01, 0.19, 0.03, -0.04, 0.01, 0.09, -0.03, -0.02, -0.01, 0.07, 1.00, 0.18, 0.32, 0.00, -0.00, -0.02, 0.01, 0.03, 0.04, 0.01, 0.00, -0.00, 0.01, 0.02, -0.00, 0.13, 0.22, 0.10, 0.05, 0.02, 0.06, 0.02, 0.00, 0.18, 0.01, 0.01, 0.01, 0.03, -0.03, -0.01, -0.06, -0.00, 0.01, 0.16, -0.09, -0.02, 0.04, 0.08, 0.01, 0.01, 0.06, 0.08, 0.05, 0.08 -e03290, 0.04, -0.02, 0.03, -0.06, 0.04, 0.04, 0.00, -0.02, 0.00, -0.03, 0.04, 0.00, 0.03, 0.01, 0.01, 0.02, 0.01, 0.01, 0.02, -0.00, 0.04, 0.00, -0.01, 0.03, 0.02, -0.00, 0.05, 0.01, -0.02, -0.04, 0.07, -0.02, -0.01, -0.00, 0.02, 0.18, 1.00, 0.13, -0.00, -0.00, -0.01, 0.01, 0.00, 0.02, 0.01, 0.00, -0.00, 0.00, 0.01, 0.00, 0.03, 0.07, 0.03, 0.01, 0.00, 0.01, 0.00, 0.00, 0.05, 0.01, 0.01, 0.01, 0.00, -0.01, -0.01, -0.03, -0.00, 0.00, 0.05, -0.03, -0.02, 0.02, 0.05, 0.01, 0.00, 0.02, 0.04, 0.04, 0.05 -e03300, 0.07, 0.01, 0.06, -0.11, 0.07, 0.07, 0.01, -0.04, -0.00, -0.03, 0.08, -0.00, 0.04, 0.01, 0.01, 0.02, 0.01, 0.01, 0.04, -0.00, 0.20, 0.00, 0.00, 0.02, 0.02, 0.01, 0.11, 0.01, -0.02, -0.01, -0.01, -0.02, -0.01, -0.01, -0.00, 0.32, 0.13, 1.00, -0.00, -0.00, -0.02, 0.01, 0.02, 0.00, 0.00, -0.00, -0.00, -0.00, 0.01, -0.01, 0.07, 0.14, 0.05, 0.03, 0.01, 0.03, 0.00, -0.00, 0.11, 0.00, 0.02, 0.00, 0.02, -0.03, -0.01, -0.04, -0.00, 0.00, 0.08, -0.17, -0.10, 0.01, 0.04, 0.01, 0.00, 0.01, 0.05, 0.01, 0.02 +e03270, 0.15, 0.05, 0.11, -0.13, 0.15, 0.14, 0.01, -0.05, 0.01, -0.04, 0.15, 0.01, 0.07, 0.02, 0.05, 0.05, 0.04, 0.03, 0.10, -0.01, 0.12, 0.01, -0.01, 0.04, 0.02, 0.01, 0.19, 0.03, -0.04, 0.01, 0.09, -0.03, -0.02, -0.01, 0.07, 1.00, 0.18, 0.32, 0.00, -0.00, -0.02, 0.01, 0.03, 0.04, 0.01, 0.00, -0.00, 0.01, 0.02, -0.00, 0.13, 0.22, 0.10, 0.05, 0.02, 0.06, 0.02, 0.00, 0.18, 0.01, 0.01, 0.01, 0.03, -0.03, -0.01, -0.06, -0.00, 0.01, 0.16, -0.09, -0.02, 0.04, 0.08, 0.01, 0.01, 0.06, 0.04, 0.05, 0.08 +e03290, 0.04, -0.02, 0.03, -0.06, 0.04, 0.04, 0.00, -0.02, 0.00, -0.03, 0.04, 0.00, 0.03, 0.01, 0.01, 0.02, 0.01, 0.01, 0.02, -0.00, 0.04, 0.00, -0.01, 0.03, 0.02, -0.00, 0.05, 0.01, -0.02, -0.04, 0.07, -0.02, -0.01, -0.00, 0.02, 0.18, 1.00, 0.13, -0.00, -0.00, -0.01, 0.01, 0.00, 0.02, 0.01, 0.00, -0.00, 0.00, 0.01, 0.00, 0.03, 0.07, 0.03, 0.01, 0.00, 0.01, 0.00, 0.00, 0.05, 0.01, 0.01, 0.01, 0.00, -0.01, -0.01, -0.03, -0.00, 0.00, 0.05, -0.03, -0.02, 0.02, 0.05, 0.01, 0.00, 0.02, 0.03, 0.04, 0.05 +e03300, 0.07, 0.01, 0.06, -0.11, 0.07, 0.07, 0.01, -0.04, -0.00, -0.03, 0.08, -0.00, 0.04, 0.01, 0.01, 0.02, 0.01, 0.01, 0.04, -0.00, 0.20, 0.00, 0.00, 0.02, 0.02, 0.01, 0.11, 0.01, -0.02, -0.01, -0.01, -0.02, -0.01, -0.01, -0.00, 0.32, 0.13, 1.00, -0.00, -0.00, -0.02, 0.01, 0.02, 0.00, 0.00, -0.00, -0.00, -0.00, 0.01, -0.01, 0.07, 0.14, 0.05, 0.03, 0.01, 0.03, 0.00, -0.00, 0.11, 0.00, 0.02, 0.00, 0.02, -0.03, -0.01, -0.04, -0.00, 0.00, 0.08, -0.17, -0.10, 0.01, 0.04, 0.01, 0.00, 0.01, 0.01, 0.01, 0.02 e03400, 0.00, -0.00, 0.00, -0.01, 0.00, 0.00, 0.00, -0.00, 0.00, -0.00, 0.01, 0.00, 0.00, 0.00, 0.02, -0.00, 0.00, -0.00, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 1.00, 0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, 0.00, 0.00, 0.01, 0.00, 0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.01, 0.00, 0.00, -0.00, 0.00, -0.00, 0.01, -0.00, 0.00, 0.00, 0.00 e03500, -0.00, 0.00, -0.00, 0.01, -0.01, -0.01, 0.00, -0.00, -0.00, -0.01, -0.01, -0.00, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 1.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.01, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, -0.01, 0.00, 0.00, -0.00, -0.01, -0.00, 0.00, -0.00, 0.00, 0.01, -0.00 e07240, -0.02, -0.03, -0.02, 0.07, -0.02, -0.02, -0.00, 0.05, -0.00, 0.04, -0.02, 0.00, 0.04, -0.02, -0.01, -0.01, -0.01, -0.01, -0.01, -0.00, -0.01, -0.00, 0.00, -0.01, -0.01, -0.02, -0.01, -0.00, 0.00, -0.04, 0.07, 0.01, -0.00, -0.00, -0.01, -0.02, -0.01, -0.02, -0.00, -0.00, 1.00, -0.00, -0.01, -0.00, -0.00, -0.00, -0.00, -0.01, -0.02, -0.01, -0.02, -0.04, -0.02, -0.01, -0.00, -0.01, -0.00, -0.00, -0.01, -0.00, -0.00, -0.00, -0.01, -0.02, 0.00, 0.02, -0.00, -0.00, -0.02, 0.01, 0.00, 0.01, 0.01, -0.00, -0.00, -0.01, -0.03, -0.04, -0.03 @@ -47,34 +47,34 @@ e07600, 0.06, 0.02, 0.06, -0.03, 0.06, 0.06, -0.00, -0.01, e09700, 0.01, -0.00, 0.00, -0.01, 0.01, 0.01, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, 0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, -0.00, 1.00, -0.00, 0.00, 0.01, 0.01, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, -0.00, 0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.01, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.01, 0.00, 0.00, 0.00 e09800, -0.00, -0.00, -0.00, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 0.02, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, -0.00, 0.02, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 1.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, 0.02, -0.00, -0.00, -0.00, 0.00, 0.00, 0.01, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00 e09900, 0.00, -0.01, 0.01, 0.01, 0.00, 0.00, 0.00, 0.00, 0.00, -0.01, 0.00, 0.00, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.12, 0.03, 0.07, -0.00, -0.03, 0.02, -0.02, -0.00, -0.00, 0.00, 0.00, -0.00, 0.01, 0.00, -0.00, 0.00, 0.01, -0.01, 0.00, -0.00, 0.01, -0.00, 0.00, -0.00, 1.00, 0.01, 0.00, 0.00, 0.01, 0.01, -0.00, -0.00, 0.03, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, -0.00, -0.00, -0.00, -0.01, -0.00, 0.03, 0.00, -0.00, 0.00, 0.01, 0.02, 0.00, -0.00, -0.00, 0.01, 0.02, 0.01 -e11200, 0.10, 0.00, 0.06, -0.10, 0.10, 0.09, 0.01, -0.03, 0.00, -0.03, 0.09, -0.00, 0.03, 0.16, 0.02, 0.02, 0.02, 0.01, 0.05, -0.00, 0.01, 0.00, -0.01, 0.01, 0.04, 0.02, 0.04, -0.00, -0.01, -0.02, 0.01, -0.02, -0.01, -0.01, 0.01, 0.02, 0.01, 0.01, -0.00, 0.00, -0.02, 0.00, 0.03, 0.01, 0.01, 0.01, -0.00, 0.01, 1.00, -0.01, 0.08, 0.12, 0.06, 0.03, 0.00, 0.03, -0.00, 0.00, 0.04, -0.00, 0.02, 0.00, 0.03, -0.03, -0.00, -0.03, -0.00, 0.00, 0.10, -0.02, -0.01, 0.01, 0.05, 0.00, 0.00, 0.03, 0.19, 0.19, 0.17 +e11200, 0.10, 0.00, 0.06, -0.10, 0.10, 0.09, 0.01, -0.03, 0.00, -0.03, 0.09, -0.00, 0.03, 0.16, 0.02, 0.02, 0.02, 0.01, 0.05, -0.00, 0.01, 0.00, -0.01, 0.01, 0.04, 0.02, 0.04, -0.00, -0.01, -0.02, 0.01, -0.02, -0.01, -0.01, 0.01, 0.02, 0.01, 0.01, -0.00, 0.00, -0.02, 0.00, 0.03, 0.01, 0.01, 0.01, -0.00, 0.01, 1.00, -0.01, 0.08, 0.12, 0.06, 0.03, 0.00, 0.03, -0.00, 0.00, 0.04, -0.00, 0.02, 0.00, 0.03, -0.03, -0.00, -0.03, -0.00, 0.00, 0.11, -0.02, -0.01, 0.01, 0.05, 0.00, 0.00, 0.03, 0.20, 0.19, 0.17 e17500, -0.01, 0.14, 0.02, -0.00, -0.01, -0.01, -0.01, -0.01, 0.00, -0.02, -0.01, -0.00, 0.03, -0.02, -0.00, 0.04, 0.01, 0.01, -0.01, 0.01, -0.00, -0.00, 0.00, 0.02, 0.02, 0.04, -0.01, 0.00, 0.00, 0.12, 0.01, -0.01, 0.00, 0.00, -0.01, -0.00, 0.00, -0.01, 0.00, 0.00, -0.01, -0.00, -0.00, -0.00, -0.00, 0.01, -0.00, 0.00, -0.01, 1.00, -0.00, 0.03, 0.00, 0.01, 0.01, 0.02, -0.00, 0.00, -0.01, 0.01, -0.01, 0.00, -0.00, -0.01, -0.00, -0.03, -0.00, -0.00, -0.01, 0.00, 0.00, -0.02, -0.02, 0.00, -0.00, -0.00, -0.03, -0.02, -0.02 -e18400, 0.60, 0.05, 0.74, -0.15, 0.55, 0.55, -0.00, -0.04, 0.10, -0.04, 0.71, 0.01, 0.04, 0.41, 0.39, 0.22, 0.25, 0.21, 0.46, -0.00, 0.04, 0.01, 0.02, 0.07, 0.03, 0.04, 0.38, -0.02, -0.02, 0.02, 0.01, -0.02, -0.01, -0.01, 0.19, 0.13, 0.03, 0.07, 0.00, -0.00, -0.02, 0.03, 0.12, 0.16, 0.05, 0.00, -0.00, 0.00, 0.08, -0.00, 1.00, 0.39, 0.28, 0.23, 0.16, 0.35, 0.05, 0.02, 0.34, 0.00, 0.00, 0.06, 0.14, -0.03, -0.01, -0.04, -0.00, 0.00, 0.59, -0.06, -0.00, 0.01, 0.03, 0.01, 0.02, 0.31, 0.41, 0.15, 0.16 -e18500, 0.45, 0.17, 0.42, -0.25, 0.43, 0.42, 0.00, -0.07, 0.04, -0.08, 0.48, 0.00, 0.08, 0.33, 0.25, 0.30, 0.26, 0.22, 0.22, -0.00, 0.08, 0.01, 0.03, 0.13, 0.06, 0.09, 0.22, -0.02, -0.04, 0.10, 0.03, -0.05, -0.02, -0.02, 0.10, 0.22, 0.07, 0.14, 0.01, -0.00, -0.04, 0.08, 0.10, 0.08, 0.04, 0.00, -0.00, 0.01, 0.12, 0.03, 0.39, 1.00, 0.34, 0.19, 0.11, 0.35, 0.05, 0.02, 0.19, 0.01, 0.00, 0.07, 0.12, -0.05, -0.02, -0.09, -0.00, 0.01, 0.44, -0.08, -0.02, 0.02, 0.07, 0.02, 0.00, 0.24, 0.37, 0.23, 0.27 +e18400, 0.60, 0.05, 0.74, -0.15, 0.55, 0.55, -0.00, -0.04, 0.10, -0.04, 0.71, 0.01, 0.04, 0.41, 0.39, 0.22, 0.25, 0.21, 0.46, -0.00, 0.04, 0.01, 0.02, 0.07, 0.03, 0.04, 0.38, -0.02, -0.02, 0.02, 0.01, -0.02, -0.01, -0.01, 0.19, 0.13, 0.03, 0.07, 0.00, -0.00, -0.02, 0.03, 0.12, 0.16, 0.05, 0.00, -0.00, 0.00, 0.08, -0.00, 1.00, 0.39, 0.28, 0.23, 0.16, 0.35, 0.05, 0.02, 0.34, 0.00, 0.00, 0.06, 0.14, -0.03, -0.01, -0.04, -0.00, 0.00, 0.60, -0.06, -0.00, 0.01, 0.03, 0.01, 0.02, 0.31, 0.40, 0.15, 0.16 +e18500, 0.45, 0.17, 0.42, -0.25, 0.43, 0.42, 0.00, -0.07, 0.04, -0.08, 0.48, 0.00, 0.08, 0.33, 0.25, 0.30, 0.26, 0.22, 0.22, -0.00, 0.08, 0.01, 0.03, 0.13, 0.06, 0.09, 0.22, -0.02, -0.04, 0.10, 0.03, -0.05, -0.02, -0.02, 0.10, 0.22, 0.07, 0.14, 0.01, -0.00, -0.04, 0.08, 0.10, 0.08, 0.04, 0.00, -0.00, 0.01, 0.12, 0.03, 0.39, 1.00, 0.34, 0.19, 0.11, 0.35, 0.05, 0.02, 0.19, 0.01, 0.00, 0.07, 0.12, -0.05, -0.02, -0.09, -0.00, 0.01, 0.44, -0.08, -0.02, 0.02, 0.07, 0.02, 0.00, 0.24, 0.36, 0.23, 0.27 e19200, 0.30, 0.05, 0.37, -0.10, 0.28, 0.27, 0.01, -0.02, 0.04, -0.04, 0.34, 0.01, 0.05, 0.11, 0.35, 0.12, 0.22, 0.15, 0.13, -0.00, 0.03, -0.00, 0.05, 0.04, 0.02, 0.03, 0.10, -0.01, -0.02, 0.02, 0.01, -0.02, -0.00, -0.01, 0.07, 0.10, 0.03, 0.05, 0.00, -0.00, -0.02, 0.02, 0.07, 0.04, 0.05, 0.00, -0.00, 0.01, 0.06, 0.00, 0.28, 0.34, 1.00, 0.12, 0.07, 0.35, 0.05, 0.01, 0.07, -0.00, 0.02, 0.32, 0.07, -0.03, -0.01, -0.05, -0.00, 0.00, 0.28, -0.03, -0.01, 0.02, 0.05, 0.01, 0.04, 0.20, 0.14, 0.11, 0.12 -e19800, 0.32, 0.07, 0.63, -0.07, 0.25, 0.25, -0.01, -0.02, 0.02, -0.02, 0.37, 0.01, 0.02, 0.11, 0.25, 0.18, 0.18, 0.16, 0.16, -0.00, 0.02, 0.00, 0.03, 0.03, 0.02, 0.03, 0.25, -0.03, -0.01, 0.05, 0.00, -0.01, -0.01, -0.01, 0.11, 0.05, 0.01, 0.03, 0.00, -0.00, -0.01, 0.02, 0.05, 0.07, 0.05, 0.00, -0.00, -0.00, 0.03, 0.01, 0.23, 0.19, 0.12, 1.00, 0.22, 0.19, 0.04, 0.01, 0.21, 0.00, -0.01, 0.02, 0.06, -0.01, -0.00, -0.02, -0.00, 0.00, 0.26, -0.04, 0.00, -0.00, 0.00, 0.00, 0.02, 0.16, 0.12, 0.05, 0.06 +e19800, 0.32, 0.07, 0.63, -0.07, 0.25, 0.25, -0.01, -0.02, 0.02, -0.02, 0.37, 0.01, 0.02, 0.11, 0.25, 0.18, 0.18, 0.16, 0.16, -0.00, 0.02, 0.00, 0.03, 0.03, 0.02, 0.03, 0.25, -0.03, -0.01, 0.05, 0.00, -0.01, -0.01, -0.01, 0.11, 0.05, 0.01, 0.03, 0.00, -0.00, -0.01, 0.02, 0.05, 0.07, 0.05, 0.00, -0.00, -0.00, 0.03, 0.01, 0.23, 0.19, 0.12, 1.00, 0.22, 0.19, 0.04, 0.01, 0.21, 0.00, -0.01, 0.02, 0.06, -0.01, -0.00, -0.02, -0.00, 0.00, 0.26, -0.04, 0.00, -0.00, 0.00, 0.00, 0.02, 0.16, 0.11, 0.05, 0.06 e20100, 0.23, 0.03, 0.52, -0.03, 0.18, 0.18, -0.00, -0.01, 0.02, -0.01, 0.28, 0.01, 0.01, 0.12, 0.18, 0.11, 0.17, 0.16, 0.05, -0.00, 0.00, -0.00, 0.02, 0.03, 0.00, 0.02, 0.12, -0.03, -0.01, 0.02, -0.00, -0.00, -0.00, -0.00, 0.03, 0.02, 0.00, 0.01, -0.00, -0.00, -0.00, 0.00, 0.03, 0.07, 0.01, 0.00, -0.00, -0.00, 0.00, 0.01, 0.16, 0.11, 0.07, 0.22, 1.00, 0.20, 0.02, 0.07, 0.10, 0.00, -0.00, 0.02, 0.03, -0.01, -0.00, -0.01, -0.00, 0.00, 0.18, -0.01, -0.00, -0.00, -0.00, 0.00, -0.00, 0.14, 0.11, 0.02, 0.03 -e20400, 0.39, 0.08, 0.53, -0.09, 0.36, 0.36, -0.01, -0.02, 0.09, -0.02, 0.45, 0.02, 0.03, 0.13, 0.41, 0.29, 0.34, 0.27, 0.14, -0.00, 0.02, 0.00, 0.03, 0.07, 0.02, 0.05, 0.07, -0.03, -0.01, 0.05, -0.00, -0.01, -0.01, -0.01, 0.03, 0.06, 0.01, 0.03, 0.00, -0.00, -0.01, 0.04, 0.11, 0.02, 0.02, 0.00, -0.00, 0.03, 0.03, 0.02, 0.35, 0.35, 0.35, 0.19, 0.20, 1.00, 0.04, 0.01, 0.05, 0.00, -0.01, 0.05, 0.13, -0.02, -0.01, -0.03, -0.00, 0.00, 0.35, -0.02, -0.00, -0.01, -0.00, 0.01, 0.03, 0.31, 0.13, 0.05, 0.07 +e20400, 0.39, 0.08, 0.53, -0.09, 0.36, 0.36, -0.01, -0.02, 0.09, -0.02, 0.45, 0.02, 0.03, 0.13, 0.41, 0.29, 0.34, 0.27, 0.14, -0.00, 0.02, 0.00, 0.03, 0.07, 0.02, 0.05, 0.07, -0.03, -0.01, 0.05, -0.00, -0.01, -0.01, -0.01, 0.03, 0.06, 0.01, 0.03, 0.00, -0.00, -0.01, 0.04, 0.11, 0.02, 0.02, 0.00, -0.00, 0.03, 0.03, 0.02, 0.35, 0.35, 0.35, 0.19, 0.20, 1.00, 0.04, 0.01, 0.05, 0.00, -0.01, 0.05, 0.13, -0.02, -0.01, -0.03, -0.00, 0.00, 0.34, -0.02, -0.00, -0.01, -0.00, 0.01, 0.03, 0.31, 0.12, 0.05, 0.07 e24515, 0.14, 0.03, 0.05, -0.03, 0.14, 0.14, -0.00, -0.01, 0.09, -0.01, 0.11, 0.07, 0.01, 0.00, 0.05, 0.03, 0.02, 0.01, 0.02, -0.00, 0.01, -0.00, 0.01, 0.00, -0.00, 0.00, -0.04, -0.02, -0.01, 0.02, 0.00, -0.01, -0.00, -0.00, 0.01, 0.02, 0.00, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.02, 0.01, 0.00, -0.00, 0.00, -0.00, -0.00, 0.05, 0.05, 0.05, 0.04, 0.02, 0.04, 1.00, 0.00, -0.05, 0.00, -0.00, 0.02, 0.00, -0.01, -0.00, -0.01, -0.00, -0.00, 0.13, -0.02, 0.00, -0.00, -0.00, -0.00, 0.00, 0.21, 0.00, 0.00, 0.01 e24518, 0.09, 0.01, 0.04, -0.01, 0.09, 0.09, 0.00, -0.00, 0.01, -0.00, 0.08, 0.00, 0.00, 0.02, 0.01, 0.04, 0.02, 0.02, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, -0.01, 0.00, -0.00, 0.01, -0.00, -0.00, 0.00, -0.00, 0.00, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.02, 0.02, 0.01, 0.01, 0.07, 0.01, 0.00, 1.00, -0.01, -0.00, 0.00, 0.03, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.09, 0.00, 0.00, 0.00, 0.00, 0.00, 0.04, 0.11, 0.02, 0.01, 0.01 -e26270, 0.40, 0.03, 0.29, -0.12, 0.36, 0.36, 0.00, -0.03, -0.04, -0.03, 0.41, -0.05, 0.02, 0.06, 0.07, 0.08, 0.04, 0.03, 0.27, -0.00, -0.01, 0.01, -0.02, 0.01, 0.00, -0.00, 0.97, -0.04, -0.02, -0.00, 0.02, -0.02, -0.01, -0.01, 0.39, 0.18, 0.05, 0.11, 0.00, -0.00, -0.01, 0.01, 0.12, 0.26, 0.07, 0.00, -0.00, -0.00, 0.04, -0.01, 0.34, 0.19, 0.07, 0.21, 0.10, 0.05, -0.05, -0.01, 1.00, -0.00, 0.00, -0.02, 0.12, -0.02, -0.01, -0.02, -0.00, 0.00, 0.42, 0.01, 0.02, 0.01, 0.03, 0.01, -0.07, -0.02, 0.08, 0.07, 0.07 +e26270, 0.40, 0.03, 0.29, -0.12, 0.36, 0.36, 0.00, -0.03, -0.04, -0.03, 0.41, -0.05, 0.02, 0.06, 0.07, 0.08, 0.04, 0.03, 0.27, -0.00, -0.01, 0.01, -0.02, 0.01, 0.00, -0.00, 0.97, -0.04, -0.02, -0.00, 0.02, -0.02, -0.01, -0.01, 0.39, 0.18, 0.05, 0.11, 0.00, -0.00, -0.01, 0.01, 0.12, 0.26, 0.07, 0.00, -0.00, -0.00, 0.04, -0.01, 0.34, 0.19, 0.07, 0.21, 0.10, 0.05, -0.05, -0.01, 1.00, -0.00, 0.00, -0.02, 0.12, -0.02, -0.01, -0.02, -0.00, 0.00, 0.42, 0.01, 0.02, 0.01, 0.03, 0.01, -0.07, -0.02, 0.07, 0.07, 0.07 e27200, 0.01, 0.03, 0.00, -0.01, 0.01, 0.01, -0.00, -0.01, 0.00, -0.00, 0.01, 0.00, 0.01, -0.00, 0.00, 0.01, 0.01, 0.01, 0.01, -0.00, -0.00, 0.00, 0.01, 0.00, -0.00, 0.00, 0.01, 0.00, -0.00, 0.02, 0.00, -0.00, -0.00, -0.00, 0.01, 0.01, 0.01, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.01, 0.00, 0.01, -0.00, 0.00, 0.00, 0.00, 0.00, -0.00, -0.00, 1.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.01, -0.00, -0.00, 0.01, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00 -e32800, -0.00, -0.05, -0.00, 0.15, -0.00, -0.00, 0.86, 0.22, -0.01, 0.05, -0.01, -0.01, 0.05, 0.02, -0.01, -0.01, -0.01, -0.01, -0.00, -0.00, 0.01, -0.00, 0.00, -0.01, -0.01, -0.02, 0.00, 0.00, 0.00, -0.07, 0.00, 0.04, 0.06, 0.01, -0.01, 0.01, 0.01, 0.02, 0.00, 0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.02, -0.01, 0.00, 0.00, 0.02, -0.01, -0.00, -0.01, -0.00, 0.00, 0.00, -0.00, 1.00, -0.00, -0.00, 0.00, 0.01, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 0.11, 0.18, 0.00, 0.00, -0.01, 0.04, 0.05, 0.05 -e58990, 0.06, 0.02, 0.08, -0.03, 0.06, 0.06, -0.00, -0.01, 0.03, -0.01, 0.07, 0.02, 0.01, 0.01, 0.09, 0.02, 0.05, 0.05, 0.02, -0.00, -0.00, -0.00, -0.00, 0.01, 0.01, 0.01, -0.02, -0.04, -0.00, 0.01, 0.00, -0.00, -0.00, -0.00, 0.00, 0.01, 0.01, 0.00, -0.00, -0.00, -0.00, 0.00, 0.01, 0.00, 0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.06, 0.07, 0.32, 0.02, 0.02, 0.05, 0.02, 0.03, -0.02, -0.00, -0.00, 1.00, 0.01, -0.01, -0.00, -0.01, -0.00, 0.00, 0.05, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.07, 0.02, 0.01, 0.01 +e32800, -0.00, -0.05, -0.00, 0.15, -0.00, -0.00, 0.86, 0.22, -0.01, 0.05, -0.01, -0.01, 0.05, 0.02, -0.01, -0.01, -0.01, -0.01, -0.00, -0.00, 0.01, -0.00, 0.00, -0.01, -0.01, -0.02, 0.00, 0.00, 0.00, -0.07, 0.00, 0.04, 0.06, 0.01, -0.01, 0.01, 0.01, 0.02, 0.00, 0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.02, -0.01, 0.00, 0.00, 0.02, -0.01, -0.00, -0.01, -0.00, 0.00, 0.00, -0.00, 1.00, -0.00, -0.00, 0.00, 0.01, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 0.11, 0.18, 0.00, 0.00, -0.01, 0.05, 0.05, 0.05 +e58990, 0.06, 0.02, 0.08, -0.03, 0.06, 0.06, -0.00, -0.01, 0.03, -0.01, 0.07, 0.02, 0.01, 0.01, 0.09, 0.02, 0.05, 0.05, 0.02, -0.00, -0.00, -0.00, -0.00, 0.01, 0.01, 0.01, -0.02, -0.04, -0.00, 0.01, 0.00, -0.00, -0.00, -0.00, 0.00, 0.01, 0.01, 0.00, -0.00, -0.00, -0.00, 0.00, 0.01, 0.00, 0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.06, 0.07, 0.32, 0.02, 0.02, 0.05, 0.02, 0.03, -0.02, -0.00, -0.00, 1.00, 0.01, -0.01, -0.00, -0.01, -0.00, 0.00, 0.05, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.07, 0.01, 0.01, 0.01 e62900, 0.23, 0.00, 0.11, -0.06, 0.23, 0.23, -0.00, -0.01, 0.01, -0.01, 0.22, 0.01, 0.01, 0.16, 0.11, 0.06, 0.17, 0.15, 0.12, -0.00, 0.04, -0.00, -0.00, 0.02, 0.00, 0.01, 0.14, -0.00, -0.01, -0.01, 0.00, -0.01, -0.01, -0.00, 0.05, 0.03, 0.00, 0.02, -0.00, -0.00, -0.01, 0.00, 0.96, 0.03, 0.01, 0.00, -0.00, -0.00, 0.03, -0.00, 0.14, 0.12, 0.07, 0.06, 0.03, 0.13, 0.00, 0.00, 0.12, 0.00, -0.00, 0.01, 1.00, -0.01, -0.00, -0.01, -0.00, 0.00, 0.17, -0.06, -0.00, 0.00, 0.01, -0.00, 0.04, 0.10, 0.16, 0.06, 0.05 e87521, -0.04, -0.06, -0.03, 0.19, -0.04, -0.04, -0.00, 0.00, -0.00, 0.06, -0.04, 0.00, 0.07, -0.04, -0.01, -0.02, -0.02, -0.01, -0.02, 0.01, -0.01, -0.00, -0.00, -0.02, -0.02, -0.03, -0.03, 0.00, 0.05, -0.09, -0.00, 0.05, 0.03, 0.00, -0.01, -0.03, -0.01, -0.03, 0.00, -0.00, -0.02, -0.00, -0.01, -0.01, -0.01, -0.00, 0.00, -0.00, -0.03, -0.01, -0.03, -0.05, -0.03, -0.01, -0.01, -0.02, -0.01, -0.00, -0.02, -0.00, 0.00, -0.01, -0.01, 1.00, 0.00, 0.07, -0.00, -0.00, -0.04, 0.02, 0.00, 0.08, 0.10, -0.00, -0.00, -0.02, -0.03, -0.04, -0.03 e87530, -0.01, -0.02, -0.01, 0.03, -0.01, -0.01, 0.01, 0.02, 0.00, -0.01, -0.01, 0.00, 0.02, -0.01, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, -0.00, 0.00, -0.01, -0.01, -0.01, -0.01, 0.00, 0.00, -0.03, 0.00, 0.05, 0.05, 0.03, -0.00, -0.01, -0.01, -0.01, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.02, -0.01, -0.00, -0.00, -0.01, -0.00, -0.00, -0.01, -0.00, 0.01, -0.00, -0.00, 0.00, 1.00, -0.02, -0.00, -0.00, -0.01, 0.00, 0.00, 0.00, 0.01, -0.00, -0.00, -0.01, -0.01, -0.01, -0.01 eitc, -0.05, -0.08, -0.04, 0.32, -0.06, -0.05, 0.00, -0.01, -0.01, 0.69, -0.05, -0.01, 0.08, -0.05, -0.02, -0.03, -0.02, -0.02, -0.02, -0.01, -0.01, -0.01, 0.00, -0.02, -0.03, -0.04, -0.03, 0.00, 0.03, -0.11, -0.03, -0.03, -0.03, 0.00, -0.02, -0.06, -0.03, -0.04, -0.00, -0.01, 0.02, -0.01, -0.01, -0.01, -0.01, -0.00, 0.02, -0.01, -0.03, -0.03, -0.04, -0.09, -0.05, -0.02, -0.01, -0.03, -0.01, -0.00, -0.02, -0.01, 0.01, -0.01, -0.01, 0.07, -0.02, 1.00, -0.00, -0.00, -0.06, 0.02, 0.00, 0.23, 0.28, -0.01, 0.00, -0.02, -0.09, -0.11, -0.09 elderly_dependents, -0.00, -0.00, -0.00, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.02, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, 0.01, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 1.00, -0.00, -0.00, 0.00, 0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00 g20500, 0.00, 0.00, 0.01, -0.01, 0.00, 0.00, -0.00, -0.00, 0.00, -0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, -0.00, 0.00, 0.00, 0.00, 0.01, 0.00, 0.00, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.00, 0.01, -0.00, 0.01, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.00, -0.00, 0.03, 0.00, -0.00, 0.00, 0.01, 0.00, 0.00, 0.00, 0.00, -0.00, -0.00, 0.00, -0.00, -0.00, 0.00, 0.00, -0.00, -0.00, -0.00, -0.00, 1.00, 0.00, -0.00, -0.01, -0.00, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00 -iitax, 0.95, 0.08, 0.49, -0.22, 0.96, 0.96, -0.01, -0.06, 0.26, -0.05, 0.87, 0.24, 0.05, 0.50, 0.40, 0.24, 0.34, 0.28, 0.33, -0.00, 0.05, 0.01, 0.07, 0.10, 0.03, 0.05, 0.49, -0.03, -0.03, 0.04, 0.01, -0.03, -0.02, -0.02, 0.26, 0.16, 0.05, 0.08, 0.01, -0.01, -0.02, 0.04, 0.16, 0.16, 0.06, 0.01, -0.00, 0.00, 0.10, -0.01, 0.59, 0.44, 0.28, 0.26, 0.18, 0.35, 0.13, 0.09, 0.42, 0.01, -0.00, 0.05, 0.17, -0.04, -0.01, -0.06, -0.00, 0.00, 1.00, -0.09, -0.01, 0.00, 0.03, 0.02, 0.10, 0.66, 0.51, 0.19, 0.21 +iitax, 0.95, 0.08, 0.49, -0.22, 0.96, 0.95, -0.01, -0.06, 0.26, -0.05, 0.87, 0.24, 0.06, 0.51, 0.40, 0.24, 0.34, 0.28, 0.33, -0.01, 0.05, 0.01, 0.07, 0.10, 0.03, 0.05, 0.48, -0.03, -0.03, 0.03, 0.01, -0.03, -0.02, -0.02, 0.26, 0.16, 0.05, 0.08, 0.01, -0.01, -0.02, 0.04, 0.16, 0.16, 0.06, 0.01, -0.00, 0.00, 0.11, -0.01, 0.60, 0.44, 0.28, 0.26, 0.18, 0.34, 0.13, 0.09, 0.42, 0.01, -0.00, 0.05, 0.17, -0.04, -0.01, -0.06, -0.00, 0.00, 1.00, -0.09, -0.01, 0.00, 0.03, 0.02, 0.10, 0.66, 0.50, 0.19, 0.21 k1bx14p, -0.09, -0.02, -0.05, 0.06, -0.09, -0.08, 0.01, 0.02, -0.00, 0.02, -0.08, 0.00, -0.02, -0.04, -0.01, -0.02, -0.02, -0.01, -0.02, 0.00, -0.73, -0.01, 0.00, -0.01, -0.00, -0.01, 0.01, -0.06, 0.01, -0.00, -0.02, 0.01, 0.01, 0.01, -0.01, -0.09, -0.03, -0.17, 0.00, 0.00, 0.01, -0.00, -0.06, -0.01, -0.01, 0.00, 0.00, -0.00, -0.02, 0.00, -0.06, -0.08, -0.03, -0.04, -0.01, -0.02, -0.02, 0.00, 0.01, -0.00, -0.00, -0.00, -0.06, 0.02, 0.00, 0.02, 0.00, -0.00, -0.09, 1.00, 0.06, 0.00, -0.01, -0.00, 0.00, -0.02, -0.04, -0.02, -0.02 -k1bx14s, -0.01, -0.01, -0.00, 0.02, -0.01, -0.01, 0.00, 0.00, 0.00, 0.01, -0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.00, -0.25, 0.00, 0.00, -0.01, -0.00, -0.00, 0.02, -0.06, 0.00, -0.00, -0.01, 0.00, 0.00, 0.00, 0.01, -0.02, -0.02, -0.10, 0.00, 0.00, 0.00, 0.00, -0.00, 0.01, -0.00, -0.00, 0.00, 0.00, -0.01, 0.00, -0.00, -0.02, -0.01, 0.00, -0.00, -0.00, 0.00, 0.00, 0.02, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.00, -0.01, -0.01, 0.06, 1.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, -0.01, -0.01 +k1bx14s, -0.01, -0.01, -0.00, 0.02, -0.01, -0.01, 0.00, 0.00, 0.00, 0.01, -0.01, -0.00, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.00, -0.25, 0.00, 0.00, -0.01, -0.00, -0.00, 0.02, -0.06, 0.00, -0.00, -0.01, 0.00, 0.00, 0.00, 0.01, -0.02, -0.02, -0.10, 0.00, 0.00, 0.00, 0.00, -0.00, 0.01, -0.00, -0.00, 0.00, 0.00, -0.01, 0.00, -0.00, -0.02, -0.01, 0.00, -0.00, -0.00, 0.00, 0.00, 0.02, -0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.00, -0.01, -0.01, 0.06, 1.00, -0.00, -0.00, -0.00, 0.00, 0.00, -0.01, -0.01, -0.01 nu06, 0.00, -0.10, 0.00, 0.35, 0.00, 0.00, 0.09, 0.23, -0.00, 0.26, 0.00, -0.00, 0.06, 0.02, -0.01, -0.01, -0.01, -0.01, 0.00, -0.00, 0.00, -0.00, -0.00, -0.02, -0.02, -0.04, 0.01, 0.00, 0.01, -0.14, 0.00, 0.01, 0.03, 0.01, -0.00, 0.04, 0.02, 0.01, -0.00, -0.00, 0.01, -0.00, 0.00, 0.00, -0.00, -0.00, 0.01, 0.01, 0.01, -0.02, 0.01, 0.02, 0.02, -0.00, -0.00, -0.01, -0.00, 0.00, 0.01, -0.00, 0.11, -0.00, 0.00, 0.08, 0.00, 0.23, -0.00, -0.00, 0.00, 0.00, -0.00, 1.00, 0.68, 0.00, 0.00, -0.00, 0.04, -0.00, 0.02 -nu13, 0.03, -0.14, 0.02, 0.48, 0.03, 0.03, 0.15, 0.35, -0.00, 0.37, 0.03, -0.00, 0.09, 0.06, -0.00, -0.01, -0.01, -0.01, 0.01, -0.00, 0.01, -0.00, -0.00, -0.02, -0.03, -0.05, 0.02, 0.00, 0.01, -0.19, 0.01, 0.00, 0.04, 0.02, 0.01, 0.08, 0.05, 0.04, 0.00, -0.01, 0.01, 0.01, 0.01, 0.00, 0.00, -0.00, 0.01, 0.02, 0.05, -0.02, 0.03, 0.07, 0.05, 0.00, -0.00, -0.00, -0.00, 0.00, 0.03, -0.01, 0.18, 0.00, 0.01, 0.10, 0.01, 0.28, -0.00, 0.00, 0.03, -0.01, -0.00, 0.68, 1.00, 0.00, 0.01, 0.01, 0.10, 0.07, 0.09 +nu13, 0.03, -0.14, 0.02, 0.48, 0.03, 0.03, 0.15, 0.35, -0.00, 0.37, 0.03, -0.00, 0.09, 0.06, -0.00, -0.01, -0.01, -0.01, 0.01, -0.00, 0.01, -0.00, -0.00, -0.02, -0.03, -0.05, 0.02, 0.00, 0.01, -0.19, 0.01, 0.00, 0.04, 0.02, 0.01, 0.08, 0.05, 0.04, 0.00, -0.01, 0.01, 0.01, 0.01, 0.00, 0.00, -0.00, 0.01, 0.02, 0.05, -0.02, 0.03, 0.07, 0.05, 0.00, -0.00, -0.00, -0.00, 0.00, 0.03, -0.01, 0.18, 0.00, 0.01, 0.10, 0.01, 0.28, -0.00, 0.00, 0.03, -0.01, -0.00, 0.68, 1.00, 0.00, 0.01, 0.01, 0.11, 0.07, 0.09 p08000, 0.02, 0.01, 0.01, -0.01, 0.02, 0.02, 0.00, -0.00, 0.01, -0.00, 0.02, 0.01, 0.01, 0.01, 0.01, 0.02, 0.01, 0.01, 0.01, -0.00, 0.00, -0.00, 0.00, 0.00, -0.00, 0.00, 0.01, 0.00, -0.00, 0.00, 0.01, -0.00, 0.00, -0.00, 0.01, 0.01, 0.01, 0.01, -0.00, -0.00, -0.00, 0.00, -0.00, 0.00, -0.00, -0.00, -0.00, 0.00, 0.00, 0.00, 0.01, 0.02, 0.01, 0.00, 0.00, 0.01, -0.00, 0.00, 0.01, -0.00, 0.00, -0.00, -0.00, -0.00, -0.00, -0.01, -0.00, -0.00, 0.02, -0.00, -0.00, 0.00, 0.00, 1.00, 0.00, 0.01, 0.01, 0.01, 0.01 p22250, 0.09, -0.01, 0.02, -0.01, 0.09, 0.09, 0.00, 0.00, -0.00, -0.00, 0.07, 0.01, -0.00, 0.01, 0.05, -0.00, 0.02, 0.01, 0.03, 0.00, -0.00, 0.00, -0.00, -0.00, -0.00, -0.01, -0.05, -0.00, 0.00, -0.01, -0.00, 0.00, 0.00, -0.00, -0.00, 0.01, 0.00, 0.00, 0.01, 0.00, -0.00, 0.02, 0.04, 0.00, 0.00, 0.00, -0.00, -0.00, 0.00, -0.00, 0.02, 0.00, 0.04, 0.02, -0.00, 0.03, 0.00, 0.04, -0.07, -0.00, 0.00, -0.00, 0.04, -0.00, -0.00, 0.00, 0.00, -0.00, 0.10, 0.00, 0.00, 0.00, 0.01, 0.00, 1.00, -0.01, 0.01, 0.01, 0.00 -p23250, 0.77, 0.05, 0.29, -0.10, 0.79, 0.79, -0.01, -0.02, 0.07, -0.02, 0.59, 0.03, 0.02, 0.08, 0.26, 0.16, 0.20, 0.16, 0.10, -0.00, 0.00, -0.00, 0.05, 0.04, 0.01, 0.02, 0.01, -0.02, -0.01, 0.03, 0.00, -0.01, -0.01, -0.01, 0.04, 0.06, 0.02, 0.01, -0.00, -0.00, -0.01, 0.03, 0.09, 0.03, 0.02, 0.01, -0.00, -0.00, 0.03, -0.00, 0.31, 0.24, 0.20, 0.16, 0.14, 0.31, 0.21, 0.11, -0.02, 0.00, -0.01, 0.07, 0.10, -0.02, -0.01, -0.02, -0.00, -0.00, 0.66, -0.02, 0.00, -0.00, 0.01, 0.01, -0.01, 1.00, 0.09, 0.05, 0.06 -payrolltax, 0.45, -0.01, 0.30, -0.17, 0.45, 0.44, 0.04, -0.02, 0.01, -0.07, 0.48, 0.01, 0.11, 0.98, 0.07, 0.10, 0.10, 0.09, 0.17, -0.01, 0.03, 0.01, 0.01, 0.04, 0.04, 0.03, 0.09, -0.02, -0.03, -0.07, 0.02, -0.02, 0.01, -0.01, 0.04, 0.08, 0.04, 0.05, 0.00, 0.00, -0.03, 0.03, 0.16, 0.04, 0.03, 0.00, -0.00, 0.01, 0.19, -0.03, 0.41, 0.37, 0.14, 0.12, 0.11, 0.13, 0.00, 0.02, 0.08, -0.00, 0.04, 0.02, 0.16, -0.03, -0.01, -0.09, -0.00, 0.00, 0.51, -0.04, 0.00, 0.04, 0.10, 0.01, 0.01, 0.09, 1.00, 0.41, 0.40 -pencon_p, 0.18, -0.06, 0.12, -0.18, 0.18, 0.17, 0.05, -0.04, 0.00, -0.09, 0.17, 0.00, 0.12, 0.32, 0.04, 0.03, 0.04, 0.03, 0.08, -0.01, 0.00, 0.01, 0.00, 0.02, 0.04, 0.00, 0.08, -0.01, -0.04, -0.12, 0.02, -0.02, 0.02, -0.01, 0.05, 0.05, 0.04, 0.01, 0.00, 0.01, -0.04, 0.01, 0.06, 0.03, 0.03, 0.00, -0.00, 0.02, 0.19, -0.02, 0.15, 0.23, 0.11, 0.05, 0.02, 0.05, 0.00, 0.01, 0.07, -0.00, 0.05, 0.01, 0.06, -0.04, -0.01, -0.11, -0.00, 0.00, 0.19, -0.02, -0.01, -0.00, 0.07, 0.01, 0.01, 0.05, 0.41, 1.00, 0.16 -pencon_s, 0.20, 0.09, 0.14, -0.14, 0.19, 0.19, 0.04, -0.03, 0.01, -0.08, 0.19, 0.00, 0.09, 0.32, 0.05, 0.06, 0.06, 0.05, 0.08, -0.01, 0.02, 0.00, 0.00, 0.04, 0.07, 0.04, 0.07, -0.01, -0.02, 0.02, 0.03, -0.02, 0.02, -0.01, 0.05, 0.08, 0.05, 0.02, 0.00, -0.00, -0.03, 0.03, 0.05, 0.03, 0.02, 0.00, -0.00, 0.01, 0.17, -0.02, 0.16, 0.27, 0.12, 0.06, 0.03, 0.07, 0.01, 0.01, 0.07, -0.00, 0.05, 0.01, 0.05, -0.03, -0.01, -0.09, -0.00, 0.00, 0.21, -0.02, -0.01, 0.02, 0.09, 0.01, 0.00, 0.06, 0.40, 0.16, 1.00 +p23250, 0.77, 0.05, 0.29, -0.10, 0.79, 0.79, -0.01, -0.02, 0.07, -0.02, 0.59, 0.03, 0.02, 0.08, 0.26, 0.16, 0.20, 0.16, 0.10, -0.00, 0.00, -0.00, 0.05, 0.04, 0.01, 0.02, 0.01, -0.02, -0.01, 0.03, 0.00, -0.01, -0.01, -0.01, 0.04, 0.06, 0.02, 0.01, -0.00, -0.00, -0.01, 0.03, 0.09, 0.03, 0.02, 0.01, -0.00, -0.00, 0.03, -0.00, 0.31, 0.24, 0.20, 0.16, 0.14, 0.31, 0.21, 0.11, -0.02, 0.00, -0.01, 0.07, 0.10, -0.02, -0.01, -0.02, -0.00, -0.00, 0.66, -0.02, 0.00, -0.00, 0.01, 0.01, -0.01, 1.00, 0.08, 0.05, 0.06 +payrolltax, 0.44, -0.02, 0.29, -0.16, 0.44, 0.43, 0.04, -0.01, 0.01, -0.08, 0.46, 0.01, 0.12, 0.97, 0.07, 0.09, 0.09, 0.08, 0.16, -0.01, 0.02, 0.01, 0.01, 0.04, 0.04, 0.03, 0.08, -0.02, -0.03, -0.08, 0.02, -0.01, 0.02, -0.01, 0.04, 0.04, 0.03, 0.01, 0.00, 0.00, -0.03, 0.03, 0.16, 0.04, 0.03, 0.00, -0.00, 0.01, 0.20, -0.03, 0.40, 0.36, 0.14, 0.11, 0.11, 0.12, 0.00, 0.02, 0.07, -0.00, 0.05, 0.01, 0.16, -0.03, -0.01, -0.09, -0.00, 0.00, 0.50, -0.04, -0.01, 0.04, 0.11, 0.01, 0.01, 0.08, 1.00, 0.45, 0.43 +pencon_p, 0.18, -0.06, 0.12, -0.18, 0.18, 0.17, 0.05, -0.04, 0.00, -0.09, 0.17, 0.00, 0.12, 0.32, 0.04, 0.03, 0.04, 0.03, 0.08, -0.01, 0.00, 0.01, 0.00, 0.02, 0.04, 0.00, 0.08, -0.01, -0.04, -0.12, 0.02, -0.02, 0.02, -0.01, 0.05, 0.05, 0.04, 0.01, 0.00, 0.01, -0.04, 0.01, 0.06, 0.03, 0.03, 0.00, -0.00, 0.02, 0.19, -0.02, 0.15, 0.23, 0.11, 0.05, 0.02, 0.05, 0.00, 0.01, 0.07, -0.00, 0.05, 0.01, 0.06, -0.04, -0.01, -0.11, -0.00, 0.00, 0.19, -0.02, -0.01, -0.00, 0.07, 0.01, 0.01, 0.05, 0.45, 1.00, 0.16 +pencon_s, 0.20, 0.09, 0.14, -0.14, 0.19, 0.19, 0.04, -0.03, 0.01, -0.08, 0.19, 0.00, 0.09, 0.32, 0.05, 0.06, 0.06, 0.05, 0.08, -0.01, 0.02, 0.00, 0.00, 0.04, 0.07, 0.04, 0.07, -0.01, -0.02, 0.02, 0.03, -0.02, 0.02, -0.01, 0.05, 0.08, 0.05, 0.02, 0.00, -0.00, -0.03, 0.03, 0.05, 0.03, 0.02, 0.00, -0.00, 0.01, 0.17, -0.02, 0.16, 0.27, 0.12, 0.06, 0.03, 0.07, 0.01, 0.01, 0.07, -0.00, 0.05, 0.01, 0.05, -0.03, -0.01, -0.09, -0.00, 0.00, 0.21, -0.02, -0.01, 0.02, 0.09, 0.01, 0.00, 0.06, 0.43, 0.16, 1.00 diff --git a/taxcalc/tests/puf_var_wght_means_by_year.csv b/taxcalc/tests/puf_var_wght_means_by_year.csv index 49b011bd1..d6e0a1b51 100644 --- a/taxcalc/tests/puf_var_wght_means_by_year.csv +++ b/taxcalc/tests/puf_var_wght_means_by_year.csv @@ -67,7 +67,7 @@ e87530,Adjusted qualified lifetime learning expenses for all students, 93, eitc,Federal EITC, 376, 369, 364, 352, 342, 340, 341, 347, 324, 335, 363, 385, 391, 395, 399, 403, 407, 411, 417, 425, 429, 436 elderly_dependents,number of dependents age 65+ in filing unit excluding taxpayer and spouse, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 g20500,Itemizable gross (before 10% AGI disregard) casualty or theft loss, 29, 30, 31, 32, 33, 35, 36, 38, 40, 41, 42, 44, 47, 48, 50, 52, 55, 57, 60, 63, 62, 66 -iitax,Federal income tax liability, 6550, 7474, 7521, 7477, 8281, 8755, 8952, 6544, 9149, 11189, 11708, 11835, 12203, 12533, 12876, 13267, 13691, 14122, 14560, 15122, 15521, 15974 +iitax,Federal income tax liability, 6826, 7764, 7820, 7778, 8605, 9092, 9293, 6890, 9516, 11572, 12100, 12244, 12629, 12976, 13335, 13744, 14187, 14638, 15097, 15689, 16089, 16567 k1bx14p,Partner self-employment earnings/loss for taxpayer (included in e26270 total), -213, -239, -187, -162, -144, -139, -133, -129, -156, -168, -183, -181, -178, -175, -168, -158, -146, -124, -103, -67, -149, -123 k1bx14s,Partner self-employment earnings/loss for spouse (included in e26270 total), -7, -9, 0, 2, 8, 10, 11, 11, 13, 14, 14, 14, 15, 16, 18, 21, 25, 27, 31, 34, 28, 33 nu06,Number of dependents under 6 years old, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 @@ -75,6 +75,6 @@ nu13,Number of dependents under 13 years old, 0, 0, 0, 0 p08000,Other tax credits (but not including Sch R credit), 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 p22250,Sch D: Net short-term capital gains/losses, -120, -173, -172, -151, -195, -212, -202, -267, -481, -308, -330, -304, -299, -292, -288, -288, -290, -293, -284, -286, -326, -335 p23250,Sch D: Net long-term capital gains/losses, 2284, 3191, 3138, 2776, 3680, 3912, 3596, 4616, 8212, 5153, 5389, 4987, 4839, 4662, 4598, 4612, 4669, 4756, 4864, 5023, 5090, 5224 -payrolltax,Payroll taxes (ee+er) for OASDI+HI, 5193, 5382, 5440, 5516, 5676, 5834, 6009, 6042, 6437, 6824, 7161, 7425, 7679, 7919, 8150, 8383, 8625, 8879, 9148, 9509, 9606, 9872 +payrolltax,Payroll taxes (ee+er) for OASDI+HI, 4917, 5091, 5141, 5215, 5352, 5497, 5667, 5696, 6069, 6441, 6770, 7016, 7253, 7477, 7690, 7906, 8130, 8363, 8611, 8942, 9037, 9280 pencon_p,Contributions to defined-contribution pension plans for taxpayer, 856, 897, 916, 941, 963, 996, 1029, 1030, 1107, 1185, 1239, 1282, 1326, 1368, 1408, 1448, 1491, 1532, 1578, 1638, 1655, 1698 pencon_s,Contributions to defined-contribution pension plans for spouse, 393, 410, 421, 424, 440, 452, 466, 466, 500, 535, 558, 577, 595, 612, 629, 645, 661, 678, 695, 720, 738, 756 diff --git a/taxcalc/tests/pufcsv_agg_expect.csv b/taxcalc/tests/pufcsv_agg_expect.csv index 81e192ec0..147638341 100644 --- a/taxcalc/tests/pufcsv_agg_expect.csv +++ b/taxcalc/tests/pufcsv_agg_expect.csv @@ -15,11 +15,11 @@ Tax before Credits ($b),1708.1,1734.4,1801.1,1863.4,2309.4,2310.1,2452.2,2520.2, Refundable Credits ($b),102.9,117.5,118.5,642.0,802.6,119.2,126.9,133.5,136.0,122.0 Nonrefundable Credits ($b),67.0,127.3,129.2,128.5,47.6,141.0,143.3,144.0,145.7,77.7 Reform Surtaxes ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -Other Taxes ($b),40.0,44.8,43.6,52.9,84.9,61.5,66.5,65.2,66.0,66.3 -Ind Income Tax ($b),1578.2,1534.3,1597.0,1145.8,1544.0,2111.5,2248.5,2308.0,2414.8,2770.5 -Payroll Taxes ($b),1083.8,1133.3,1185.4,1209.0,1306.0,1403.4,1492.6,1568.0,1643.2,1716.5 +Other Taxes ($b),101.9,110.3,110.9,122.1,159.4,140.3,148.2,151.5,157.0,162.3 +Ind Income Tax ($b),1640.1,1599.8,1664.4,1215.0,1618.5,2190.3,2330.2,2394.2,2505.8,2866.4 +Payroll Taxes ($b),1021.9,1067.9,1118.1,1139.7,1231.5,1324.7,1410.9,1481.7,1552.2,1620.6 Combined Liability ($b),2662.0,2667.7,2782.4,2354.8,2850.0,3514.9,3741.1,3876.0,4058.0,4487.0 -With Income Tax <= 0 (#m),92.8,98.6,99.7,131.7,125.0,100.3,101.8,103.4,104.3,101.0 +With Income Tax <= 0 (#m),88.5,94.0,95.1,129.1,122.6,95.7,97.1,98.6,99.6,96.3 With Combined Tax <= 0 (#m),63.4,65.6,66.8,102.1,94.5,68.9,70.2,71.6,72.7,72.4 UBI Benefits ($b),0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 "Total Benefits, Consumption Value ($b)",1052.3,1104.9,1175.3,1243.9,1476.4,1411.5,1569.5,1707.8,1818.1,1924.4 diff --git a/taxcalc/tests/pufcsv_mtr_expect.txt b/taxcalc/tests/pufcsv_mtr_expect.txt index e1af466eb..736f9bbb2 100644 --- a/taxcalc/tests/pufcsv_mtr_expect.txt +++ b/taxcalc/tests/pufcsv_mtr_expect.txt @@ -5,14 +5,14 @@ PTAX mtr histogram bin edges: ITAX mtr histogram bin edges: [-1.0, -0.3, -0.2, -0.1, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 1.0] PTAX and ITAX mtr histogram bin counts for e00200p: -252868 : 0 31688 0 0 0 0 0 212978 8202 0 -252868 : 7375 73 1968 13075 45796 75959 50473 32286 25083 780 +252868 : 0 27604 0 0 0 0 0 225264 0 0 +252868 : 7375 73 2056 13084 45751 76620 50855 31268 25019 767 PTAX and ITAX mtr histogram bin counts for e00200s: -119177 : 0 20320 0 0 0 0 0 89689 9168 0 -119177 : 1449 22 766 2748 11482 31181 26117 24104 20741 567 +119177 : 0 19575 0 0 0 0 0 99602 0 0 +119177 : 1449 22 793 2751 11461 31291 26217 22346 22287 560 PTAX and ITAX mtr histogram bin counts for e00900p: -252868 : 213350 6583 0 0 0 0 0 32935 0 0 -252868 : 7375 73 1967 12885 47678 74871 51672 32978 22726 643 +252868 : 252868 0 0 0 0 0 0 0 0 0 +252868 : 6835 305 1552 11855 42872 71235 52251 30593 31274 4096 PTAX and ITAX mtr histogram bin counts for e00300: 252868 : 252868 0 0 0 0 0 0 0 0 0 252868 : 0 0 0 0 67635 76846 46558 31872 29139 818 @@ -59,5 +59,5 @@ PTAX and ITAX mtr histogram bin counts for e20100: 252868 : 252868 0 0 0 0 0 0 0 0 0 252868 : 39528 32464 19815 4932 156129 0 0 0 0 0 PTAX and ITAX mtr histogram bin counts for k1bx14p: -252868 : 213350 6583 0 0 0 0 0 32935 0 0 -252868 : 7375 73 1967 12885 47678 74871 51672 32978 22726 643 +252868 : 252868 0 0 0 0 0 0 0 0 0 +252868 : 6835 305 1552 11855 42872 71235 52251 30593 31274 4096 diff --git a/taxcalc/tests/reforms_expect.csv b/taxcalc/tests/reforms_expect.csv index bab229d1f..0167093df 100644 --- a/taxcalc/tests/reforms_expect.csv +++ b/taxcalc/tests/reforms_expect.csv @@ -1,9 +1,9 @@ rid,res1,res2,res3,res4 -1,63.8,64.9,68.1,71.0 -2,52.1,56.2,51.1,59.3 -3,76.4,77.7,81.8,85.8 -4,-0.3,-0.3,-0.3,-0.4 -5,0.7,0.7,0.8,0.9 +1,60.8,61.9,64.9,67.6 +2,50.4,54.6,49.5,57.2 +3,73.3,74.5,78.4,82.2 +4,0.0,0.0,0.0,0.0 +5,0.0,0.0,0.0,0.0 6,37.9,37.8,39.4,40.8 7,7.2,7.4,7.5,7.9 8,1.9,1.9,2.1,2.2 @@ -52,12 +52,12 @@ rid,res1,res2,res3,res4 51,-0.3,-0.3,-0.5,-0.5 52,-187.0,-187.5,-193.6,-200.7 53,-130.0,-129.3,-132.7,-136.9 -54,31.3,33.8,32.1,41.9 +54,30.7,33.2,31.5,41.2 55,86.1,90.9,95.0,102.5 56,0.0,0.0,0.0,0.0 57,-14.1,-15.6,-16.0,-14.5 58,-15.5,-17.1,-17.5,-15.9 -59,-66.1,-66.2,-66.2,-66.4 +59,-66.9,-66.9,-67.0,-67.1 60,-67.3,-67.2,-67.3,-67.4 61,-1.0,-0.5,-0.6,-1.3 62,-17.2,-17.7,-23.8,-19.4 diff --git a/taxcalc/tests/test_calcfunctions.py b/taxcalc/tests/test_calcfunctions.py index a25339a22..192a37d89 100644 --- a/taxcalc/tests/test_calcfunctions.py +++ b/taxcalc/tests/test_calcfunctions.py @@ -244,18 +244,18 @@ def test_StdDed(test_tuple, expected_value, skip_jit): None, None, None, None, None, None) expected1 = (0, 4065, 4065, 0, 0, 3252, 25000, 10000, 15000, 10100, 17000) -expected2 = (15000, 6146.25, 4065, 2081.25, 1040.625, 4917, 38959.375, +expected2 = (15000, 4065, 4065, 2081.25, 1040.625, 4917, 38959.375, 21167.5, 17791.875, 21380, 19820) -expected3 = (15000, 22202.25, 21453, 749.25, 374.625, 16773, 179625.375, +expected3 = (15000, 21453, 21453, 749.25, 374.625, 16773, 179625.375, 161833.5, 17791.875, 161380, 19820) -expected4 = (15000, 46067.85, 31953, 749.25, 374.625, 30138.6, +expected4 = (15000, 45318.6, 31953, 749.25, 374.625, 30138.6, 529625.375, 511833.5, 17791.875, 511380, 19820) expected5 = (300, 4065, 4065, 0, 0, 3285.3, 25300, 10279.1875, 15000, 10382, 17000) expected6 = (-40000, 4065, 4065, 0, 0, 3252, 0, 0, 15000, 10100, 17000) @pytest.mark.parametrize( - 'test_tuple,expected_value', [ + 'test_input, expected_output', [ (tuple1, expected1), (tuple2, expected2), (tuple3, expected3), @@ -263,15 +263,16 @@ def test_StdDed(test_tuple, expected_value, skip_jit): (tuple5, expected5), (tuple6, expected6)], ids=[ 'case 1', 'case 2', 'case 3', 'case 4', 'case 5', 'case 6']) -def test_EI_PayrollTax(test_tuple, expected_value, skip_jit): +def test_EI_PayrollTax(test_input, expected_output, skip_jit): """ Tests the EI_PayrollTax function """ - test_value = calcfunctions.EI_PayrollTax(*test_tuple) - print('Test value = ', test_value) - - assert np.allclose(test_value, expected_value) - + actual_output = calcfunctions.EI_PayrollTax(*test_input) + if not np.allclose(actual_output, expected_output): + print('*INPUT:', test_input) + print('ACTUAL:', actual_output) + print('EXPECT:', expected_output) + assert 1 == 2, 'ACTUAL != EXPECT' def test_AfterTaxIncome(skip_jit): ''' diff --git a/taxcalc/tests/test_pufcsv.py b/taxcalc/tests/test_pufcsv.py index 3a74d8395..05ffa1be0 100644 --- a/taxcalc/tests/test_pufcsv.py +++ b/taxcalc/tests/test_pufcsv.py @@ -234,9 +234,7 @@ def test_mtr(tests_path, puf_path): assert np.allclose((calc.array('iitax') + calc.array('payrolltax')), calc.array('combined')) - assert np.allclose((calc.array('ptax_was') + - calc.array('setax') + - calc.array('ptax_amc')), + assert np.allclose(calc.array('ptax_was'), calc.array('payrolltax')) assert np.allclose(calc.array('c21060') - calc.array('c21040'), calc.array('c04470')) diff --git a/taxcalc/tests/test_utils.py b/taxcalc/tests/test_utils.py index 21276e5be..6c72266f9 100644 --- a/taxcalc/tests/test_utils.py +++ b/taxcalc/tests/test_utils.py @@ -193,20 +193,20 @@ def test_create_tables(cps_subsample): tabcol = 'iitax' expected = [0.0, 0.0, - -0.4, - -4.1, - -5.9, - 8.0, - 16.9, - 29.0, - 27.0, - 71.4, - 153.4, - 910.1, - 1205.5, + -0.3, + -3.8, + -5.4, + 14.8, + 21.8, + 34.4, + 32.9, + 75.8, 159.4, - 268.1, - 482.7] + 930.7, + 1260.3, + 162.9, + 278.0, + 489.7] if not np.allclose(dist[tabcol].values.astype('float'), expected, atol=0.1, rtol=0.0): test_failure = True @@ -291,18 +291,18 @@ def test_create_tables(cps_subsample): tabcol = 'iitax' expected = [0.0, 0.0, - -1.3, - -7.6, -1.2, - 20.7, - 26.3, - 47.2, - 95.5, - 321.9, - 324.0, - 64.8, - 315.2, - 1205.5] + -7.2, + 3.2, + 26.1, + 32.8, + 54.4, + 100.9, + 334.8, + 335.3, + 65.6, + 315.5, + 1260.3] if not np.allclose(dist[tabcol].values.astype('float'), expected, atol=0.1, rtol=0.0): test_failure = True