diff --git a/docs/about/releases.md b/docs/about/releases.md index 88334cf50..70c8d7119 100644 --- a/docs/about/releases.md +++ b/docs/about/releases.md @@ -4,6 +4,26 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose for a complete commit history. +2024-11-30 Release 4.3.4 +------------------------ +(last merged pull request is +[#2844](https://github.com/PSLmodels/Tax-Calculator/pull/2844)) + +**This is a bug-fix release.** + +**API Changes** + +**New Features** + +**Bug Fixes** +- Fix deprecation warning when using pip to install an editable package +[[#2840](https://github.com/PSLmodels/Tax-Calculator/pull/2840) by Jason DeBacker] +- Fix weights precision in output file when using CLI tool with TMD input data +[[#2841](https://github.com/PSLmodels/Tax-Calculator/pull/2841) by Martin Holmer] +- Fix categorization of self-employment tax and additional Medicare tax +[[#2844](https://github.com/PSLmodels/Tax-Calculator/pull/2844) by Martin Holmer] + + 2024-11-14 Release 4.3.3 ------------------------ (last merged pull request is diff --git a/docs/index.md b/docs/index.md index ba6115221..adb95c1f3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -57,7 +57,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described ## Latest release -{doc}`4.3.3 (2024-11-14) ` +{doc}`4.3.4 (2024-11-30) ` If you are already using Tax-Calculator, upgrade using the following command: @@ -68,7 +68,7 @@ conda update conda-forge::taxcalc or ``` -pip install -U taxcalc +pip install --upgrade taxcalc ``` If you're a new user, read {doc}`usage/starting`. diff --git a/setup.py b/setup.py index a6b665ede..fb16ce918 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ with open("README.md") as f: longdesc = f.read() -version = "4.3.3" +version = "4.3.4" config = { "description": "Tax Calculator", diff --git a/taxcalc.egg-info/PKG-INFO b/taxcalc.egg-info/PKG-INFO index 4841fd28a..60eb54244 100644 --- a/taxcalc.egg-info/PKG-INFO +++ b/taxcalc.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: taxcalc -Version: 4.3.3 +Version: 4.3.4 Summary: taxcalc Home-page: https://github.com/PSLmodels/Tax-Calculator Download-URL: https://github.com/PSLmodels/Tax-Calculator diff --git a/taxcalc/__init__.py b/taxcalc/__init__.py index 0daa7de10..9aba956b3 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.4' __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/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/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 94f9e9b1d..4e25122af 100644 --- a/taxcalc/reforms/Renacci.out.csv +++ b/taxcalc/reforms/Renacci.out.csv @@ -7,4 +7,4 @@ RECID,c00100,standard,c04800,iitax,payrolltax 23,240000.00,32186.76,186355.40,30495.47,36720.00 31,30000.00,16093.38,3177.70,-5939.56,4590.00 32,60000.00,16093.38,33177.70,517.77,9180.00 -33,120000.00,16093.38,93177.70,13822.74,18360.00 +33,120000.00,16093.38,93177.70,13822.74,18360.00 \ No newline at end of file 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/Trump2016.out.csv b/taxcalc/reforms/Trump2016.out.csv index 7fe7b380c..7d6d43c4b 100644 --- a/taxcalc/reforms/Trump2016.out.csv +++ b/taxcalc/reforms/Trump2016.out.csv @@ -7,4 +7,4 @@ RECID,c00100,standard,c04800,iitax,payrolltax 23,240000.00,32186.76,207813.24,41492.61,36720.00 31,30000.00,16093.38,13906.62,-3129.39,4590.00 32,60000.00,16093.38,43906.62,2946.31,9180.00 -33,120000.00,16093.38,103906.62,19321.31,18360.00 +33,120000.00,16093.38,103906.62,19321.31,18360.00 \ No newline at end of file diff --git a/taxcalc/reforms/Trump2017.out.csv b/taxcalc/reforms/Trump2017.out.csv index 6f395aea4..e1c3b4fef 100644 --- a/taxcalc/reforms/Trump2017.out.csv +++ b/taxcalc/reforms/Trump2017.out.csv @@ -7,4 +7,4 @@ RECID,c00100,standard,c04800,iitax,payrolltax 23,240000.00,27251.46,195367.70,36627.05,36720.00 31,30000.00,20063.08,1246.50,-4673.54,4590.00 32,60000.00,20063.08,31246.50,324.65,9180.00 -33,120000.00,20063.08,91246.50,13211.19,18360.00 +33,120000.00,20063.08,91246.50,13211.19,18360.00 \ No newline at end of file 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/ext.json b/taxcalc/reforms/ext.json index cd2e2d89f..7c1228662 100644 --- a/taxcalc/reforms/ext.json +++ b/taxcalc/reforms/ext.json @@ -1,5 +1,5 @@ // REFORM TO EXTEND TEMPORARY TCJA PROVISIONS BEYOND 2025 -// USING TAX-CALCULATOR 4.3.3 +// USING TAX-CALCULATOR 4.3.4 // WITH 2025-to-2026 INDEXING FACTOR = 1.022000 // AND 2028-to-2029 INDEXING FACTOR = 1.019400 { diff --git a/taxcalc/reforms/ptaxes1.out.csv b/taxcalc/reforms/ptaxes1.out.csv index 213ad1f8c..f0c943576 100644 --- a/taxcalc/reforms/ptaxes1.out.csv +++ b/taxcalc/reforms/ptaxes1.out.csv @@ -7,4 +7,4 @@ RECID,c00100,standard,c04800,iitax,payrolltax 23,240000.00,13625.73,208993.43,44446.65,36720.00 31,30000.00,10031.54,11278.04,-3670.39,4590.00 32,60000.00,10031.54,41278.04,2675.55,9180.00 -33,120000.00,10031.54,101278.04,17728.06,18360.00 +33,120000.00,10031.54,101278.04,17728.06,18360.00 \ No newline at end of file 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/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/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/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