From 17ec7eb8bbf00607c65cad499dd73a839d385c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Cavelan?= Date: Fri, 12 Jan 2024 11:21:37 +0100 Subject: [PATCH 1/2] set minimum monthly EIR to 1% of the max monthly EIR --- model/Transmission/transmission.h | 9 +++++---- util/fourier.html | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/model/Transmission/transmission.h b/model/Transmission/transmission.h index 5936c55e9..8b4b90d4d 100644 --- a/model/Transmission/transmission.h +++ b/model/Transmission/transmission.h @@ -157,17 +157,18 @@ inline Anopheles::AnophelesModel *createAnophelesModel(size_t i, const scnXml::A const scnXml::MonthlyValues::ValueSequence seq = seasM.getValue(); assert(seq.size() == N_m); // enforced by schema vector months(N_m); - double sum = 0.0; + double maxEIR = months[0]; for (size_t i = 0; i < N_m; ++i) { months[i] = seq[i]; - sum += months[i]; + if(months[i] > maxEIR) + maxEIR = months[i]; } // arbitrary minimum we allow (cannot have zeros since we take the logarithm) - double min = sum / 1000.0; + double min = maxEIR / 100.0; for (size_t i = 0; i < N_m; ++i) { - if (months[i] < min) months[i] = min; + if (months[i] < min) months[i] += min; } FSCoeffic.assign(5, 0.0); diff --git a/util/fourier.html b/util/fourier.html index 88b96a0ac..5054d2e9b 100644 --- a/util/fourier.html +++ b/util/fourier.html @@ -241,12 +241,28 @@ var timeseries = textarea.value.split("\n"); var size = timeseries.length; + var maxEIR = -1; + for(var i=0; i maxEIR) + maxEIR = v; + } + + minimum = maxEIR / 100.0; + + for(var i=0; i { From 7c46d2c9898fe4e5f4c47054896dd79b523adc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Cavelan?= Date: Fri, 12 Jan 2024 11:53:51 +0100 Subject: [PATCH 2/2] update tests --- test/expected/ctsout2ITNs.txt | 290 ++-- test/expected/ctsoutIRS30.txt | 290 ++-- test/expected/ctsoutRach5IC.txt | 290 ++-- test/expected/output2ITNs.txt | 952 ++++++------ .../expected/outputDecisionTree5DayDielmo.txt | 88 +- test/expected/outputIRS30.txt | 932 +++++------ test/expected/outputRach5IC.txt | 1368 ++++++++--------- 7 files changed, 2105 insertions(+), 2105 deletions(-) diff --git a/test/expected/ctsout2ITNs.txt b/test/expected/ctsout2ITNs.txt index 65d6dd490..585423c38 100644 --- a/test/expected/ctsout2ITNs.txt +++ b/test/expected/ctsout2ITNs.txt @@ -1,147 +1,147 @@ ## ## timestep input EIR simulated EIR human infectiousness immunity h immunity Y recent births ITN coverage IRS coverage GVI coverage -0 0.00385527 0.00385018 0.0063402 7.32789 9.16888e+06 0 0 0 0 -1 0.00515328 0.00440028 0.00614883 7.33095 9.16901e+06 2 0.00102145 0 0.00102145 -2 0.00675283 0.00512261 0.00592789 7.33708 9.16916e+06 2 0.0020429 0 0.0020429 -3 0.00861585 0.00589298 0.00560806 7.33912 9.16928e+06 2 0.0020429 0 0.0020429 -4 0.01064 0.00668804 0.00575734 7.34014 9.16956e+06 2 0.00306435 0 0.00306435 -5 0.012656 0.00740572 0.00560258 7.32074 9.17181e+06 2 0.00306435 0 0.00306435 -6 0.0144463 0.00793228 0.006387 7.32891 9.17354e+06 2 0.00306435 0 0.00306435 -7 0.0157858 0.0083808 0.0076165 7.33095 9.17707e+06 2 0.0040858 0 0.0040858 -8 0.0164951 0.00861711 0.00804262 7.33299 9.1773e+06 2 0.00510725 0 0.00510725 -9 0.0164868 0.0089544 0.00759262 7.33606 9.17807e+06 2 0.0061287 0 0.0061287 -10 0.0157872 0.00947154 0.00723544 7.34423 9.17883e+06 2 0.0081716 0 0.0081716 -11 0.0145248 0.00970769 0.00795186 7.34831 9.1792e+06 2 0.00715015 0 0.00715015 -12 0.012892 0.00935005 0.00839201 7.35138 9.17965e+06 2 0.0081716 0 0.0081716 -13 0.0110958 0.00860058 0.00824211 7.3524 7.64478e+06 2 0.00919305 0 0.00919305 -14 0.00931612 0.00787386 0.00775504 7.35853 7.64878e+06 2 0.00919305 0 0.00919305 -15 0.00768207 0.00716443 0.00847254 7.36568 7.66579e+06 2 0.0081716 0 0.0081716 -16 0.00626659 0.00637053 0.00958031 7.3667 7.68328e+06 2 0.0081716 0 0.0081716 -17 0.0050952 0.00552001 0.00984115 7.37283 7.68556e+06 2 0.0081716 0 0.0081716 -18 0.00416062 0.00481648 0.00982737 7.34423 7.65886e+06 2 0.0102145 0 0.0102145 -19 0.00343742 0.0041517 0.0095343 7.34525 7.65951e+06 2 0.0081716 0.0551583 0.0081716 -20 0.00289344 0.00358046 0.0104033 7.34831 7.66035e+06 2 0.00919305 0.11236 0.00919305 -21 0.00249722 0.00305562 0.00987394 7.32482 7.6506e+06 2 0.0102145 0.168539 0.0102145 -22 0.00222204 0.00252419 0.00934308 7.32482 7.65151e+06 2 0.0102145 0.24617 0.0102145 -23 0.00204764 0.00215462 0.0090762 7.32482 7.6523e+06 2 0.0102145 0.277835 0.0102145 -24 0.0019607 0.00181906 0.00872161 7.32686 7.65548e+06 2 0.011236 0.3381 0.011236 -25 0.00195491 0.00152321 0.00921364 7.32891 7.66081e+06 2 0.0122574 0.393258 0.0122574 -26 0.00203106 0.00121536 0.0104343 7.32993 7.66272e+06 2 0.0122574 0.45761 0.0122574 -27 0.0021975 0.00102676 0.00987711 7.32482 7.41752e+06 2 0.0132789 0.509704 0.0132789 -28 0.0024711 0.000937697 0.00970645 7.32482 7.41885e+06 2 0.0132789 0.568948 0.0132789 -29 0.00287868 0.000940816 0.00983068 7.32176 7.42091e+06 2 0.0143003 0.637385 0.0143003 -30 0.00345862 0.00104706 0.00996751 7.32278 7.42294e+06 2 0.0143003 0.678243 0.0143003 -31 0.00426217 0.00121923 0.00979344 7.32584 7.42389e+06 2 0.0143003 0.677222 0.0143003 -32 0.00535303 0.00140845 0.00937437 7.32278 7.425e+06 2 0.0153218 0.677222 0.0153218 -33 0.00680351 0.00171375 0.00672831 7.32074 7.42653e+06 2 0.0163432 0.6762 0.0163432 -34 0.00868452 0.00216697 0.00420828 7.31461 7.42779e+06 2 0.0183861 0.675179 0.0183861 -35 0.0110471 0.0026767 0.00241231 7.3095 7.42031e+06 2 0.0183861 0.674157 0.0183861 -36 0.0138943 0.00291376 0.0032106 7.31256 7.42136e+06 2 0.0183861 0.673136 0.0183861 -37 0.0171483 0.00273649 0.00325975 7.30541 7.42184e+06 2 0.0183861 0.673136 0.0183861 -38 0.0206201 0.00232352 0.00315425 7.30644 7.42244e+06 2 0.0183861 0.672114 0.0183861 -39 0.0240013 0.00233101 0.00308633 7.29111 7.41793e+06 2 0.0194076 0.671093 0.0194076 -40 0.0268914 0.00252288 0.0034221 7.29316 7.41845e+06 2 0.0183861 0.670072 0.0183861 -41 0.0288693 0.00265326 0.00398697 7.28294 7.40259e+06 2 0.0194076 0.66905 0.0194076 -42 0.0295951 0.00271872 0.00422495 7.28498 7.40304e+06 2 0.020429 0.66905 0.020429 -43 0.0289091 0.00287427 0.00441479 7.28601 7.40355e+06 2 0.0183861 0.668029 0.0183861 -44 0.0268867 0.00313415 0.00458392 7.28907 7.40432e+06 2 0.0183861 0.668029 0.0183861 -45 0.0238226 0.00330261 0.00482729 7.29111 7.40475e+06 2 0.0194076 0.667007 0.0194076 -46 0.0201484 0.00331156 0.0051132 7.27171 7.40277e+06 2 0.0214505 0.665986 0.0214505 -47 0.0163203 0.00321094 0.00538368 7.27783 7.4031e+06 2 0.0214505 0.665986 0.0214505 -48 0.0127182 0.0030333 0.00544617 7.28294 7.4034e+06 2 0.0214505 0.664964 0.0214505 -49 0.0095897 0.00280054 0.00536332 7.26762 7.40365e+06 2 0.0224719 0.663943 0.0224719 -50 0.007043 0.00252295 0.00548136 7.26864 7.40425e+06 2 0.0245148 0.663943 0.0245148 -51 0.00507609 0.00219523 0.00540837 7.26864 7.40489e+06 2 0.0234934 0.663943 0.0234934 -52 0.0036193 0.0018375 0.00758644 7.24923 7.38816e+06 2 0.0245148 0.662921 0.0245148 -53 0.0025746 0.00148452 0.0087469 7.25128 7.38864e+06 2 0.0245148 0.662921 0.0245148 -54 0.00184294 0.00117539 0.00943748 7.25128 7.38907e+06 2 0.0255363 0.662921 0.0255363 -55 0.0013388 0.000977357 0.00908845 7.2523 7.38941e+06 2 0.0245148 0.662921 0.0245148 -56 0.000995066 0.000834501 0.00862846 7.23289 7.38126e+06 2 0.0245148 0.6619 0.0245148 -57 0.000762435 0.000718872 0.00789523 7.23391 7.38155e+06 2 0.0234934 0.6619 0.0234934 -58 0.00060632 0.000611549 0.00787235 7.20225 7.37031e+06 2 0.0255363 0.660878 0.0255363 -59 0.000503328 0.000515957 0.00735153 7.20225 7.37056e+06 2 0.0245148 0.660878 0.0245148 -60 0.000438174 0.000434374 0.00731828 7.20225 7.37082e+06 2 0.0245148 0.659857 0.0245148 -61 0.000401349 0.000370778 0.00703991 7.20225 7.37119e+06 2 0.0255363 0.659857 0.0255363 -62 0.00038753 0.000323052 0.00688005 7.20225 7.37149e+06 2 0.0265577 0.659857 0.0265577 -63 0.000394636 0.000295162 0.00656264 7.20225 7.37187e+06 2 0.0265577 0.659857 0.0265577 -64 0.000423411 0.000285312 0.00605689 7.20225 7.37207e+06 2 0.0255363 0.659857 0.0255363 -65 0.000477476 0.000292578 0.00566236 7.20225 7.37222e+06 2 0.0255363 0.659857 0.0255363 -66 0.000563808 0.000318447 0.00517548 7.19714 7.37235e+06 2 0.0265577 0.658836 0.0265577 -67 0.000693638 0.000363128 0.00461872 7.18999 7.37088e+06 2 0.0275792 0.658836 0.0275792 -68 0.000883733 0.000435728 0.00420116 7.18999 7.37097e+06 2 0.0275792 0.658836 0.0275792 -69 0.00115791 0.00053792 0.00366505 7.18999 7.37107e+06 2 0.0286006 0.658836 0.0286006 -70 0.00154837 0.000664642 0.00326507 7.18488 7.37051e+06 2 0.0296221 0.658836 0.0296221 -71 0.00209609 0.000818027 0.00312362 7.18488 7.37059e+06 2 0.0296221 0.658836 0.0296221 -72 0.00284885 0.000988748 0.00295302 7.18182 7.37029e+06 2 0.0296221 0.657814 0.0296221 -73 0.00385527 0.00118622 0.00284902 7.18182 7.37036e+06 2 0.0286006 0.657814 0.0286006 -74 0.00515328 0.000875528 0.0028594 7.17978 7.37032e+06 2 0.516854 0.656793 0.0296221 -75 0.00675283 0.000946222 0.00259724 7.18182 7.37037e+06 2 0.515832 0.656793 0.0306435 -76 0.00861585 0.000987908 0.00233897 7.18182 7.37042e+06 2 0.514811 0.656793 0.0296221 -77 0.01064 0.000949062 0.00203986 7.17875 7.37048e+06 2 0.514811 0.655771 0.0296221 -78 0.012656 0.000897728 0.00195062 7.17875 7.37083e+06 2 0.51379 0.655771 0.0306435 -79 0.0144463 0.000850675 0.00214712 7.17671 7.37103e+06 2 0.514811 0.655771 0.031665 -80 0.0157858 0.000793518 0.00308136 7.16956 7.36963e+06 2 0.512768 0.65475 0.031665 -81 0.0164951 0.00072499 0.00293549 7.16445 7.35658e+06 2 0.512768 0.653728 0.0326864 -82 0.0164868 0.000692608 0.00286992 7.14811 7.35176e+06 2 0.514811 0.652707 0.0347293 -83 0.0157872 0.000740783 0.00281798 7.14811 7.35195e+06 2 0.51379 0.652707 0.0337079 -84 0.0145248 0.000742751 0.00275693 7.14811 7.35214e+06 2 0.512768 0.652707 0.0326864 -85 0.012892 0.000694772 0.00245622 7.14913 7.35265e+06 2 0.511747 0.652707 0.031665 -86 0.0110958 0.000623475 0.00265909 7.15117 7.35338e+06 2 0.510725 0.652707 0.031665 -87 0.00931612 0.000542624 0.00256636 7.14709 7.35299e+06 2 0.510725 0.651685 0.0326864 -88 0.00768207 0.000453101 0.00254965 7.14709 7.3532e+06 2 0.509704 0.651685 0.031665 -89 0.00626659 0.000384558 0.002635 7.14709 7.35343e+06 2 0.508682 0.651685 0.0306435 -90 0.0050952 0.000322966 0.00257079 7.12768 7.35368e+06 2 0.510725 0.650664 0.0326864 -91 0.00416062 0.000268318 0.00271641 7.12768 7.35392e+06 2 0.508682 0.650664 0.0306435 -92 0.00343742 0.00022438 0.00270664 7.12768 7.3542e+06 2 0.507661 0.650664 0.0296221 -93 0.00289344 0.000190936 0.00254936 7.1287 7.35435e+06 2 0.507661 0.650664 0.0296221 -94 0.00249722 0.000168989 0.00250188 7.1287 7.35453e+06 2 0.508682 0.650664 0.0306435 -95 0.00222204 0.000153535 0.00222111 7.1287 7.35467e+06 2 0.507661 0.650664 0.0296221 -96 0.00204764 0.000142123 0.00205138 7.11747 7.35094e+06 2 0.508682 0.650664 0.0306435 -97 0.0019607 0.000134967 0.00202323 7.11747 7.35107e+06 2 0.508682 0.650664 0.0306435 -98 0.00195491 0.000130234 0.00228122 7.12053 7.35118e+06 2 0.509704 0.650664 0.031665 -99 0.00203106 0.000128462 0.00233771 7.11134 7.34932e+06 2 0.509704 0.649642 0.0326864 -100 0.0021975 0.000134577 0.00211355 7.11134 7.34942e+06 2 0.509704 0.649642 0.0326864 -101 0.0024711 0.000157798 0.00184941 7.11134 7.34956e+06 2 0.508682 0.649642 0.031665 -102 0.00287868 0.000193575 0.00175605 7.10112 7.34768e+06 2 0.510725 0.648621 0.0337079 -103 0.00345862 0.000229403 0.0021228 7.10215 7.34775e+06 2 0.509704 0.648621 0.0326864 -104 0.00426217 0.000252501 0.00204117 7.08784 7.33521e+06 2 0.510725 0.677222 0.0337079 -105 0.00535303 0.00028587 0.00199381 7.08784 7.33532e+06 2 0.510725 0.700715 0.0337079 -106 0.00680351 0.00037527 0.00196433 7.08784 7.33558e+06 2 0.511747 0.715015 0.0357508 -107 0.00868452 0.000478958 0.00197745 7.08784 7.33588e+06 2 0.509704 0.73238 0.0337079 -108 0.0110471 0.000571049 0.00257075 7.08784 7.33623e+06 2 0.509704 0.750766 0.0337079 -109 0.0138943 0.000667445 0.00256552 7.07354 7.32925e+06 2 0.510725 0.766088 0.0347293 -110 0.0171483 0.000751674 0.00259718 7.07354 7.32949e+06 2 0.512768 0.784474 0.0367722 -111 0.0206201 0.000830247 0.00253483 7.07354 7.3297e+06 2 0.511747 0.806946 0.0357508 -112 0.0240013 0.000858286 0.00258153 7.05312 7.30676e+06 2 0.510725 0.829418 0.0357508 -113 0.0268914 0.000843277 0.00244841 7.05312 7.30683e+06 2 0.508682 0.853933 0.0347293 -114 0.0288693 0.000745872 0.0022196 7.05414 7.30692e+06 2 0.509704 0.877426 0.0357508 -115 0.0295951 0.000656201 0.00196566 7.05516 7.30706e+06 2 0.509704 0.893769 0.0357508 -116 0.0289091 0.000615486 0.00185864 7.01941 7.29786e+06 2 0.510725 0.892748 0.0367722 -117 0.0268867 0.00054679 0.00189519 7.02043 7.29793e+06 2 0.509704 0.892748 0.0367722 -118 0.0238226 0.000437306 0.00172464 7.02247 7.29803e+06 2 0.509704 0.891726 0.0377937 -119 0.0201484 0.000340151 0.00172502 7.02247 7.29814e+06 2 0.508682 0.891726 0.0367722 -120 0.0163203 0.0002727 0.00210705 7.02247 7.29825e+06 2 0.507661 0.890705 0.0367722 -121 0.0127182 0.000217957 0.0023296 7.02247 7.29841e+06 2 0.508682 0.889683 0.0377937 -122 0.0095897 0.00017301 0.00244554 7.02247 7.29863e+06 2 0.509704 0.888662 0.0398366 -123 0.007043 0.000138453 0.0031115 7.02247 7.29884e+06 2 0.509704 0.888662 0.0398366 -124 0.00507609 0.000113042 0.00314019 7.02247 7.29897e+06 2 0.510725 0.88764 0.040858 -125 0.0036193 9.25167e-05 0.00310384 7.00306 7.29876e+06 2 0.510725 0.886619 0.0418795 -126 0.0025746 8.21155e-05 0.00302608 7.00306 7.29889e+06 2 0.511747 0.886619 0.0429009 -127 0.00184294 7.27004e-05 0.00291063 7.00204 7.29879e+06 2 0.510725 0.886619 0.0418795 -128 0.0013388 6.14995e-05 0.0026703 6.99183 7.29839e+06 2 0.510725 0.885598 0.0429009 -129 0.000995066 5.07938e-05 0.0027648 6.99183 7.29849e+06 2 0.509704 0.885598 0.0418795 -130 0.000762435 4.11177e-05 0.00279226 6.99183 7.29862e+06 2 0.510725 0.885598 0.0429009 -131 0.00060632 3.31224e-05 0.00288079 6.99183 7.29872e+06 2 0.509704 0.884576 0.0429009 -132 0.000503328 2.69032e-05 0.00294848 6.98161 7.27879e+06 2 0.510725 0.883555 0.0439224 -133 0.000438174 2.20772e-05 0.00298414 6.98161 7.27887e+06 2 0.509704 0.883555 0.0429009 -134 0.000401349 1.86894e-05 0.00272036 6.98161 7.27894e+06 2 0.511747 0.883555 0.0449438 -135 0.00038753 1.67618e-05 0.00249352 6.97446 7.27896e+06 2 0.511747 0.882533 0.0449438 -136 0.000394636 1.61501e-05 0.00248077 6.95403 7.2414e+06 2 0.511747 0.881512 0.0459653 -137 0.000423411 1.65306e-05 0.00238699 6.95403 7.24146e+06 2 0.511747 0.881512 0.0459653 -138 0.000477476 1.80729e-05 0.00230418 6.95403 7.24152e+06 2 0.512768 0.881512 0.0469867 -139 0.000563808 2.10399e-05 0.00218399 6.95403 7.24155e+06 2 0.510725 0.88049 0.0459653 -140 0.000693638 2.61219e-05 0.00213611 6.95403 7.24159e+06 2 0.510725 0.88049 0.0459653 -141 0.000883733 3.42038e-05 0.00191969 6.95403 7.24161e+06 2 0.508682 0.879469 0.0459653 -142 0.00115791 4.55204e-05 0.00169127 6.95403 7.24163e+06 2 0.508682 0.879469 0.0459653 -143 0.00154837 6.01791e-05 0.0013537 6.95301 7.24165e+06 2 0.507661 0.878447 0.0459653 -144 0.00209609 7.56422e-05 0.00127575 6.93973 7.24144e+06 2 0.507661 0.877426 0.0469867 +0 0.00438891 0.0043877 0.00741798 7.57712 1.89763e+07 0 0 0 0 +1 0.0056305 0.00897747 0.00706987 7.58733 1.8978e+07 2 0.00102145 0 0.00102145 +2 0.00711367 0.00958291 0.00673772 7.58836 1.89698e+07 2 0.0020429 0 0.0020429 +3 0.00880092 0.00993703 0.00650562 7.58529 1.89701e+07 2 0.0040858 0 0.0040858 +4 0.0106093 0.0101131 0.0062058 7.5904 1.8971e+07 2 0.0040858 0 0.0040858 +5 0.01241 0.0101051 0.00593071 7.58938 1.89674e+07 2 0.0040858 0 0.0040858 +6 0.0140411 0.00989544 0.00650151 7.59142 1.89698e+07 2 0.0040858 0 0.0040858 +7 0.0153333 0.00946996 0.00674394 7.59448 1.89712e+07 2 0.0040858 0 0.0040858 +8 0.0161441 0.00887767 0.00757946 7.59142 1.89729e+07 2 0.0040858 0 0.0040858 +9 0.0163889 0.00840589 0.00803161 7.57508 1.89737e+07 2 0.00510725 0 0.00510725 +10 0.0160592 0.00795575 0.00886308 7.57814 1.89742e+07 2 0.0061287 0 0.0061287 +11 0.0152222 0.00759372 0.00873164 7.58121 1.89759e+07 2 0.0061287 0 0.0061287 +12 0.0140017 0.00721422 0.00793391 7.58733 1.89797e+07 2 0.0061287 0 0.0061287 +13 0.0125478 0.00684932 0.00936347 7.5904 1.89822e+07 2 0.00715015 0 0.00715015 +14 0.0110079 0.00634689 0.00955595 7.59346 1.89827e+07 2 0.0061287 0 0.0061287 +15 0.00950419 0.00567912 0.00980872 7.59551 1.8983e+07 2 0.0061287 0 0.0061287 +16 0.0081229 0.00520241 0.00968421 7.59959 1.89834e+07 2 0.00715015 0 0.00715015 +17 0.00691367 0.00480024 0.00958932 7.5904 1.89792e+07 2 0.00715015 0 0.00715015 +18 0.00589594 0.00444018 0.00953388 7.55975 1.89514e+07 2 0.0081716 0 0.0081716 +19 0.00506796 0.00393229 0.00919237 7.56078 1.89524e+07 2 0.0081716 0.0592441 0.0081716 +20 0.00441572 0.0035074 0.00868863 7.56282 1.89534e+07 2 0.00919305 0.117467 0.00919305 +21 0.00392009 0.00316514 0.00823525 7.56282 1.89566e+07 2 0.0081716 0.171604 0.0081716 +22 0.00356182 0.00285114 0.00982801 7.56588 1.89592e+07 2 0.00919305 0.230848 0.00919305 +23 0.00332456 0.00254395 0.0110716 7.55567 1.89609e+07 2 0.0102145 0.286006 0.0102145 +24 0.00319662 0.00230432 0.0107882 7.52707 1.896e+07 2 0.011236 0.356486 0.011236 +25 0.00317187 0.00229584 0.0110327 7.52911 1.89613e+07 2 0.011236 0.403473 0.011236 +26 0.00325023 0.00235083 0.0106067 7.53013 1.89625e+07 2 0.011236 0.454545 0.011236 +27 0.00343812 0.00220992 0.0100627 7.53013 1.89637e+07 2 0.0122574 0.534219 0.0122574 +28 0.00374887 0.00212893 0.0107592 7.52911 1.8965e+07 2 0.0143003 0.57712 0.0143003 +29 0.00420305 0.00200242 0.0104823 7.52911 1.89662e+07 2 0.0143003 0.629213 0.0143003 +30 0.00482845 0.00174784 0.0098241 7.4954 1.89642e+07 2 0.0143003 0.709908 0.0143003 +31 0.00565916 0.00189351 0.00964707 7.4954 1.89644e+07 2 0.0143003 0.708887 0.0143003 +32 0.00673294 0.00205506 0.00937891 7.4954 1.89645e+07 2 0.0153218 0.707865 0.0153218 +33 0.00808585 0.00208729 0.00681679 7.49745 1.89647e+07 2 0.0173647 0.706844 0.0173647 +34 0.00974318 0.00210422 0.00432505 7.49847 1.89647e+07 2 0.0163432 0.705822 0.0163432 +35 0.0117064 0.00212795 0.00169158 7.49847 1.89647e+07 2 0.0173647 0.705822 0.0173647 +36 0.0139373 0.00199277 0.00146661 7.49949 1.89648e+07 2 0.0173647 0.704801 0.0173647 +37 0.0163425 0.00168482 0.00124828 7.48825 1.89448e+07 2 0.0173647 0.704801 0.0173647 +38 0.0187653 0.00127959 0.00127585 7.48825 1.8945e+07 2 0.0173647 0.703779 0.0173647 +39 0.0209905 0.000959671 0.0016892 7.47906 1.89411e+07 2 0.0183861 0.703779 0.0183861 +40 0.0227698 0.000734192 0.00175098 7.46987 1.8941e+07 2 0.0194076 0.702758 0.0194076 +41 0.0238647 0.000635555 0.00196259 7.46987 1.89411e+07 2 0.0194076 0.701736 0.0194076 +42 0.0241 0.000673947 0.00197471 7.46272 1.89414e+07 2 0.020429 0.700715 0.020429 +43 0.0234096 0.000713702 0.00199116 7.44944 1.89411e+07 2 0.0224719 0.699694 0.0224719 +44 0.0218581 0.000738609 0.00200505 7.44944 1.89412e+07 2 0.0214505 0.699694 0.0214505 +45 0.0196281 0.000722573 0.00178837 7.43718 1.89322e+07 2 0.0214505 0.698672 0.0214505 +46 0.0169781 0.00066902 0.00157739 7.4382 1.89324e+07 2 0.0224719 0.698672 0.0224719 +47 0.0141845 0.000604474 0.00143696 7.41675 1.89321e+07 2 0.0234934 0.697651 0.0234934 +48 0.0114883 0.000523203 0.00144987 7.41675 1.89322e+07 2 0.0255363 0.696629 0.0255363 +49 0.009062 0.000433503 0.00144939 7.41675 1.89323e+07 2 0.0234934 0.696629 0.0234934 +50 0.00699967 0.000349635 0.00141776 7.41675 1.89323e+07 2 0.0234934 0.695608 0.0234934 +51 0.00532668 0.000280327 0.00147817 7.40245 1.89319e+07 2 0.0234934 0.694586 0.0234934 +52 0.00401993 0.000223634 0.00132348 7.40245 1.8932e+07 2 0.0234934 0.694586 0.0234934 +53 0.00302936 0.000178032 0.00120839 7.40245 1.8932e+07 2 0.0234934 0.694586 0.0234934 +54 0.0022956 0.000144835 0.00108386 7.40245 1.8932e+07 2 0.0214505 0.693565 0.0214505 +55 0.00176142 0.000117638 0.000974044 7.38815 1.89319e+07 2 0.0214505 0.692543 0.0214505 +56 0.00137764 9.54109e-05 0.00100745 7.38815 1.89319e+07 2 0.0214505 0.692543 0.0214505 +57 0.0011051 7.75473e-05 0.000941849 7.37079 1.89306e+07 2 0.0224719 0.691522 0.0224719 +58 0.000914263 6.35629e-05 0.000895675 7.37079 1.89307e+07 2 0.0245148 0.691522 0.0245148 +59 0.000783786 5.41967e-05 0.000894658 7.37079 1.89307e+07 2 0.0224719 0.691522 0.0224719 +60 0.000698927 4.78553e-05 0.000965306 7.3524 1.89305e+07 2 0.0234934 0.690501 0.0234934 +61 0.000650081 4.40714e-05 0.000933105 7.3524 1.89305e+07 2 0.0234934 0.690501 0.0234934 +62 0.000631696 4.37323e-05 0.000895395 7.3524 1.89305e+07 2 0.0245148 0.690501 0.0245148 +63 0.000641574 4.87151e-05 0.000861334 7.3524 1.89306e+07 2 0.0245148 0.689479 0.0245148 +64 0.00068055 5.71215e-05 0.000780882 7.35342 1.89306e+07 2 0.0245148 0.688458 0.0245148 +65 0.000752529 6.77082e-05 0.000703514 7.35342 1.89306e+07 2 0.0234934 0.688458 0.0234934 +66 0.000864831 8.08202e-05 0.0006423 7.35444 1.89306e+07 2 0.0234934 0.687436 0.0234934 +67 0.00102883 9.54729e-05 0.000667126 7.35444 1.89306e+07 2 0.0245148 0.686415 0.0245148 +68 0.00126074 0.000111484 0.000602385 7.35342 1.89304e+07 2 0.0265577 0.686415 0.0265577 +69 0.00158246 0.000129057 0.000571006 7.35342 1.89304e+07 2 0.0255363 0.685393 0.0255363 +70 0.00202192 0.000155295 0.000504038 7.33708 1.89298e+07 2 0.0265577 0.684372 0.0265577 +71 0.00261246 0.000182253 0.000482086 7.33708 1.89299e+07 2 0.0265577 0.684372 0.0265577 +72 0.00339026 0.00021086 0.000494475 7.31461 1.89295e+07 2 0.0275792 0.68335 0.0275792 +73 0.00438891 0.000234842 0.000490731 7.31461 1.89295e+07 2 0.0275792 0.68335 0.0275792 +74 0.0056305 0.000157986 0.000450144 7.31461 1.89295e+07 2 0.534219 0.68335 0.0275792 +75 0.00711367 0.000160205 0.000435871 7.31461 1.89295e+07 2 0.533197 0.68335 0.0265577 +76 0.00880092 0.000157321 0.000481464 7.31461 1.89295e+07 2 0.533197 0.682329 0.0275792 +77 0.0106093 0.000147579 0.00049107 7.31665 1.89295e+07 2 0.533197 0.682329 0.0275792 +78 0.01241 0.000137689 0.000500761 7.31359 1.89293e+07 2 0.532176 0.682329 0.0296221 +79 0.0140411 0.000135049 0.00047028 7.31052 1.89293e+07 2 0.531154 0.682329 0.0296221 +80 0.0153333 0.000132977 0.000325866 7.31052 1.89293e+07 2 0.531154 0.682329 0.0296221 +81 0.0161441 0.000129681 0.000193256 7.31052 1.89293e+07 2 0.530133 0.681307 0.0296221 +82 0.0163889 0.000120557 0.000290957 7.31052 1.89293e+07 2 0.530133 0.681307 0.0306435 +83 0.0160592 0.000100192 0.000520905 7.3095 1.89292e+07 2 0.532176 0.680286 0.0326864 +84 0.0152222 7.50655e-05 0.00055501 7.2809 1.89292e+07 2 0.531154 0.679265 0.0326864 +85 0.0140017 6.19149e-05 0.000402044 7.2809 1.89292e+07 2 0.531154 0.679265 0.0326864 +86 0.0125478 6.27449e-05 0.000299735 7.2809 1.89292e+07 2 0.530133 0.679265 0.031665 +87 0.0110079 6.28876e-05 0.000203731 7.28192 1.89292e+07 2 0.530133 0.679265 0.0326864 +88 0.00950419 5.45704e-05 0.000207489 7.28192 1.89292e+07 2 0.530133 0.679265 0.0326864 +89 0.0081229 4.32575e-05 0.000196423 7.2809 1.89291e+07 2 0.529111 0.678243 0.0326864 +90 0.00691367 3.23294e-05 0.0002203 7.2809 1.89291e+07 2 0.529111 0.678243 0.0326864 +91 0.00589594 2.50174e-05 0.000151938 7.27988 1.89291e+07 2 0.529111 0.677222 0.0326864 +92 0.00506796 2.03162e-05 0.000389497 7.27988 1.89291e+07 2 0.529111 0.6762 0.0326864 +93 0.00441572 1.79346e-05 0.000338786 7.27988 1.89291e+07 2 0.529111 0.6762 0.0326864 +94 0.00392009 1.51315e-05 0.000319298 7.27988 1.89291e+07 2 0.526047 0.675179 0.031665 +95 0.00356182 1.24117e-05 0.000323034 7.27988 1.89291e+07 2 0.526047 0.675179 0.031665 +96 0.00332456 9.16711e-06 0.000324539 7.27886 1.8929e+07 2 0.527068 0.675179 0.0326864 +97 0.00319662 6.8842e-06 0.000325779 7.24923 1.89289e+07 2 0.527068 0.674157 0.0337079 +98 0.00317187 5.79258e-06 0.000324565 7.24923 1.8929e+07 2 0.527068 0.674157 0.0347293 +99 0.00325023 5.41341e-06 0.000308161 7.24923 1.8929e+07 2 0.527068 0.674157 0.0347293 +100 0.00343812 5.72468e-06 0.000323536 7.24923 1.8929e+07 2 0.526047 0.674157 0.0337079 +101 0.00374887 6.36884e-06 0.000317438 7.24617 1.8929e+07 2 0.525026 0.673136 0.0337079 +102 0.00420305 7.39997e-06 0.000283232 7.24515 1.89288e+07 2 0.524004 0.672114 0.0337079 +103 0.00482845 9.0456e-06 0.000272936 7.24004 1.89269e+07 2 0.521961 0.671093 0.0337079 +104 0.00565916 1.02729e-05 0.00026472 7.24004 1.89269e+07 2 0.521961 0.691522 0.0337079 +105 0.00673294 1.08947e-05 0.000260211 7.22063 1.8913e+07 2 0.522983 0.723187 0.0347293 +106 0.00808585 1.15315e-05 0.000161361 7.20327 1.89101e+07 2 0.521961 0.741573 0.0347293 +107 0.00974318 1.2177e-05 7.4339e-05 7.18897 1.891e+07 2 0.521961 0.756895 0.0347293 +108 0.0117064 1.27524e-05 2.84841e-06 7.18897 1.891e+07 2 0.521961 0.770174 0.0347293 +109 0.0139373 1.13097e-05 4.66424e-06 7.18897 1.891e+07 2 0.519918 0.789581 0.0326864 +110 0.0163425 8.25467e-06 5.05265e-06 7.17058 1.88837e+07 2 0.518897 0.806946 0.0326864 +111 0.0187653 4.88134e-06 7.27932e-06 7.17058 1.88837e+07 2 0.519918 0.825332 0.0337079 +112 0.0209905 2.73687e-06 5.8495e-06 7.17058 1.88837e+07 2 0.52094 0.843718 0.0347293 +113 0.0227698 1.51236e-06 5.07458e-06 7.17058 1.88837e+07 2 0.521961 0.85904 0.0357508 +114 0.0238647 9.05097e-07 3.77218e-06 7.17058 1.88837e+07 2 0.52094 0.88049 0.0347293 +115 0.0241 5.64045e-07 2.92241e-06 7.17058 1.88837e+07 2 0.521961 0.897855 0.0357508 +116 0.0234096 3.97441e-07 4.19206e-06 7.17058 1.88837e+07 2 0.521961 0.897855 0.0357508 +117 0.0218581 2.78844e-07 2.34334e-06 7.1573 1.8883e+07 2 0.521961 0.896834 0.0367722 +118 0.0196281 0 3.03285e-06 7.14505 1.88824e+07 2 0.522983 0.896834 0.0388151 +119 0.0169781 0 8.93954e-06 7.14505 1.88824e+07 2 0.52094 0.895812 0.0367722 +120 0.0141845 0 9.22352e-06 7.12768 1.88794e+07 2 0.521961 0.894791 0.0377937 +121 0.0114883 0 1.37152e-05 7.12768 1.88794e+07 2 0.521961 0.893769 0.0377937 +122 0.009062 0 1.6099e-05 7.12768 1.88794e+07 2 0.522983 0.892748 0.0388151 +123 0.00699967 0 1.09633e-05 7.12768 1.88794e+07 2 0.524004 0.892748 0.0398366 +124 0.00532668 0 1.04083e-05 7.12768 1.88794e+07 2 0.521961 0.891726 0.0388151 +125 0.00401993 0 8.46436e-06 7.12768 1.88794e+07 2 0.521961 0.890705 0.0388151 +126 0.00302936 0 9.51313e-06 7.12768 1.88794e+07 2 0.521961 0.889683 0.0398366 +127 0.0022956 0 9.67362e-06 7.12768 1.88794e+07 2 0.52094 0.889683 0.0398366 +128 0.00176142 0 7.97425e-06 7.12768 1.88794e+07 2 0.521961 0.889683 0.040858 +129 0.00137764 0 9.96154e-06 7.11542 1.88621e+07 2 0.521961 0.888662 0.040858 +130 0.0011051 0 1.03495e-05 7.11542 1.88621e+07 2 0.52094 0.888662 0.0398366 +131 0.000914263 0 1.56266e-05 7.10317 1.88525e+07 2 0.521961 0.88764 0.040858 +132 0.000783786 0 1.22268e-05 7.08887 1.88525e+07 2 0.52094 0.886619 0.040858 +133 0.000698927 0 1.45553e-05 7.08887 1.88525e+07 2 0.52094 0.886619 0.040858 +134 0.000650081 0 1.09116e-05 7.08887 1.88525e+07 2 0.521961 0.885598 0.0418795 +135 0.000631696 0 9.10491e-06 7.08887 1.88525e+07 2 0.52094 0.884576 0.040858 +136 0.000641574 0 1.0017e-05 7.08887 1.88525e+07 2 0.52094 0.883555 0.040858 +137 0.00068055 0 4.16525e-06 7.08887 1.88525e+07 2 0.52094 0.882533 0.040858 +138 0.000752529 0 1.1137e-06 7.06946 1.88518e+07 2 0.521961 0.881512 0.0429009 +139 0.000864831 0 0 7.06946 1.88518e+07 2 0.52094 0.881512 0.0418795 +140 0.00102883 0 0 7.06946 1.88518e+07 2 0.52094 0.881512 0.0418795 +141 0.00126074 0 0 7.06946 1.88518e+07 2 0.52094 0.88049 0.0429009 +142 0.00158246 0 0 7.06946 1.88518e+07 2 0.519918 0.88049 0.0429009 +143 0.00202192 0 0 7.06946 1.88518e+07 2 0.52094 0.879469 0.0439224 +144 0.00261246 0 0 7.06946 1.88518e+07 2 0.519918 0.878447 0.0439224 diff --git a/test/expected/ctsoutIRS30.txt b/test/expected/ctsoutIRS30.txt index e1e1238c4..85968d2fc 100644 --- a/test/expected/ctsoutIRS30.txt +++ b/test/expected/ctsoutIRS30.txt @@ -1,147 +1,147 @@ ## ## timestep input EIR simulated EIR human infectiousness immunity h immunity Y recent births -0 0.00385527 0.00385018 0.0063402 7.32789 9.16888e+06 0 -1 0.00515328 0.00440028 0.00614883 7.33095 9.16901e+06 2 -2 0.00675283 0.00512261 0.00592789 7.33708 9.16916e+06 2 -3 0.00861585 0.00589298 0.00560806 7.33912 9.16928e+06 2 -4 0.01064 0.00668804 0.00575734 7.34014 9.16956e+06 2 -5 0.012656 0.00740572 0.00560258 7.32074 9.17181e+06 2 -6 0.0144463 0.00793227 0.006387 7.32891 9.17354e+06 2 -7 0.0157858 0.00838079 0.0076165 7.33095 9.17707e+06 2 -8 0.0164951 0.00861711 0.00804262 7.33299 9.1773e+06 2 -9 0.0164868 0.0089544 0.00759262 7.33606 9.17807e+06 2 -10 0.0157872 0.00947154 0.00723544 7.34423 9.17883e+06 2 -11 0.0145248 0.0097077 0.00795186 7.34831 9.1792e+06 2 -12 0.012892 0.00935006 0.00839201 7.35138 9.17965e+06 2 -13 0.0110958 0.00860059 0.00824211 7.3524 7.64478e+06 2 -14 0.00931612 0.00787387 0.00775504 7.35853 7.64878e+06 2 -15 0.00768207 0.00716444 0.00847254 7.36568 7.66579e+06 2 -16 0.00626659 0.00637054 0.00958031 7.3667 7.68328e+06 2 -17 0.0050952 0.00552001 0.00984115 7.37283 7.68556e+06 2 -18 0.00416062 0.00481648 0.00982737 7.34423 7.65886e+06 2 -19 0.00343742 0.00415171 0.0095343 7.34525 7.65951e+06 2 -20 0.00289344 0.00358028 0.0104033 7.34831 7.66035e+06 2 -21 0.00249722 0.00304947 0.00987394 7.32482 7.6506e+06 2 -22 0.00222204 0.00251869 0.00934308 7.32482 7.65151e+06 2 -23 0.00204764 0.00214952 0.0090762 7.32482 7.6523e+06 2 -24 0.0019607 0.00181437 0.00872161 7.32686 7.65548e+06 2 -25 0.00195491 0.001523 0.00921364 7.32891 7.66081e+06 2 -26 0.00203106 0.00121523 0.0104343 7.32993 7.66272e+06 2 -27 0.0021975 0.00102675 0.00987711 7.32482 7.41752e+06 2 -28 0.0024711 0.000937653 0.00970645 7.32482 7.41885e+06 2 -29 0.00287868 0.000940855 0.00983068 7.32176 7.42091e+06 2 -30 0.00345862 0.00105604 0.00996751 7.32278 7.42294e+06 2 -31 0.00426217 0.00122968 0.00979344 7.32278 7.42331e+06 2 -32 0.00535303 0.00142087 0.00937437 7.31971 7.42353e+06 2 -33 0.00680351 0.00172996 0.00847715 7.31869 7.42371e+06 2 -34 0.00868452 0.00218851 0.00761515 7.31359 7.42427e+06 2 -35 0.0110471 0.00272343 0.00670079 7.30746 7.41578e+06 2 -36 0.0138943 0.00326133 0.00667195 7.31052 7.41607e+06 2 -37 0.0171483 0.00378878 0.00639633 7.30439 7.41606e+06 2 -38 0.0206201 0.00437855 0.00635341 7.30541 7.41636e+06 2 -39 0.0240013 0.00500868 0.00651301 7.29009 7.41163e+06 2 -40 0.0268914 0.0055297 0.0063151 7.29316 7.4119e+06 2 -41 0.0288693 0.00583968 0.00627644 7.28294 7.39593e+06 2 -42 0.0295951 0.00609951 0.00625832 7.28703 7.39633e+06 2 -43 0.0289091 0.006106 0.00629954 7.29009 7.39663e+06 2 -44 0.0268867 0.00584554 0.00600319 7.29316 7.397e+06 2 -45 0.0238226 0.0054957 0.00581565 7.29826 7.39742e+06 2 -46 0.0201484 0.00511411 0.0058074 7.27681 7.39546e+06 2 -47 0.0163203 0.00460525 0.00600239 7.27783 7.39591e+06 2 -48 0.0127182 0.00401513 0.00696406 7.27886 7.39619e+06 2 -49 0.0095897 0.00342374 0.00688054 7.26353 7.39643e+06 2 -50 0.007043 0.00291608 0.00700913 7.26456 7.39762e+06 2 -51 0.00507609 0.00251109 0.00687086 7.2666 7.40077e+06 2 -52 0.0036193 0.00213227 0.00665198 7.24821 7.38466e+06 2 -53 0.0025746 0.00178494 0.00651327 7.24821 7.38693e+06 2 -54 0.00184294 0.00146799 0.00662991 7.24923 7.3882e+06 2 -55 0.0013388 0.00118031 0.00698273 7.25026 7.38947e+06 2 -56 0.000995066 0.000937668 0.0069156 7.2288 7.38232e+06 2 -57 0.000762435 0.000743423 0.00674434 7.2288 7.38365e+06 2 -58 0.00060632 0.000596978 0.00598199 7.19612 7.37327e+06 2 -59 0.000503328 0.000484149 0.00612527 7.19612 7.37386e+06 2 -60 0.000438174 0.000395964 0.00606927 7.19612 7.37513e+06 2 -61 0.000401349 0.000327408 0.00573254 7.19612 7.37659e+06 2 -62 0.00038753 0.000281302 0.00536689 7.19612 7.37704e+06 2 -63 0.000394636 0.000254861 0.00502524 7.1951 7.37752e+06 2 -64 0.000423411 0.000242433 0.00461475 7.1951 7.37779e+06 2 -65 0.000477476 0.000242119 0.00432968 7.1951 7.37831e+06 2 -66 0.000563808 0.000255734 0.00395201 7.19101 7.37847e+06 2 -67 0.000693638 0.000284694 0.00384138 7.18386 7.37717e+06 2 -68 0.000883733 0.000332492 0.0035442 7.18386 7.37734e+06 2 -69 0.00115791 0.000400532 0.00322049 7.18386 7.37752e+06 2 -70 0.00154837 0.000501526 0.00291898 7.17875 7.37709e+06 2 -71 0.00209609 0.000632027 0.00267134 7.17875 7.37719e+06 2 -72 0.00284885 0.000790117 0.00256061 7.17467 7.37694e+06 2 -73 0.00385527 0.000972896 0.00237479 7.17467 7.377e+06 2 -74 0.00515328 0.0011761 0.00223213 7.17263 7.377e+06 2 -75 0.00675283 0.00141035 0.00201364 7.17365 7.37711e+06 2 -76 0.00861585 0.00165318 0.0017882 7.17365 7.37716e+06 2 -77 0.01064 0.00187391 0.00164577 7.17058 7.37725e+06 2 -78 0.012656 0.00203404 0.00162027 7.17058 7.37735e+06 2 -79 0.0144463 0.00210484 0.00215851 7.16956 7.3774e+06 2 -80 0.0157858 0.00212068 0.00225702 7.16241 7.37572e+06 2 -81 0.0164951 0.00213497 0.00214347 7.15935 7.36237e+06 2 -82 0.0164868 0.00229488 0.0018931 7.143 7.3573e+06 2 -83 0.0157872 0.00242223 0.00162039 7.14402 7.35733e+06 2 -84 0.0145248 0.00239473 0.00143987 7.14402 7.35752e+06 2 -85 0.012892 0.00221484 0.00126214 7.14505 7.35803e+06 2 -86 0.0110958 0.0019415 0.0021717 7.14709 7.3588e+06 2 -87 0.00931612 0.00164378 0.00241038 7.14402 7.35843e+06 2 -88 0.00768207 0.00136521 0.00278784 7.14709 7.35867e+06 2 -89 0.00626659 0.00124227 0.00289874 7.14811 7.35896e+06 2 -90 0.0050952 0.00116328 0.00286473 7.12972 7.35921e+06 2 -91 0.00416062 0.00109755 0.00307917 7.13075 7.35942e+06 2 -92 0.00343742 0.00102194 0.00307625 7.13279 7.35967e+06 2 -93 0.00289344 0.000932306 0.00284349 7.13279 7.3598e+06 2 -94 0.00249722 0.000855338 0.00241368 7.13279 7.35999e+06 2 -95 0.00222204 0.000787171 0.0022538 7.13381 7.36021e+06 2 -96 0.00204764 0.000718083 0.0022958 7.1236 7.35655e+06 2 -97 0.0019607 0.000645061 0.00260415 7.12564 7.35671e+06 2 -98 0.00195491 0.000591071 0.00260176 7.12564 7.3569e+06 2 -99 0.00203106 0.000571843 0.00250073 7.11849 7.35513e+06 2 -100 0.0021975 0.000607188 0.00275639 7.11849 7.35532e+06 2 -101 0.0024711 0.000676789 0.002678 7.12053 7.3555e+06 2 -102 0.00287868 0.000773615 0.00301166 7.11032 7.35364e+06 2 -103 0.00345862 0.000944664 0.00297953 7.11032 7.35375e+06 2 -104 0.00426217 0.00112253 0.00280205 7.09602 7.34103e+06 2 -105 0.00535303 0.0014084 0.0025756 7.09704 7.34115e+06 2 -106 0.00680351 0.0017255 0.00271349 7.09704 7.34126e+06 2 -107 0.00868452 0.00204445 0.0027319 7.09806 7.34132e+06 2 -108 0.0110471 0.00237571 0.00262855 7.09908 7.34143e+06 2 -109 0.0138943 0.0026419 0.00244199 7.08478 7.3343e+06 2 -110 0.0171483 0.00299861 0.00254008 7.08784 7.3344e+06 2 -111 0.0206201 0.0032735 0.0023387 7.09091 7.33455e+06 2 -112 0.0240013 0.00337009 0.00252185 7.0715 7.31161e+06 2 -113 0.0268914 0.00328504 0.00250408 7.07252 7.31195e+06 2 -114 0.0288693 0.00274181 0.00240897 7.07354 7.3122e+06 2 -115 0.0295951 0.00221434 0.00308828 7.07457 7.31246e+06 2 -116 0.0289091 0.001802 0.00310728 7.03984 7.3033e+06 2 -117 0.0268867 0.00148426 0.00309764 7.03984 7.30362e+06 2 -118 0.0238226 0.00139021 0.00304071 7.04086 7.30384e+06 2 -119 0.0201484 0.00132017 0.00316401 7.04086 7.304e+06 2 -120 0.0163203 0.00120224 0.00304647 7.04086 7.30416e+06 2 -121 0.0127182 0.00110062 0.00326377 7.04188 7.30428e+06 2 -122 0.0095897 0.00101854 0.00317428 7.04188 7.30445e+06 2 -123 0.007043 0.000916884 0.00303197 7.04188 7.30456e+06 2 -124 0.00507609 0.000816908 0.00277407 7.04188 7.30464e+06 2 -125 0.0036193 0.000705299 0.00245503 7.02247 7.30437e+06 2 -126 0.0025746 0.000585206 0.00231228 7.02247 7.30447e+06 2 -127 0.00184294 0.00046921 0.0020564 7.02145 7.30439e+06 2 -128 0.0013388 0.00036444 0.00197645 7.01124 7.30398e+06 2 -129 0.000995066 0.000277241 0.00198255 7.01124 7.30409e+06 2 -130 0.000762435 0.000208101 0.00186443 7.01124 7.30415e+06 2 -131 0.00060632 0.000157961 0.00169388 7.01124 7.30423e+06 2 -132 0.000503328 0.000123201 0.00153781 7.00204 7.28429e+06 2 -133 0.000438174 9.82106e-05 0.00149603 7.00306 7.2844e+06 2 -134 0.000401349 7.97188e-05 0.00156687 7.00306 7.28446e+06 2 -135 0.00038753 6.64909e-05 0.00166802 6.99591 7.28448e+06 2 -136 0.000394636 5.83606e-05 0.00122863 6.97549 7.24666e+06 2 -137 0.000423411 5.46579e-05 0.00118577 6.97549 7.24669e+06 2 -138 0.000477476 5.58488e-05 0.00113339 6.97549 7.24671e+06 2 -139 0.000563808 6.02005e-05 0.00100979 6.97549 7.24673e+06 2 -140 0.000693638 6.12509e-05 0.000916701 6.97549 7.24674e+06 2 -141 0.000883733 6.58781e-05 0.000892734 6.97549 7.24675e+06 2 -142 0.00115791 7.61893e-05 0.00072201 6.95506 7.24671e+06 2 -143 0.00154837 9.25599e-05 0.00061177 6.95506 7.24672e+06 2 -144 0.00209609 0.00011507 0.000556293 6.95506 7.24673e+06 2 +0 0.00438891 0.00436988 0.00537499 7.40858 1.72427e+07 0 +1 0.0056305 0.00673135 0.00536644 7.38917 1.72429e+07 2 +2 0.00711367 0.00715855 0.00492262 7.39224 1.72433e+07 2 +3 0.00880092 0.00760161 0.00495262 7.39734 1.72438e+07 2 +4 0.0106093 0.00803955 0.00492948 7.40143 1.7244e+07 2 +5 0.01241 0.00822068 0.00447334 7.40654 1.72442e+07 2 +6 0.0140411 0.00829152 0.00440999 7.41267 1.72445e+07 2 +7 0.0153333 0.00823228 0.00433596 7.41267 1.72449e+07 2 +8 0.0161441 0.00785625 0.00526381 7.41471 1.72453e+07 2 +9 0.0163889 0.00734534 0.00612459 7.38611 1.72171e+07 2 +10 0.0160592 0.00679162 0.0065049 7.39019 1.72174e+07 2 +11 0.0152222 0.00649407 0.00663661 7.39428 1.72179e+07 2 +12 0.0140017 0.00635606 0.00687107 7.39224 1.72178e+07 2 +13 0.0125478 0.00614743 0.00718464 7.39122 1.72182e+07 2 +14 0.0110079 0.00580469 0.00755505 7.38815 1.72185e+07 2 +15 0.00950419 0.00540126 0.00806042 7.37896 1.72188e+07 2 +16 0.0081229 0.00499831 0.00813893 7.38407 1.72193e+07 2 +17 0.00691367 0.00462928 0.00794817 7.38509 1.72197e+07 2 +18 0.00589594 0.00432206 0.00816046 7.38815 1.722e+07 2 +19 0.00506796 0.00387102 0.00784799 7.38202 1.72185e+07 2 +20 0.00441572 0.00344607 0.00755643 7.38407 1.72191e+07 2 +21 0.00392009 0.0031496 0.00726794 7.36874 1.72197e+07 2 +22 0.00356182 0.002793 0.00698574 7.36057 1.72181e+07 2 +23 0.00332456 0.0025025 0.00738111 7.30746 1.72192e+07 2 +24 0.00319662 0.00236656 0.0077755 7.27783 1.72174e+07 2 +25 0.00317187 0.00212507 0.00797541 7.27783 1.72178e+07 2 +26 0.00325023 0.00204129 0.0080036 7.27783 1.72184e+07 2 +27 0.00343812 0.00195434 0.00784341 7.27783 1.72191e+07 2 +28 0.00374887 0.00186215 0.00686577 7.27783 1.72198e+07 2 +29 0.00420305 0.00177998 0.00682901 7.27886 1.722e+07 2 +30 0.00482845 0.00169758 0.00624262 7.24719 1.72173e+07 2 +31 0.00565916 0.0017244 0.00553646 7.24719 1.72175e+07 2 +32 0.00673294 0.00175628 0.00495034 7.24719 1.72177e+07 2 +33 0.00808585 0.00180969 0.00438768 7.24923 1.72188e+07 2 +34 0.00974318 0.00187022 0.00402692 7.2523 1.72221e+07 2 +35 0.0117064 0.00192328 0.00438414 7.25332 1.72265e+07 2 +36 0.0139373 0.00196433 0.00492633 7.25434 1.72319e+07 2 +37 0.0163425 0.00196507 0.00469086 7.25434 1.72329e+07 2 +38 0.0187653 0.00196057 0.00469321 7.25536 1.72352e+07 2 +39 0.0209905 0.00208601 0.00512741 7.25536 1.72377e+07 2 +40 0.0227698 0.00213965 0.00500073 7.25536 1.72384e+07 2 +41 0.0238647 0.00221246 0.00452356 7.25536 1.72395e+07 2 +42 0.0241 0.00239225 0.00406483 7.25536 1.72402e+07 2 +43 0.0234096 0.00248618 0.00347121 7.25638 1.72411e+07 2 +44 0.0218581 0.0023648 0.00335629 7.25638 1.72418e+07 2 +45 0.0196281 0.00209811 0.00344199 7.25638 1.72427e+07 2 +46 0.0169781 0.0017545 0.00350205 7.25843 1.72432e+07 2 +47 0.0141845 0.00143678 0.00333313 7.25843 1.72438e+07 2 +48 0.0114883 0.00118411 0.00313211 7.25741 1.72462e+07 2 +49 0.009062 0.000973605 0.00352668 7.25741 1.72478e+07 2 +50 0.00699967 0.000786665 0.00356291 7.25128 1.72459e+07 2 +51 0.00532668 0.000637247 0.00376432 7.23902 1.72481e+07 2 +52 0.00401993 0.000528812 0.00339551 7.22574 1.72486e+07 2 +53 0.00302936 0.000443448 0.00294864 7.22574 1.725e+07 2 +54 0.0022956 0.000378108 0.00234555 7.20838 1.72492e+07 2 +55 0.00176142 0.000321104 0.00212849 7.19612 1.72486e+07 2 +56 0.00137764 0.000269966 0.00240454 7.19612 1.72497e+07 2 +57 0.0011051 0.000222429 0.00228338 7.18386 1.72497e+07 2 +58 0.000914263 0.000183441 0.00204133 7.18386 1.72497e+07 2 +59 0.000783786 0.000160134 0.00181182 7.1665 1.7225e+07 2 +60 0.000698927 0.000146133 0.00175509 7.1665 1.7225e+07 2 +61 0.000650081 0.000136408 0.00157769 7.14913 1.72238e+07 2 +62 0.000631696 0.00013015 0.0015757 7.14913 1.72239e+07 2 +63 0.000641574 0.000131149 0.00154557 7.14913 1.7224e+07 2 +64 0.00068055 0.00013811 0.00157599 7.14913 1.72241e+07 2 +65 0.000752529 0.000155359 0.00162297 7.14913 1.72242e+07 2 +66 0.000864831 0.000183806 0.00193827 7.14913 1.72242e+07 2 +67 0.00102883 0.000228154 0.00183473 7.14913 1.72243e+07 2 +68 0.00126074 0.00029402 0.00158659 7.14913 1.72243e+07 2 +69 0.00158246 0.000396087 0.00117226 7.12666 1.72051e+07 2 +70 0.00202192 0.000519498 0.00105953 7.11032 1.72052e+07 2 +71 0.00261246 0.000638278 0.00113793 7.11032 1.72052e+07 2 +72 0.00339026 0.00071859 0.00112255 7.11032 1.72054e+07 2 +73 0.00438891 0.000794691 0.00107375 7.11236 1.72055e+07 2 +74 0.0056305 0.00091912 0.00119976 7.11236 1.72055e+07 2 +75 0.00711367 0.00105881 0.00117202 7.11338 1.72056e+07 2 +76 0.00880092 0.00118559 0.00110999 7.11338 1.72057e+07 2 +77 0.0106093 0.0013443 0.00106098 7.11338 1.72057e+07 2 +78 0.01241 0.00147454 0.00138677 7.11542 1.72057e+07 2 +79 0.0140411 0.00153683 0.0014895 7.11542 1.72058e+07 2 +80 0.0153333 0.00154716 0.00147312 7.11645 1.72057e+07 2 +81 0.0161441 0.00163956 0.00142249 7.11542 1.72057e+07 2 +82 0.0163889 0.00172153 0.00143965 7.11747 1.72057e+07 2 +83 0.0160592 0.00171936 0.00151804 7.11645 1.71822e+07 2 +84 0.0152222 0.00163885 0.00151855 7.10827 1.717e+07 2 +85 0.0140017 0.00152775 0.00136428 7.1093 1.717e+07 2 +86 0.0125478 0.00141805 0.00138198 7.10725 1.71698e+07 2 +87 0.0110079 0.00129866 0.00141407 7.10827 1.71698e+07 2 +88 0.00950419 0.00115 0.00140382 7.08784 1.71682e+07 2 +89 0.0081229 0.00100711 0.00135476 7.08784 1.71683e+07 2 +90 0.00691367 0.000886362 0.00119425 7.08887 1.71683e+07 2 +91 0.00589594 0.000783764 0.00101007 7.0858 1.71681e+07 2 +92 0.00506796 0.000695937 0.000854937 7.08172 1.71668e+07 2 +93 0.00441572 0.000612084 0.000746674 7.08172 1.71668e+07 2 +94 0.00392009 0.000531106 0.000657747 7.08069 1.71668e+07 2 +95 0.00356182 0.000458394 0.000614746 7.08069 1.71668e+07 2 +96 0.00332456 0.000398506 0.000651648 7.07354 1.71515e+07 2 +97 0.00319662 0.000352657 0.000658426 7.04392 1.71514e+07 2 +98 0.00317187 0.000323627 0.000611814 7.04392 1.71514e+07 2 +99 0.00325023 0.000319778 0.000596072 7.04494 1.71514e+07 2 +100 0.00343812 0.00033634 0.000577205 7.04494 1.71514e+07 2 +101 0.00374887 0.000362431 0.000544636 7.04494 1.71514e+07 2 +102 0.00420305 0.000401488 0.000518085 7.04494 1.71514e+07 2 +103 0.00482845 0.000453588 0.000509088 7.04597 1.71514e+07 2 +104 0.00565916 0.000493134 0.000483913 7.04188 1.71514e+07 2 +105 0.00673294 0.000537441 0.000477477 7.03575 1.71513e+07 2 +106 0.00808585 0.000587526 0.000469589 7.03575 1.71513e+07 2 +107 0.00974318 0.000616793 0.000412586 7.02758 1.715e+07 2 +108 0.0117064 0.000648084 0.000636766 7.02758 1.715e+07 2 +109 0.0139373 0.00064469 0.000813606 7.01226 1.71496e+07 2 +110 0.0163425 0.000618864 0.000757205 7.0143 1.71496e+07 2 +111 0.0187653 0.000674889 0.000693102 7.0143 1.71496e+07 2 +112 0.0209905 0.000766132 0.000543769 6.98774 1.71443e+07 2 +113 0.0227698 0.000797784 0.000445873 6.98774 1.71443e+07 2 +114 0.0238647 0.000705388 0.000399792 6.98979 1.71443e+07 2 +115 0.0241 0.000560765 0.000703811 6.98979 1.71444e+07 2 +116 0.0234096 0.000466747 0.00071479 6.98979 1.71444e+07 2 +117 0.0218581 0.000361308 0.000703467 6.99081 1.71444e+07 2 +118 0.0196281 0.000282604 0.000641948 6.97038 1.71442e+07 2 +119 0.0169781 0.00022335 0.000944371 6.97038 1.71442e+07 2 +120 0.0141845 0.000178733 0.00104106 6.97038 1.71443e+07 2 +121 0.0114883 0.0001465 0.000892432 6.97038 1.71443e+07 2 +122 0.009062 0.000145597 0.000775199 6.97038 1.71443e+07 2 +123 0.00699967 0.000150333 0.000633334 6.97038 1.71443e+07 2 +124 0.00532668 0.000141794 0.000661829 6.97038 1.71443e+07 2 +125 0.00401993 0.000123514 0.000629844 6.96936 1.71443e+07 2 +126 0.00302936 0.000100228 0.000624404 6.94893 1.71168e+07 2 +127 0.0022956 7.85701e-05 0.000633031 6.94893 1.71168e+07 2 +128 0.00176142 6.10936e-05 0.000576536 6.94893 1.71169e+07 2 +129 0.00137764 4.76243e-05 0.000589969 6.94893 1.71169e+07 2 +130 0.0011051 3.76715e-05 0.000552007 6.94893 1.71169e+07 2 +131 0.000914263 3.03923e-05 0.000484005 6.94382 1.71129e+07 2 +132 0.000783786 2.57834e-05 0.000463696 6.94382 1.71129e+07 2 +133 0.000698927 2.27295e-05 0.000409426 6.94382 1.71129e+07 2 +134 0.000650081 2.0623e-05 0.000354588 6.93565 1.71001e+07 2 +135 0.000631696 1.95311e-05 0.00033498 6.93565 1.71001e+07 2 +136 0.000641574 1.87436e-05 0.000297636 6.91011 1.70949e+07 2 +137 0.00068055 1.81958e-05 0.000259135 6.91011 1.70949e+07 2 +138 0.000752529 1.82347e-05 0.000346346 6.91011 1.70949e+07 2 +139 0.000864831 1.94903e-05 0.000332422 6.91011 1.70949e+07 2 +140 0.00102883 2.15582e-05 0.000262717 6.91011 1.70949e+07 2 +141 0.00126074 2.66089e-05 0.000256685 6.90398 1.70907e+07 2 +142 0.00158246 3.30796e-05 0.000261042 6.8999 1.70907e+07 2 +143 0.00202192 3.93635e-05 0.000243632 6.8999 1.70907e+07 2 +144 0.00261246 4.91494e-05 0.000205981 6.8999 1.70907e+07 2 diff --git a/test/expected/ctsoutRach5IC.txt b/test/expected/ctsoutRach5IC.txt index 8c46c3fc8..49a72a6c4 100644 --- a/test/expected/ctsoutRach5IC.txt +++ b/test/expected/ctsoutRach5IC.txt @@ -1,147 +1,147 @@ ## ## timestep input EIR simulated EIR human infectiousness immunity h immunity Y recent births -0 0.00385527 0.00385018 0.00646703 7.33197 9.16998e+06 0 -1 0.00515328 0.00471387 0.00627328 7.33504 9.17011e+06 2 -2 0.00675283 0.00545782 0.0060459 7.34116 9.17027e+06 2 -3 0.00861585 0.00624347 0.00578905 7.34321 9.17039e+06 2 -4 0.01064 0.00704281 0.00598382 7.34423 9.17067e+06 2 -5 0.012656 0.00774901 0.00581145 7.32482 9.17293e+06 2 -6 0.0144463 0.00827488 0.00657275 7.33299 9.17465e+06 2 -7 0.0157858 0.00872717 0.00778214 7.33401 9.17819e+06 2 -8 0.0164951 0.00893954 0.00817739 7.33606 9.17843e+06 2 -9 0.0164868 0.00922135 0.00770616 7.33912 9.17919e+06 2 -10 0.0157872 0.0096599 0.0073554 7.34729 9.1799e+06 2 -11 0.0145248 0.00980917 0.00807237 7.3524 9.18025e+06 2 -12 0.012892 0.00937875 0.00797594 7.35649 9.18066e+06 2 -13 0.0110958 0.00858158 0.00780678 7.35751 7.64577e+06 2 -14 0.00931612 0.00781415 0.00730389 7.36364 7.64975e+06 2 -15 0.00768207 0.00698773 0.00808358 7.37079 7.66681e+06 2 -16 0.00626659 0.00611156 0.00916915 7.37079 7.68436e+06 2 -17 0.0050952 0.0052311 0.00988633 7.37692 7.6867e+06 2 -18 0.00416062 0.0045322 0.00994278 7.34831 7.66006e+06 2 -19 0.00343742 0.00401182 0.00970324 7.34831 7.6608e+06 2 -20 0.00289344 0.00358612 0.0105858 7.3524 7.66171e+06 2 -21 0.00249722 0.00318466 0.0101394 7.32789 7.65201e+06 2 -22 0.00222204 0.0027901 0.00960359 7.32789 7.65295e+06 2 -23 0.00204764 0.00249641 0.00932676 7.32993 7.65377e+06 2 -24 0.0019607 0.00225407 0.00883584 7.33095 7.65698e+06 2 -25 0.00195491 0.00204433 0.00932052 7.33299 7.66233e+06 2 -26 0.00203106 0.00188612 0.010621 7.33401 7.66428e+06 2 -27 0.0021975 0.00180487 0.0101249 7.32993 7.41907e+06 2 -28 0.0024711 0.00187095 0.0100452 7.32993 7.42035e+06 2 -29 0.00287868 0.00216084 0.00959861 7.32789 7.42229e+06 2 -30 0.00345862 0.00254863 0.00965988 7.32891 7.42429e+06 2 -31 0.00426217 0.00303658 0.00942729 7.32891 7.42476e+06 2 -32 0.00535303 0.00360321 0.00929694 7.32686 7.42501e+06 2 -33 0.00680351 0.00439419 0.00870783 7.32686 7.42517e+06 2 -34 0.00868452 0.00541645 0.00772183 7.32176 7.42577e+06 2 -35 0.0110471 0.006644 0.00664115 7.31869 7.41737e+06 2 -36 0.0138943 0.00786935 0.006669 7.3238 7.41811e+06 2 -37 0.0171483 0.00884336 0.0065425 7.32176 7.41844e+06 2 -38 0.0206201 0.0094668 0.00671484 7.32686 7.41937e+06 2 -39 0.0240013 0.0101321 0.00698825 7.31461 7.4147e+06 2 -40 0.0268914 0.0107496 0.0074297 7.32482 7.41504e+06 2 -41 0.0288693 0.0111744 0.00773266 7.31665 7.39919e+06 2 -42 0.0295951 0.0114507 0.0081233 7.3238 7.39999e+06 2 -43 0.0289091 0.011507 0.0086594 7.32891 7.40088e+06 2 -44 0.0268867 0.0112242 0.00935889 7.33197 7.40164e+06 2 -45 0.0238226 0.0106636 0.0109989 7.33606 7.40221e+06 2 -46 0.0201484 0.0099173 0.0117521 7.31665 7.40029e+06 2 -47 0.0163203 0.00905055 0.0118064 7.31869 7.40074e+06 2 -48 0.0127182 0.00823905 0.0120791 7.32176 7.40106e+06 2 -49 0.0095897 0.00734217 0.0109332 7.3095 7.40139e+06 2 -50 0.007043 0.00631001 0.0102592 7.31359 7.40271e+06 2 -51 0.00507609 0.00528369 0.0102926 7.31767 7.40601e+06 2 -52 0.0036193 0.00426293 0.0100717 7.29928 7.39006e+06 2 -53 0.0025746 0.00335133 0.0098528 7.29928 7.39248e+06 2 -54 0.00184294 0.00261248 0.00995159 7.30133 7.39401e+06 2 -55 0.0013388 0.00202476 0.0107605 7.30235 7.39551e+06 2 -56 0.000995066 0.00156604 0.0107984 7.27988 7.38847e+06 2 -57 0.000762435 0.00122094 0.0106158 7.27988 7.38991e+06 2 -58 0.00060632 0.000974313 0.00958176 7.24719 7.37963e+06 2 -59 0.000503328 0.000795345 0.0093747 7.24719 7.38037e+06 2 -60 0.000438174 0.000661273 0.00906957 7.24719 7.38179e+06 2 -61 0.000401349 0.000560618 0.00869695 7.24719 7.38336e+06 2 -62 0.00038753 0.000492174 0.0081759 7.24821 7.38391e+06 2 -63 0.000394636 0.000454843 0.00769066 7.24719 7.38448e+06 2 -64 0.000423411 0.000445372 0.00717657 7.24719 7.3848e+06 2 -65 0.000477476 0.0004611 0.00657904 7.24719 7.38538e+06 2 -66 0.000563808 0.000503957 0.00596263 7.24311 7.38559e+06 2 -67 0.000693638 0.0005766 0.0057778 7.23596 7.38432e+06 2 -68 0.000883733 0.000680011 0.00528835 7.23596 7.38452e+06 2 -69 0.00115791 0.000817641 0.00473653 7.238 7.38473e+06 2 -70 0.00154837 0.00101743 0.00424246 7.23289 7.38433e+06 2 -71 0.00209609 0.00126718 0.0039821 7.23289 7.38445e+06 2 -72 0.00284885 0.0015489 0.0038028 7.2288 7.38422e+06 2 -73 0.00385527 0.00185644 0.00348877 7.22983 7.38431e+06 2 -74 0.00515328 0.00221177 0.00349956 7.22778 7.38433e+06 2 -75 0.00675283 0.00261323 0.00337005 7.22983 7.38445e+06 2 -76 0.00861585 0.00299844 0.00294383 7.22983 7.38479e+06 2 -77 0.01064 0.00341069 0.00266594 7.22676 7.38509e+06 2 -78 0.012656 0.00377359 0.00328031 7.22778 7.38548e+06 2 -79 0.0144463 0.00392637 0.00369927 7.2288 7.38585e+06 2 -80 0.0157858 0.0039249 0.00395535 7.22268 7.38444e+06 2 -81 0.0164951 0.00410935 0.0039663 7.21961 7.37133e+06 2 -82 0.0164868 0.00437076 0.00364417 7.20531 7.36647e+06 2 -83 0.0157872 0.00453246 0.00376842 7.20838 7.36671e+06 2 -84 0.0145248 0.00448344 0.00373657 7.21144 7.367e+06 2 -85 0.012892 0.0041853 0.00357083 7.2145 7.3677e+06 2 -86 0.0110958 0.00381999 0.00421341 7.21757 7.36861e+06 2 -87 0.00931612 0.00341853 0.00495604 7.21246 7.36766e+06 2 -88 0.00768207 0.00299168 0.00541982 7.21553 7.36802e+06 2 -89 0.00626659 0.00267519 0.00561172 7.21757 7.36843e+06 2 -90 0.0050952 0.00246056 0.00556425 7.19918 7.3688e+06 2 -91 0.00416062 0.00227703 0.00598956 7.2002 7.36966e+06 2 -92 0.00343742 0.00208747 0.00589565 7.20225 7.3704e+06 2 -93 0.00289344 0.00188968 0.00558135 7.20225 7.37094e+06 2 -94 0.00249722 0.00173102 0.0049141 7.20531 7.37146e+06 2 -95 0.00222204 0.00159122 0.00474735 7.20633 7.37188e+06 2 -96 0.00204764 0.0014603 0.00456771 7.19612 7.36835e+06 2 -97 0.0019607 0.00133293 0.00443819 7.19714 7.36878e+06 2 -98 0.00195491 0.00124696 0.00415321 7.19714 7.3692e+06 2 -99 0.00203106 0.00121165 0.00430019 7.18897 7.36653e+06 2 -100 0.0021975 0.0012307 0.00457889 7.18999 7.36679e+06 2 -101 0.0024711 0.0012956 0.00442272 7.19305 7.36704e+06 2 -102 0.00287868 0.00145511 0.00457563 7.18488 7.36528e+06 2 -103 0.00345862 0.00174779 0.00432849 7.1859 7.36554e+06 2 -104 0.00426217 0.00212025 0.00414588 7.17365 7.35344e+06 2 -105 0.00535303 0.00261775 0.00444216 7.17569 7.35412e+06 2 -106 0.00680351 0.00316897 0.00448014 7.17773 7.35464e+06 2 -107 0.00868452 0.00376764 0.00503359 7.17978 7.35493e+06 2 -108 0.0110471 0.00458091 0.0050001 7.1808 7.35523e+06 2 -109 0.0138943 0.00545405 0.00468908 7.1665 7.34826e+06 2 -110 0.0171483 0.00657466 0.00476396 7.17058 7.34853e+06 2 -111 0.0206201 0.00751805 0.00454269 7.17773 7.34883e+06 2 -112 0.0240013 0.00804062 0.00488115 7.15935 7.32587e+06 2 -113 0.0268914 0.00834891 0.00479664 7.16445 7.32627e+06 2 -114 0.0288693 0.00821727 0.00448578 7.16547 7.32659e+06 2 -115 0.0295951 0.00784318 0.00487149 7.17263 7.3314e+06 2 -116 0.0289091 0.00723295 0.0050017 7.13892 7.32553e+06 2 -117 0.0268867 0.00643871 0.00596676 7.14096 7.32678e+06 2 -118 0.0238226 0.00572519 0.00715179 7.14505 7.32836e+06 2 -119 0.0201484 0.00507031 0.00736649 7.14709 7.32934e+06 2 -120 0.0163203 0.00455375 0.00784518 7.14709 7.32997e+06 2 -121 0.0127182 0.00415259 0.00782346 7.14913 7.33055e+06 2 -122 0.0095897 0.00368375 0.00718918 7.15015 7.33108e+06 2 -123 0.007043 0.00318333 0.00676735 7.15015 7.33165e+06 2 -124 0.00507609 0.00266921 0.0071441 7.15015 7.3323e+06 2 -125 0.0036193 0.00215184 0.00685136 7.13075 7.33266e+06 2 -126 0.0025746 0.00168908 0.00689381 7.13177 7.33305e+06 2 -127 0.00184294 0.00132295 0.00651315 7.13381 7.33319e+06 2 -128 0.0013388 0.00102839 0.00597317 7.12462 7.33298e+06 2 -129 0.000995066 0.000798893 0.00577487 7.12462 7.33333e+06 2 -130 0.000762435 0.000619981 0.00502993 7.12462 7.33538e+06 2 -131 0.00060632 0.000481578 0.00495401 7.12462 7.33988e+06 2 -132 0.000503328 0.000379812 0.00557859 7.11542 7.32448e+06 2 -133 0.000438174 0.000303097 0.00586867 7.11645 7.32951e+06 2 -134 0.000401349 0.000250994 0.00570498 7.11645 7.33032e+06 2 -135 0.00038753 0.000225586 0.00551905 7.1093 7.33153e+06 2 -136 0.000394636 0.000220637 0.00467436 7.08887 7.295e+06 2 -137 0.000423411 0.000228983 0.00449671 7.08887 7.29629e+06 2 -138 0.000477476 0.000250294 0.00411595 7.08989 7.29759e+06 2 -139 0.000563808 0.000281938 0.00360417 7.09091 7.29878e+06 2 -140 0.000693638 0.000322914 0.00354637 7.09193 7.30109e+06 2 -141 0.000883733 0.000380104 0.00336457 7.09193 7.30302e+06 2 -142 0.00115791 0.000452969 0.00318792 7.0715 7.30503e+06 2 -143 0.00154837 0.000563931 0.0031947 7.07354 7.30582e+06 2 -144 0.00209609 0.000714983 0.00309661 7.07354 7.3064e+06 2 +0 0.00438891 0.0043877 0.00730728 7.58529 1.89823e+07 0 +1 0.0056305 0.00859678 0.00701004 7.59346 1.8984e+07 2 +2 0.00711367 0.00917418 0.00671537 7.59346 1.89757e+07 2 +3 0.00880092 0.00950697 0.00650689 7.5904 1.89761e+07 2 +4 0.0106093 0.00968714 0.00620702 7.59551 1.8977e+07 2 +5 0.01241 0.00970486 0.00593189 7.59448 1.89734e+07 2 +6 0.0140411 0.00953078 0.00645861 7.59653 1.89757e+07 2 +7 0.0153333 0.00913985 0.00663529 7.59959 1.89771e+07 2 +8 0.0161441 0.00857892 0.00747886 7.59653 1.89789e+07 2 +9 0.0163889 0.00811646 0.00797103 7.58018 1.89797e+07 2 +10 0.0160592 0.00765794 0.00882678 7.58325 1.89801e+07 2 +11 0.0152222 0.00729408 0.00870309 7.58631 1.89819e+07 2 +12 0.0140017 0.00693047 0.00790135 7.59244 1.89857e+07 2 +13 0.0125478 0.00658843 0.00932224 7.59551 1.89882e+07 2 +14 0.0110079 0.00611261 0.00951194 7.59857 1.89887e+07 2 +15 0.00950419 0.00547317 0.00978334 7.60061 1.8989e+07 2 +16 0.0081229 0.00501573 0.00966963 7.6047 1.89894e+07 2 +17 0.00691367 0.00462917 0.00958155 7.59551 1.89852e+07 2 +18 0.00589594 0.00428457 0.00952709 7.56486 1.89574e+07 2 +19 0.00506796 0.00394225 0.00917536 7.56588 1.89583e+07 2 +20 0.00441572 0.00362226 0.00867193 7.56895 1.89594e+07 2 +21 0.00392009 0.00335217 0.00822741 7.56997 1.89626e+07 2 +22 0.00356182 0.00311084 0.00982525 7.57303 1.89652e+07 2 +23 0.00332456 0.00289479 0.0110699 7.56282 1.89669e+07 2 +24 0.00319662 0.00274105 0.0107862 7.53524 1.8966e+07 2 +25 0.00317187 0.00285605 0.0112658 7.53728 1.89673e+07 2 +26 0.00325023 0.00315414 0.0110824 7.5383 1.89685e+07 2 +27 0.00343812 0.00344234 0.0105654 7.5383 1.89697e+07 2 +28 0.00374887 0.00382909 0.0111625 7.53728 1.8971e+07 2 +29 0.00420305 0.00429098 0.0107773 7.53728 1.89722e+07 2 +30 0.00482845 0.00472148 0.010087 7.5046 1.89703e+07 2 +31 0.00565916 0.00540596 0.00997963 7.50868 1.89716e+07 2 +32 0.00673294 0.00615289 0.00977659 7.51175 1.89726e+07 2 +33 0.00808585 0.00685085 0.00907715 7.51788 1.89734e+07 2 +34 0.00974318 0.00754225 0.00800254 7.52298 1.8974e+07 2 +35 0.0117064 0.00822534 0.00732504 7.52809 1.89753e+07 2 +36 0.0139373 0.00869222 0.00790866 7.5332 1.89798e+07 2 +37 0.0163425 0.0087515 0.00835821 7.51685 1.89582e+07 2 +38 0.0187653 0.00854167 0.00861898 7.52196 1.89592e+07 2 +39 0.0209905 0.00847306 0.00904022 7.51583 1.89566e+07 2 +40 0.0227698 0.00844295 0.00978419 7.50766 1.89585e+07 2 +41 0.0238647 0.00830516 0.0111155 7.5097 1.89608e+07 2 +42 0.0241 0.00804613 0.0105479 7.5046 1.89623e+07 2 +43 0.0234096 0.00774396 0.0107557 7.49438 1.8963e+07 2 +44 0.0218581 0.0074179 0.0115491 7.49847 1.8964e+07 2 +45 0.0196281 0.00674876 0.0111613 7.48825 1.8956e+07 2 +46 0.0169781 0.00595315 0.0105575 7.48927 1.89571e+07 2 +47 0.0141845 0.00518249 0.0104222 7.46885 1.89577e+07 2 +48 0.0114883 0.00438946 0.0106341 7.46885 1.89584e+07 2 +49 0.009062 0.00361309 0.0106801 7.46987 1.89589e+07 2 +50 0.00699967 0.00293259 0.010482 7.47293 1.89593e+07 2 +51 0.00532668 0.00237761 0.00927419 7.4617 1.89592e+07 2 +52 0.00401993 0.00192856 0.00833493 7.4617 1.89596e+07 2 +53 0.00302936 0.00155944 0.0071867 7.4617 1.89602e+07 2 +54 0.0022956 0.0012423 0.00684386 7.4617 1.89605e+07 2 +55 0.00176142 0.000982271 0.00705497 7.4474 1.89607e+07 2 +56 0.00137764 0.000774916 0.00692046 7.4474 1.8961e+07 2 +57 0.0011051 0.000622748 0.00670005 7.43207 1.89599e+07 2 +58 0.000914263 0.000524364 0.00637059 7.43207 1.89601e+07 2 +59 0.000783786 0.000462932 0.00584514 7.43309 1.89602e+07 2 +60 0.000698927 0.000428325 0.0055386 7.41573 1.89602e+07 2 +61 0.000650081 0.000415234 0.00523442 7.41573 1.89603e+07 2 +62 0.000631696 0.000417739 0.0050159 7.41573 1.89604e+07 2 +63 0.000641574 0.000439505 0.00440163 7.41573 1.89606e+07 2 +64 0.00068055 0.000482531 0.00417164 7.41573 1.89608e+07 2 +65 0.000752529 0.000551112 0.00433061 7.41573 1.89608e+07 2 +66 0.000864831 0.000632131 0.00414312 7.41675 1.8961e+07 2 +67 0.00102883 0.000744605 0.00371224 7.41675 1.89611e+07 2 +68 0.00126074 0.000923789 0.00334391 7.41573 1.8961e+07 2 +69 0.00158246 0.00114724 0.00311164 7.41573 1.89611e+07 2 +70 0.00202192 0.00137453 0.00294289 7.39939 1.89605e+07 2 +71 0.00261246 0.00159971 0.00264639 7.40143 1.89606e+07 2 +72 0.00339026 0.00183528 0.00232658 7.37998 1.89602e+07 2 +73 0.00438891 0.00207649 0.00196512 7.38202 1.89602e+07 2 +74 0.0056305 0.00227039 0.00190511 7.38202 1.89603e+07 2 +75 0.00711367 0.00237908 0.00150395 7.38713 1.89603e+07 2 +76 0.00880092 0.00238315 0.0018116 7.38815 1.89604e+07 2 +77 0.0106093 0.00236913 0.0016894 7.39224 1.89605e+07 2 +78 0.01241 0.00224176 0.00213043 7.38917 1.89606e+07 2 +79 0.0140411 0.00220558 0.00223374 7.38611 1.8961e+07 2 +80 0.0153333 0.0021448 0.00306126 7.38611 1.89614e+07 2 +81 0.0161441 0.00217155 0.00357662 7.38713 1.89617e+07 2 +82 0.0163889 0.00219493 0.00437718 7.39019 1.8962e+07 2 +83 0.0160592 0.00233821 0.00440926 7.38917 1.89621e+07 2 +84 0.0152222 0.00249421 0.00408313 7.36159 1.89622e+07 2 +85 0.0140017 0.00264481 0.00377054 7.36261 1.89623e+07 2 +86 0.0125478 0.00264976 0.00347949 7.36466 1.89626e+07 2 +87 0.0110079 0.00248622 0.00324434 7.36568 1.89627e+07 2 +88 0.00950419 0.00223367 0.00322653 7.3667 1.89628e+07 2 +89 0.0081229 0.00195574 0.00303661 7.36874 1.89629e+07 2 +90 0.00691367 0.00169289 0.00292079 7.37181 1.8963e+07 2 +91 0.00589594 0.00147702 0.00257961 7.36977 1.89619e+07 2 +92 0.00506796 0.00129618 0.00274345 7.37079 1.89622e+07 2 +93 0.00441572 0.00115253 0.00333836 7.37079 1.89629e+07 2 +94 0.00392009 0.00105304 0.00382967 7.37079 1.89635e+07 2 +95 0.00356182 0.000985163 0.00511765 7.37079 1.89643e+07 2 +96 0.00332456 0.0010071 0.00527602 7.36977 1.89647e+07 2 +97 0.00319662 0.00112354 0.00573584 7.34014 1.89667e+07 2 +98 0.00317187 0.00140824 0.00538448 7.34219 1.89679e+07 2 +99 0.00325023 0.00175891 0.00511433 7.34219 1.89681e+07 2 +100 0.00343812 0.00219669 0.00449241 7.34321 1.89683e+07 2 +101 0.00374887 0.00263572 0.0040995 7.34219 1.89684e+07 2 +102 0.00420305 0.00307561 0.00372697 7.34321 1.89685e+07 2 +103 0.00482845 0.00345482 0.0034193 7.33708 1.89667e+07 2 +104 0.00565916 0.0037888 0.00329526 7.3381 1.89669e+07 2 +105 0.00673294 0.00407712 0.00334571 7.32074 1.89531e+07 2 +106 0.00808585 0.0043065 0.0036694 7.30337 1.89503e+07 2 +107 0.00974318 0.00453153 0.0036427 7.29724 1.89504e+07 2 +108 0.0117064 0.00480395 0.00335699 7.29928 1.89506e+07 2 +109 0.0139373 0.00512671 0.00373624 7.30235 1.89507e+07 2 +110 0.0163425 0.00531568 0.00384082 7.28805 1.89249e+07 2 +111 0.0187653 0.00525239 0.00366524 7.29009 1.89261e+07 2 +112 0.0209905 0.00514513 0.00479418 7.29213 1.89268e+07 2 +113 0.0227698 0.00491172 0.00591084 7.29418 1.89285e+07 2 +114 0.0238647 0.00447531 0.00645298 7.2952 1.89291e+07 2 +115 0.0241 0.00427457 0.00676232 7.29826 1.89297e+07 2 +116 0.0234096 0.004199 0.00660112 7.30031 1.893e+07 2 +117 0.0218581 0.00397734 0.00620341 7.28703 1.89295e+07 2 +118 0.0196281 0.0036224 0.0059457 7.27477 1.89291e+07 3 +119 0.0169781 0.00315948 0.00529214 7.27783 1.89294e+07 2 +120 0.0141845 0.00264134 0.00499094 7.26149 1.89266e+07 2 +121 0.0114883 0.00215603 0.00526816 7.26149 1.89268e+07 2 +122 0.009062 0.00170591 0.00514449 7.26149 1.89269e+07 2 +123 0.00699967 0.00133018 0.00468049 7.26251 1.89271e+07 2 +124 0.00532668 0.00104669 0.00442589 7.26251 1.89273e+07 2 +125 0.00401993 0.000826775 0.00429403 7.26353 1.89274e+07 2 +126 0.00302936 0.000648461 0.00401443 7.26353 1.89275e+07 2 +127 0.0022956 0.000508711 0.00361588 7.26456 1.89275e+07 2 +128 0.00176142 0.000404414 0.00320157 7.26558 1.89276e+07 2 +129 0.00137764 0.000325669 0.00245053 7.2523 1.89098e+07 2 +130 0.0011051 0.000265096 0.00217706 7.2523 1.89098e+07 2 +131 0.000914263 0.000218655 0.00193199 7.24004 1.89003e+07 2 +132 0.000783786 0.000183728 0.00195116 7.22574 1.89003e+07 2 +133 0.000698927 0.000155725 0.00191864 7.22574 1.89003e+07 2 +134 0.000650081 0.000137542 0.0018275 7.22574 1.89003e+07 2 +135 0.000631696 0.00013237 0.00148515 7.22574 1.89004e+07 2 +136 0.000641574 0.000138451 0.00114972 7.22574 1.89004e+07 2 +137 0.00068055 0.000152635 0.000863552 7.22574 1.89004e+07 2 +138 0.000752529 0.000165979 0.000748124 7.20633 1.88996e+07 2 +139 0.000864831 0.000174837 0.000688255 7.20633 1.88996e+07 2 +140 0.00102883 0.000179538 0.000658685 7.20633 1.88997e+07 2 +141 0.00126074 0.00018925 0.000609944 7.20633 1.88997e+07 2 +142 0.00158246 0.000208719 0.000627052 7.20633 1.88997e+07 2 +143 0.00202192 0.000239248 0.000553758 7.20633 1.88997e+07 2 +144 0.00261246 0.000277069 0.000505473 7.20633 1.88997e+07 2 diff --git a/test/expected/output2ITNs.txt b/test/expected/output2ITNs.txt index 10c3c8dec..71a9db4e7 100644 --- a/test/expected/output2ITNs.txt +++ b/test/expected/output2ITNs.txt @@ -1,21 +1,21 @@ -1 1 0 50 -1 2 0 107 -1 3 0 131 -1 4 0 101 -1 5 0 101 -1 6 0 489 +1 1 0 47 +1 2 0 117 +1 3 0 119 +1 4 0 107 +1 5 0 103 +1 6 0 486 1 1 3 0 -1 2 3 1 -1 3 3 1 -1 4 3 0 -1 5 3 4 -1 6 3 27 +1 2 3 2 +1 3 3 6 +1 4 3 2 +1 5 3 7 +1 6 3 19 1 1 5 0 -1 2 5 5.29321 -1 3 5 7.72131 -1 4 5 0 -1 5 5 24.6479 -1 6 5 153.891 +1 2 5 18.1571 +1 3 5 40.7811 +1 4 5 10.1085 +1 5 5 51.894 +1 6 5 100.969 1 1 11 0 1 2 11 0 1 3 11 0 @@ -34,7 +34,7 @@ 1 4 13 0 1 5 13 0 1 6 13 0 -1 0 26 0.0103599 +1 0 26 0.0122911 1 1 46 0 1 2 46 0 1 3 46 0 @@ -60,29 +60,29 @@ 1 5 61 0 1 6 61 0 2 1 0 49 -2 2 0 107 -2 3 0 130 -2 4 0 102 -2 5 0 103 -2 6 0 488 +2 2 0 115 +2 3 0 120 +2 4 0 107 +2 5 0 102 +2 6 0 486 2 1 3 0 2 2 3 2 2 3 3 4 -2 4 3 1 -2 5 3 2 -2 6 3 26 +2 4 3 3 +2 5 3 7 +2 6 3 23 2 1 5 0 -2 2 5 11.319 -2 3 5 36.1073 -2 4 5 7.87954 -2 5 5 16.3245 -2 6 5 162.093 +2 2 5 17.0457 +2 3 5 31.7466 +2 4 5 16.6936 +2 5 5 48.2782 +2 6 5 135.127 2 1 11 0 2 2 11 0 -2 3 11 0 -2 4 11 1 -2 5 11 1 -2 6 11 0 +2 3 11 1 +2 4 11 0 +2 5 11 0 +2 6 11 2 2 1 12 0 2 2 12 0 2 3 12 0 @@ -95,7 +95,7 @@ 2 4 13 0 2 5 13 0 2 6 13 0 -2 0 26 0.0103599 +2 0 26 0.0122911 2 1 46 0 2 2 46 0 2 3 46 0 @@ -108,7 +108,7 @@ 2 4 52 0 2 5 52 0 2 6 52 0 -2 1 58 3 +2 1 58 4 2 2 58 0 2 3 58 0 2 4 58 0 @@ -120,43 +120,43 @@ 2 4 61 0 2 5 61 0 2 6 61 0 -3 1 0 47 -3 2 0 105 -3 3 0 134 -3 4 0 100 +3 1 0 48 +3 2 0 116 +3 3 0 120 +3 4 0 107 3 5 0 104 -3 6 0 489 +3 6 0 484 3 1 3 0 3 2 3 2 -3 3 3 5 -3 4 3 2 -3 5 3 4 -3 6 3 26 +3 3 3 2 +3 4 3 3 +3 5 3 6 +3 6 3 32 3 1 5 0 -3 2 5 9.29049 -3 3 5 32.0217 -3 4 5 13.2797 -3 5 5 27.145 -3 6 5 157.234 +3 2 5 14.3643 +3 3 5 22.3076 +3 4 5 13.9011 +3 5 5 37.8311 +3 6 5 193.992 3 1 11 0 -3 2 11 0 -3 3 11 1 -3 4 11 1 -3 5 11 1 -3 6 11 2 +3 2 11 2 +3 3 11 2 +3 4 11 0 +3 5 11 2 +3 6 11 4 3 1 12 0 3 2 12 0 3 3 12 0 3 4 12 0 3 5 12 0 -3 6 12 0 +3 6 12 1 3 1 13 0 3 2 13 0 3 3 13 0 3 4 13 0 -3 5 13 0 +3 5 13 2 3 6 13 0 -3 0 26 0.0103599 +3 0 26 0.0122911 3 1 46 0 3 2 46 0 3 3 46 0 @@ -169,7 +169,7 @@ 3 4 52 0 3 5 52 0 3 6 52 0 -3 1 58 6 +3 1 58 3 3 2 58 0 3 3 58 0 3 4 58 0 @@ -181,43 +181,43 @@ 3 4 61 0 3 5 61 0 3 6 61 0 -4 1 0 50 -4 2 0 104 -4 3 0 132 -4 4 0 98 -4 5 0 106 -4 6 0 489 +4 1 0 48 +4 2 0 117 +4 3 0 120 +4 4 0 107 +4 5 0 105 +4 6 0 482 4 1 3 0 -4 2 3 0 -4 3 3 7 -4 4 3 5 -4 5 3 4 -4 6 3 29 +4 2 3 4 +4 3 3 2 +4 4 3 2 +4 5 3 8 +4 6 3 26 4 1 5 0 -4 2 5 0 -4 3 5 52.52 -4 4 5 30.167 -4 5 5 28.1326 -4 6 5 182.13 +4 2 5 32.7542 +4 3 5 16.7325 +4 4 5 10.6882 +4 5 5 46.2229 +4 6 5 160.557 4 1 11 0 -4 2 11 0 -4 3 11 1 -4 4 11 1 -4 5 11 1 -4 6 11 4 +4 2 11 1 +4 3 11 0 +4 4 11 0 +4 5 11 0 +4 6 11 3 4 1 12 0 4 2 12 0 4 3 12 0 4 4 12 0 -4 5 12 0 +4 5 12 1 4 6 12 0 4 1 13 0 -4 2 13 1 +4 2 13 0 4 3 13 0 -4 4 13 0 +4 4 13 1 4 5 13 0 4 6 13 0 -4 0 26 0.0103599 +4 0 26 0.0122911 4 1 46 0 4 2 46 0 4 3 46 0 @@ -243,29 +243,29 @@ 4 5 61 0 4 6 61 0 5 1 0 48 -5 2 0 105 -5 3 0 131 -5 4 0 99 -5 5 0 108 -5 6 0 488 +5 2 0 115 +5 3 0 119 +5 4 0 110 +5 5 0 107 +5 6 0 480 5 1 3 0 -5 2 3 0 -5 3 3 8 -5 4 3 4 +5 2 3 5 +5 3 3 3 +5 4 3 3 5 5 3 7 -5 6 3 30 +5 6 3 27 5 1 5 0 -5 2 5 0 -5 3 5 65.1783 -5 4 5 25.2993 -5 5 5 36.8013 -5 6 5 187.329 +5 2 5 32.9499 +5 3 5 26.8381 +5 4 5 26.3564 +5 5 5 36.0389 +5 6 5 174.897 5 1 11 0 5 2 11 0 -5 3 11 1 +5 3 11 0 5 4 11 1 5 5 11 0 -5 6 11 2 +5 6 11 0 5 1 12 0 5 2 12 0 5 3 12 0 @@ -276,15 +276,15 @@ 5 2 13 0 5 3 13 0 5 4 13 0 -5 5 13 0 +5 5 13 1 5 6 13 0 -5 0 26 0.0103599 -5 1 46 14 -5 2 46 24 -5 3 46 49 -5 4 46 35 -5 5 46 39 -5 6 46 172 +5 0 26 0.0122911 +5 1 46 18 +5 2 46 44 +5 3 46 48 +5 4 46 32 +5 5 46 38 +5 6 46 173 5 1 52 0 5 2 52 0 5 3 52 0 @@ -304,29 +304,29 @@ 5 5 61 0 5 6 61 0 6 1 0 49 -6 2 0 107 -6 3 0 128 -6 4 0 102 -6 5 0 103 -6 6 0 490 +6 2 0 115 +6 3 0 116 +6 4 0 109 +6 5 0 109 +6 6 0 481 6 1 3 0 -6 2 3 1 -6 3 3 6 +6 2 3 2 +6 3 3 3 6 4 3 5 6 5 3 6 -6 6 3 26 +6 6 3 25 6 1 5 0 -6 2 5 6.12922 -6 3 5 47.4075 -6 4 5 30.5137 -6 5 5 35.0942 -6 6 5 163.741 +6 2 5 12.6074 +6 3 5 25.4993 +6 4 5 36.683 +6 5 5 27.155 +6 6 5 163.313 6 1 11 0 6 2 11 0 -6 3 11 0 -6 4 11 0 +6 3 11 1 +6 4 11 1 6 5 11 0 -6 6 11 0 +6 6 11 1 6 1 12 0 6 2 12 0 6 3 12 0 @@ -339,13 +339,13 @@ 6 4 13 0 6 5 13 0 6 6 13 0 -6 0 26 0.0103599 -6 1 46 14 -6 2 46 40 -6 3 46 48 -6 4 46 38 -6 5 46 34 -6 6 46 164 +6 0 26 0.0122911 +6 1 46 22 +6 2 46 36 +6 3 46 36 +6 4 46 47 +6 5 46 37 +6 6 46 176 6 1 52 0 6 2 52 0 6 3 52 0 @@ -364,28 +364,28 @@ 6 4 61 0 6 5 61 0 6 6 61 0 -7 1 0 50 -7 2 0 108 -7 3 0 128 -7 4 0 103 -7 5 0 96 -7 6 0 494 +7 1 0 51 +7 2 0 111 +7 3 0 115 +7 4 0 109 +7 5 0 112 +7 6 0 481 7 1 3 0 7 2 3 0 -7 3 3 3 -7 4 3 0 -7 5 3 2 -7 6 3 5 +7 3 3 1 +7 4 3 1 +7 5 3 1 +7 6 3 4 7 1 5 0 7 2 5 0 -7 3 5 20.2844 -7 4 5 0 -7 5 5 14.0808 -7 6 5 37.7242 +7 3 5 5.49403 +7 4 5 6.1451 +7 5 5 3.57142 +7 6 5 27.5685 7 1 11 0 7 2 11 0 7 3 11 0 -7 4 11 0 +7 4 11 1 7 5 11 0 7 6 11 0 7 1 12 0 @@ -400,7 +400,7 @@ 7 4 13 0 7 5 13 0 7 6 13 0 -7 0 26 0.0103599 +7 0 26 0.0122911 7 1 46 0 7 2 46 0 7 3 46 0 @@ -408,12 +408,12 @@ 7 5 46 0 7 6 46 0 7 1 52 49 -7 2 52 104 -7 3 52 93 -7 4 52 79 -7 5 52 77 -7 6 52 421 -7 1 58 7 +7 2 52 114 +7 3 52 96 +7 4 52 80 +7 5 52 93 +7 6 52 396 +7 1 58 6 7 2 58 0 7 3 58 0 7 4 58 0 @@ -426,29 +426,29 @@ 7 5 61 0 7 6 61 0 8 1 0 52 -8 2 0 106 -8 3 0 129 -8 4 0 103 -8 5 0 96 -8 6 0 493 +8 2 0 113 +8 3 0 114 +8 4 0 111 +8 5 0 110 +8 6 0 479 8 1 3 0 8 2 3 0 -8 3 3 2 +8 3 3 1 8 4 3 1 -8 5 3 4 -8 6 3 8 +8 5 3 2 +8 6 3 5 8 1 5 0 8 2 5 0 -8 3 5 14.2881 -8 4 5 4.56576 -8 5 5 29.1073 -8 6 5 59.4372 +8 3 5 9.02849 +8 4 5 6.13515 +8 5 5 15.0143 +8 6 5 29.4742 8 1 11 0 8 2 11 0 8 3 11 0 8 4 11 0 8 5 11 0 -8 6 11 0 +8 6 11 1 8 1 12 0 8 2 12 0 8 3 12 0 @@ -461,7 +461,7 @@ 8 4 13 0 8 5 13 0 8 6 13 0 -8 0 26 0.0103599 +8 0 26 0.0122911 8 1 46 0 8 2 46 0 8 3 46 0 @@ -474,7 +474,7 @@ 8 4 52 0 8 5 52 0 8 6 52 0 -8 1 58 4 +8 1 58 5 8 2 58 0 8 3 58 0 8 4 58 0 @@ -486,30 +486,30 @@ 8 4 61 0 8 5 61 0 8 6 61 0 -9 1 0 52 -9 2 0 106 -9 3 0 129 -9 4 0 102 -9 5 0 97 -9 6 0 493 +9 1 0 53 +9 2 0 115 +9 3 0 111 +9 4 0 111 +9 5 0 111 +9 6 0 478 9 1 3 0 -9 2 3 1 +9 2 3 0 9 3 3 1 9 4 3 1 -9 5 3 3 -9 6 3 13 +9 5 3 1 +9 6 3 4 9 1 5 0 -9 2 5 4.88426 -9 3 5 9.73829 -9 4 5 7.55721 -9 5 5 21.2111 -9 6 5 90.2462 +9 2 5 0 +9 3 5 6.35929 +9 4 5 5.46949 +9 5 5 9.69761 +9 6 5 23.3704 9 1 11 0 9 2 11 0 9 3 11 0 -9 4 11 1 +9 4 11 0 9 5 11 0 -9 6 11 1 +9 6 11 0 9 1 12 0 9 2 12 0 9 3 12 0 @@ -522,7 +522,7 @@ 9 4 13 0 9 5 13 0 9 6 13 0 -9 0 26 0.0103599 +9 0 26 0.0122911 9 1 46 0 9 2 46 0 9 3 46 0 @@ -535,7 +535,7 @@ 9 4 52 0 9 5 52 0 9 6 52 0 -9 1 58 5 +9 1 58 7 9 2 58 0 9 3 58 0 9 4 58 0 @@ -547,30 +547,30 @@ 9 4 61 0 9 5 61 0 9 6 61 0 -10 1 0 50 -10 2 0 107 -10 3 0 130 -10 4 0 102 -10 5 0 99 -10 6 0 491 +10 1 0 52 +10 2 0 115 +10 3 0 111 +10 4 0 113 +10 5 0 109 +10 6 0 479 10 1 3 0 10 2 3 0 -10 3 3 1 +10 3 3 2 10 4 3 1 -10 5 3 4 -10 6 3 26 +10 5 3 1 +10 6 3 2 10 1 5 0 10 2 5 0 -10 3 5 7.76377 -10 4 5 4.72211 -10 5 5 29.1288 -10 6 5 175.797 +10 3 5 14.0683 +10 4 5 5.05866 +10 5 5 7.9057 +10 6 5 11.5347 10 1 11 0 10 2 11 0 10 3 11 0 10 4 11 0 10 5 11 0 -10 6 11 2 +10 6 11 0 10 1 12 0 10 2 12 0 10 3 12 0 @@ -583,7 +583,7 @@ 10 4 13 0 10 5 13 0 10 6 13 0 -10 0 26 0.0103599 +10 0 26 0.0122911 10 1 46 0 10 2 46 0 10 3 46 0 @@ -596,7 +596,7 @@ 10 4 52 0 10 5 52 0 10 6 52 0 -10 1 58 8 +10 1 58 3 10 2 58 0 10 3 58 0 10 4 58 0 @@ -608,30 +608,30 @@ 10 4 61 0 10 5 61 0 10 6 61 0 -11 1 0 47 -11 2 0 111 -11 3 0 128 -11 4 0 105 -11 5 0 98 -11 6 0 490 +11 1 0 52 +11 2 0 116 +11 3 0 111 +11 4 0 114 +11 5 0 109 +11 6 0 477 11 1 3 0 -11 2 3 2 +11 2 3 0 11 3 3 1 11 4 3 1 -11 5 3 3 -11 6 3 24 +11 5 3 1 +11 6 3 2 11 1 5 0 -11 2 5 15.492 -11 3 5 7.11042 -11 4 5 5.45984 -11 5 5 19.6641 -11 6 5 155.309 +11 2 5 0 +11 3 5 7.3809 +11 4 5 3.61573 +11 5 5 6.55819 +11 6 5 12.3395 11 1 11 0 11 2 11 0 -11 3 11 0 +11 3 11 1 11 4 11 0 -11 5 11 1 -11 6 11 3 +11 5 11 0 +11 6 11 0 11 1 12 0 11 2 12 0 11 3 12 0 @@ -644,7 +644,7 @@ 11 4 13 0 11 5 13 0 11 6 13 0 -11 0 26 0.0103599 +11 0 26 0.0122911 11 1 46 0 11 2 46 0 11 3 46 0 @@ -663,36 +663,36 @@ 11 4 58 0 11 5 58 0 11 6 58 0 -11 1 61 3 -11 2 61 18 -11 3 61 37 -11 4 61 30 -11 5 61 28 -11 6 61 115 -12 1 0 49 -12 2 0 107 -12 3 0 131 -12 4 0 104 -12 5 0 97 -12 6 0 491 +11 1 61 4 +11 2 61 25 +11 3 61 29 +11 4 61 17 +11 5 61 31 +11 6 61 108 +12 1 0 48 +12 2 0 118 +12 3 0 111 +12 4 0 113 +12 5 0 111 +12 6 0 478 12 1 3 0 -12 2 3 2 -12 3 3 1 +12 2 3 0 +12 3 3 0 12 4 3 1 12 5 3 1 -12 6 3 17 +12 6 3 2 12 1 5 0 -12 2 5 11.3523 -12 3 5 5.27394 -12 4 5 4.70404 -12 5 5 7.14163 -12 6 5 105.831 +12 2 5 0 +12 3 5 0 +12 4 5 4.25301 +12 5 5 5.6416 +12 6 5 11.8982 12 1 11 0 12 2 11 0 12 3 11 0 12 4 11 0 12 5 11 0 -12 6 11 1 +12 6 11 0 12 1 12 0 12 2 12 0 12 3 12 0 @@ -705,7 +705,7 @@ 12 4 13 0 12 5 13 0 12 6 13 0 -12 0 26 0.0103599 +12 0 26 0.0122911 12 1 46 0 12 2 46 0 12 3 46 0 @@ -718,38 +718,38 @@ 12 4 52 0 12 5 52 0 12 6 52 0 -12 1 58 4 +12 1 58 5 12 2 58 0 12 3 58 0 12 4 58 0 12 5 58 0 12 6 58 0 -12 1 61 4 -12 2 61 36 -12 3 61 40 -12 4 61 30 -12 5 61 26 -12 6 61 172 +12 1 61 6 +12 2 61 43 +12 3 61 34 +12 4 61 43 +12 5 61 30 +12 6 61 178 13 1 0 49 -13 2 0 108 -13 3 0 133 -13 4 0 100 -13 5 0 98 -13 6 0 491 +13 2 0 119 +13 3 0 110 +13 4 0 113 +13 5 0 110 +13 6 0 478 13 1 3 0 -13 2 3 1 -13 3 3 1 +13 2 3 0 +13 3 3 0 13 4 3 1 -13 5 3 1 -13 6 3 14 +13 5 3 0 +13 6 3 2 13 1 5 0 -13 2 5 5.25447 -13 3 5 4.50102 -13 4 5 3.62237 -13 5 5 6.65033 -13 6 5 83.8429 +13 2 5 0 +13 3 5 0 +13 4 5 3.70134 +13 5 5 0 +13 6 5 11.4551 13 1 11 0 -13 2 11 1 +13 2 11 0 13 3 11 0 13 4 11 0 13 5 11 0 @@ -766,7 +766,7 @@ 13 4 13 0 13 5 13 0 13 6 13 0 -13 0 26 0.0103599 +13 0 26 0.0122911 13 1 46 0 13 2 46 0 13 3 46 0 @@ -779,36 +779,36 @@ 13 4 52 0 13 5 52 0 13 6 52 0 -13 1 58 5 +13 1 58 6 13 2 58 0 13 3 58 0 13 4 58 0 13 5 58 0 13 6 58 0 -13 1 61 1 -13 2 61 11 -13 3 61 19 -13 4 61 14 -13 5 61 12 -13 6 61 50 +13 1 61 3 +13 2 61 14 +13 3 61 12 +13 4 61 24 +13 5 61 14 +13 6 61 60 14 1 0 48 -14 2 0 110 -14 3 0 131 -14 4 0 102 -14 5 0 96 -14 6 0 492 +14 2 0 118 +14 3 0 109 +14 4 0 116 +14 5 0 107 +14 6 0 481 14 1 3 0 -14 2 3 1 -14 3 3 1 +14 2 3 0 +14 3 3 0 14 4 3 0 14 5 3 1 -14 6 3 14 +14 6 3 1 14 1 5 0 -14 2 5 4.56031 -14 3 5 5.80024 +14 2 5 0 +14 3 5 0 14 4 5 0 -14 5 5 6.66978 -14 6 5 84.9235 +14 5 5 3.70635 +14 6 5 4.39219 14 1 11 0 14 2 11 0 14 3 11 0 @@ -827,7 +827,7 @@ 14 4 13 0 14 5 13 0 14 6 13 0 -14 0 26 0.00568735 +14 0 26 0.004692 14 1 46 0 14 2 46 0 14 3 46 0 @@ -840,7 +840,7 @@ 14 4 52 0 14 5 52 0 14 6 52 0 -14 1 58 3 +14 1 58 6 14 2 58 0 14 3 58 0 14 4 58 0 @@ -852,30 +852,30 @@ 14 4 61 0 14 5 61 0 14 6 61 0 -15 1 0 51 -15 2 0 109 -15 3 0 133 -15 4 0 99 -15 5 0 97 -15 6 0 490 +15 1 0 50 +15 2 0 119 +15 3 0 106 +15 4 0 116 +15 5 0 104 +15 6 0 484 15 1 3 0 15 2 3 0 -15 3 3 1 -15 4 3 0 -15 5 3 2 -15 6 3 9 +15 3 3 0 +15 4 3 1 +15 5 3 0 +15 6 3 0 15 1 5 0 15 2 5 0 -15 3 5 4.8972 -15 4 5 0 -15 5 5 16.467 -15 6 5 53.2324 +15 3 5 0 +15 4 5 7.41062 +15 5 5 0 +15 6 5 0 15 1 11 0 15 2 11 0 15 3 11 0 15 4 11 0 15 5 11 0 -15 6 11 0 +15 6 11 1 15 1 12 0 15 2 12 0 15 3 12 0 @@ -888,7 +888,7 @@ 15 4 13 0 15 5 13 0 15 6 13 0 -15 0 26 0.00568735 +15 0 26 0.004692 15 1 46 0 15 2 46 0 15 3 46 0 @@ -901,7 +901,7 @@ 15 4 52 0 15 5 52 0 15 6 52 0 -15 1 58 5 +15 1 58 6 15 2 58 0 15 3 58 0 15 4 58 0 @@ -913,28 +913,28 @@ 15 4 61 0 15 5 61 0 15 6 61 0 -16 1 0 49 -16 2 0 111 -16 3 0 133 -16 4 0 98 -16 5 0 97 -16 6 0 491 +16 1 0 51 +16 2 0 117 +16 3 0 105 +16 4 0 116 +16 5 0 106 +16 6 0 484 16 1 3 0 16 2 3 0 -16 3 3 1 -16 4 3 1 -16 5 3 3 -16 6 3 7 +16 3 3 0 +16 4 3 0 +16 5 3 0 +16 6 3 1 16 1 5 0 16 2 5 0 -16 3 5 4.58914 -16 4 5 4.81481 -16 5 5 24.6132 -16 6 5 43.8935 +16 3 5 0 +16 4 5 0 +16 5 5 0 +16 6 5 7.89664 16 1 11 0 16 2 11 0 16 3 11 0 -16 4 11 0 +16 4 11 1 16 5 11 0 16 6 11 0 16 1 12 0 @@ -949,7 +949,7 @@ 16 4 13 0 16 5 13 0 16 6 13 0 -16 0 26 0.00568735 +16 0 26 0.004692 16 1 46 0 16 2 46 0 16 3 46 0 @@ -974,30 +974,30 @@ 16 4 61 0 16 5 61 0 16 6 61 0 -17 1 0 48 -17 2 0 110 -17 3 0 133 -17 4 0 100 -17 5 0 97 -17 6 0 491 +17 1 0 53 +17 2 0 115 +17 3 0 107 +17 4 0 112 +17 5 0 106 +17 6 0 486 17 1 3 0 17 2 3 0 -17 3 3 1 +17 3 3 0 17 4 3 0 -17 5 3 2 -17 6 3 6 +17 5 3 0 +17 6 3 1 17 1 5 0 17 2 5 0 -17 3 5 5.00213 +17 3 5 0 17 4 5 0 -17 5 5 15.7883 -17 6 5 41.254 +17 5 5 0 +17 6 5 7.55235 17 1 11 0 17 2 11 0 17 3 11 0 17 4 11 0 17 5 11 0 -17 6 11 2 +17 6 11 0 17 1 12 0 17 2 12 0 17 3 12 0 @@ -1010,7 +1010,7 @@ 17 4 13 0 17 5 13 0 17 6 13 0 -17 0 26 0.00568735 +17 0 26 0.004692 17 1 46 0 17 2 46 0 17 3 46 0 @@ -1023,7 +1023,7 @@ 17 4 52 0 17 5 52 0 17 6 52 0 -17 1 58 5 +17 1 58 3 17 2 58 0 17 3 58 0 17 4 58 0 @@ -1035,28 +1035,28 @@ 17 4 61 0 17 5 61 0 17 6 61 0 -18 1 0 47 -18 2 0 112 -18 3 0 134 -18 4 0 98 -18 5 0 97 -18 6 0 491 +18 1 0 53 +18 2 0 115 +18 3 0 108 +18 4 0 113 +18 5 0 101 +18 6 0 489 18 1 3 0 18 2 3 0 -18 3 3 1 -18 4 3 1 -18 5 3 2 -18 6 3 6 +18 3 3 0 +18 4 3 0 +18 5 3 0 +18 6 3 1 18 1 5 0 18 2 5 0 -18 3 5 4.65081 -18 4 5 8.20912 -18 5 5 13.3846 -18 6 5 34.9783 +18 3 5 0 +18 4 5 0 +18 5 5 0 +18 6 5 7.07982 18 1 11 0 18 2 11 0 18 3 11 0 -18 4 11 1 +18 4 11 0 18 5 11 0 18 6 11 0 18 1 12 0 @@ -1071,7 +1071,7 @@ 18 4 13 0 18 5 13 0 18 6 13 0 -18 0 26 0.00568735 +18 0 26 0.004692 18 1 46 0 18 2 46 0 18 3 46 0 @@ -1084,7 +1084,7 @@ 18 4 52 0 18 5 52 0 18 6 52 0 -18 1 58 5 +18 1 58 3 18 2 58 0 18 3 58 0 18 4 58 0 @@ -1096,28 +1096,28 @@ 18 4 61 0 18 5 61 0 18 6 61 0 -19 1 0 46 -19 2 0 110 -19 3 0 136 -19 4 0 98 -19 5 0 99 -19 6 0 490 +19 1 0 53 +19 2 0 117 +19 3 0 110 +19 4 0 111 +19 5 0 101 +19 6 0 487 19 1 3 0 19 2 3 0 -19 3 3 1 -19 4 3 1 -19 5 3 1 -19 6 3 7 +19 3 3 0 +19 4 3 0 +19 5 3 0 +19 6 3 0 19 1 5 0 19 2 5 0 -19 3 5 5.80134 -19 4 5 8.00424 -19 5 5 9.06694 -19 6 5 44.2748 +19 3 5 0 +19 4 5 0 +19 5 5 0 +19 6 5 0 19 1 11 0 19 2 11 0 19 3 11 0 -19 4 11 1 +19 4 11 0 19 5 11 0 19 6 11 0 19 1 12 0 @@ -1132,20 +1132,20 @@ 19 4 13 0 19 5 13 0 19 6 13 0 -19 0 26 0.00568735 -19 1 46 13 -19 2 46 35 -19 3 46 46 -19 4 46 22 -19 5 46 30 -19 6 46 135 +19 0 26 0.004692 +19 1 46 16 +19 2 46 39 +19 3 46 31 +19 4 46 30 +19 5 46 33 +19 6 46 140 19 1 52 0 19 2 52 0 19 3 52 0 19 4 52 0 19 5 52 0 19 6 52 0 -19 1 58 5 +19 1 58 3 19 2 58 0 19 3 58 0 19 4 58 0 @@ -1157,24 +1157,24 @@ 19 4 61 0 19 5 61 0 19 6 61 0 -20 1 0 48 -20 2 0 108 -20 3 0 135 -20 4 0 100 -20 5 0 97 -20 6 0 491 +20 1 0 53 +20 2 0 115 +20 3 0 112 +20 4 0 112 +20 5 0 100 +20 6 0 487 20 1 3 0 20 2 3 0 20 3 3 0 -20 4 3 2 -20 5 3 1 -20 6 3 4 +20 4 3 0 +20 5 3 0 +20 6 3 0 20 1 5 0 20 2 5 0 20 3 5 0 -20 4 5 12.4001 -20 5 5 6.85351 -20 6 5 29.7358 +20 4 5 0 +20 5 5 0 +20 6 5 0 20 1 11 0 20 2 11 0 20 3 11 0 @@ -1193,20 +1193,20 @@ 20 4 13 0 20 5 13 0 20 6 13 0 -20 0 26 0.00568735 -20 1 46 12 -20 2 46 33 -20 3 46 48 -20 4 46 38 -20 5 46 33 -20 6 46 184 +20 0 26 0.004692 +20 1 46 23 +20 2 46 39 +20 3 46 44 +20 4 46 30 +20 5 46 32 +20 6 46 177 20 1 52 0 20 2 52 0 20 3 52 0 20 4 52 0 20 5 52 0 20 6 52 0 -20 1 58 6 +20 1 58 4 20 2 58 0 20 3 58 0 20 4 58 0 @@ -1218,30 +1218,30 @@ 20 4 61 0 20 5 61 0 20 6 61 0 -21 1 0 51 -21 2 0 105 -21 3 0 134 -21 4 0 102 -21 5 0 93 -21 6 0 494 +21 1 0 50 +21 2 0 117 +21 3 0 115 +21 4 0 110 +21 5 0 103 +21 6 0 484 21 1 3 0 21 2 3 0 21 3 3 0 -21 4 3 2 -21 5 3 2 -21 6 3 7 +21 4 3 0 +21 5 3 0 +21 6 3 0 21 1 5 0 21 2 5 0 21 3 5 0 -21 4 5 12.032 -21 5 5 11.6425 -21 6 5 48.0769 +21 4 5 0 +21 5 5 0 +21 6 5 0 21 1 11 0 21 2 11 0 21 3 11 0 21 4 11 0 -21 5 11 1 -21 6 11 1 +21 5 11 0 +21 6 11 0 21 1 12 0 21 2 12 0 21 3 12 0 @@ -1254,20 +1254,20 @@ 21 4 13 0 21 5 13 0 21 6 13 0 -21 0 26 0.00568735 -21 1 46 1 -21 2 46 5 -21 3 46 5 -21 4 46 7 -21 5 46 6 -21 6 46 23 +21 0 26 0.004692 +21 1 46 3 +21 2 46 7 +21 3 46 3 +21 4 46 11 +21 5 46 1 +21 6 46 27 21 1 52 0 21 2 52 0 21 3 52 0 21 4 52 0 21 5 52 0 21 6 52 0 -21 1 58 4 +21 1 58 6 21 2 58 0 21 3 58 0 21 4 58 0 @@ -1279,24 +1279,24 @@ 21 4 61 0 21 5 61 0 21 6 61 0 -22 1 0 52 -22 2 0 101 -22 3 0 135 -22 4 0 103 -22 5 0 92 -22 6 0 496 +22 1 0 47 +22 2 0 120 +22 3 0 113 +22 4 0 111 +22 5 0 104 +22 6 0 484 22 1 3 0 22 2 3 0 22 3 3 0 -22 4 3 2 -22 5 3 1 -22 6 3 9 +22 4 3 0 +22 5 3 0 +22 6 3 0 22 1 5 0 22 2 5 0 22 3 5 0 -22 4 5 9.99689 -22 5 5 5.46602 -22 6 5 57.7488 +22 4 5 0 +22 5 5 0 +22 6 5 0 22 1 11 0 22 2 11 0 22 3 11 0 @@ -1315,7 +1315,7 @@ 22 4 13 0 22 5 13 0 22 6 13 0 -22 0 26 0.00568735 +22 0 26 0.004692 22 1 46 0 22 2 46 0 22 3 46 0 @@ -1328,7 +1328,7 @@ 22 4 52 0 22 5 52 0 22 6 52 0 -22 1 58 8 +22 1 58 7 22 2 58 0 22 3 58 0 22 4 58 0 @@ -1340,24 +1340,24 @@ 22 4 61 0 22 5 61 0 22 6 61 0 -23 1 0 52 -23 2 0 100 -23 3 0 134 -23 4 0 106 -23 5 0 93 -23 6 0 494 +23 1 0 48 +23 2 0 121 +23 3 0 113 +23 4 0 110 +23 5 0 104 +23 6 0 483 23 1 3 0 23 2 3 0 23 3 3 0 -23 4 3 1 -23 5 3 2 -23 6 3 9 +23 4 3 0 +23 5 3 0 +23 6 3 0 23 1 5 0 23 2 5 0 23 3 5 0 -23 4 5 5.24358 -23 5 5 11.4018 -23 6 5 57.5512 +23 4 5 0 +23 5 5 0 +23 6 5 0 23 1 11 0 23 2 11 0 23 3 11 0 @@ -1376,7 +1376,7 @@ 23 4 13 0 23 5 13 0 23 6 13 0 -23 0 26 0.00568735 +23 0 26 0.004692 23 1 46 0 23 2 46 0 23 3 46 0 @@ -1401,24 +1401,24 @@ 23 4 61 0 23 5 61 0 23 6 61 0 -24 1 0 52 -24 2 0 101 -24 3 0 133 -24 4 0 105 -24 5 0 95 -24 6 0 493 +24 1 0 48 +24 2 0 121 +24 3 0 110 +24 4 0 113 +24 5 0 104 +24 6 0 483 24 1 3 0 24 2 3 0 24 3 3 0 -24 4 3 1 -24 5 3 2 -24 6 3 7 +24 4 3 0 +24 5 3 0 +24 6 3 0 24 1 5 0 24 2 5 0 24 3 5 0 -24 4 5 4.94864 -24 5 5 12.2177 -24 6 5 46.7714 +24 4 5 0 +24 5 5 0 +24 6 5 0 24 1 11 0 24 2 11 0 24 3 11 0 @@ -1437,7 +1437,7 @@ 24 4 13 0 24 5 13 0 24 6 13 0 -24 0 26 0.00568735 +24 0 26 0.004692 24 1 46 0 24 2 46 0 24 3 46 0 @@ -1450,7 +1450,7 @@ 24 4 52 0 24 5 52 0 24 6 52 0 -24 1 58 7 +24 1 58 5 24 2 58 0 24 3 58 0 24 4 58 0 @@ -1462,24 +1462,24 @@ 24 4 61 0 24 5 61 0 24 6 61 0 -25 1 0 50 -25 2 0 106 -25 3 0 129 -25 4 0 104 -25 5 0 97 -25 6 0 493 +25 1 0 49 +25 2 0 117 +25 3 0 113 +25 4 0 109 +25 5 0 106 +25 6 0 485 25 1 3 0 25 2 3 0 25 3 3 0 -25 4 3 1 -25 5 3 2 -25 6 3 5 +25 4 3 0 +25 5 3 0 +25 6 3 0 25 1 5 0 25 2 5 0 25 3 5 0 -25 4 5 5.66293 -25 5 5 9.96377 -25 6 5 26.7722 +25 4 5 0 +25 5 5 0 +25 6 5 0 25 1 11 0 25 2 11 0 25 3 11 0 @@ -1498,7 +1498,7 @@ 25 4 13 0 25 5 13 0 25 6 13 0 -25 0 26 0.00568735 +25 0 26 0.004692 25 1 46 0 25 2 46 0 25 3 46 0 @@ -1511,15 +1511,15 @@ 25 4 52 0 25 5 52 0 25 6 52 0 -25 1 58 5 +25 1 58 4 25 2 58 0 25 3 58 0 25 4 58 0 25 5 58 0 25 6 58 0 25 1 61 3 -25 2 61 22 -25 3 61 28 -25 4 61 19 -25 5 61 19 -25 6 61 86 +25 2 61 25 +25 3 61 16 +25 4 61 23 +25 5 61 16 +25 6 61 89 diff --git a/test/expected/outputDecisionTree5DayDielmo.txt b/test/expected/outputDecisionTree5DayDielmo.txt index abd4ffe36..f4c96255e 100644 --- a/test/expected/outputDecisionTree5DayDielmo.txt +++ b/test/expected/outputDecisionTree5DayDielmo.txt @@ -1,12 +1,12 @@ -1 1 0 19 -1 2 0 13 +1 1 0 18 +1 2 0 15 1 3 0 23 -1 4 0 53 -1 5 0 49 -1 6 0 47 -1 7 0 114 -1 8 0 61 -1 9 0 20 +1 4 0 51 +1 5 0 45 +1 6 0 43 +1 7 0 123 +1 8 0 62 +1 9 0 19 1 1 3 0 1 2 3 0 1 3 3 0 @@ -43,24 +43,24 @@ 1 7 80 0 1 8 80 0 1 9 80 0 -2 1 0 18 -2 2 0 13 -2 3 0 24 -2 4 0 51 -2 5 0 47 -2 6 0 52 -2 7 0 115 -2 8 0 59 -2 9 0 21 -2 1 3 186 -2 2 3 227 -2 3 3 427 -2 4 3 1220 -2 5 3 1150 -2 6 3 1666 -2 7 3 4604 -2 8 3 2247 -2 9 3 543 +2 1 0 22 +2 2 0 9 +2 3 0 22 +2 4 0 52 +2 5 0 45 +2 6 0 44 +2 7 0 125 +2 8 0 62 +2 9 0 18 +2 1 3 232 +2 2 3 325 +2 3 3 467 +2 4 3 1452 +2 5 3 1617 +2 6 3 1964 +2 7 3 6069 +2 8 3 2551 +2 9 3 671 2 1 11 0 2 2 11 0 2 3 11 0 @@ -70,21 +70,21 @@ 2 7 11 0 2 8 11 0 2 9 11 0 -2 1 14 26 -2 2 14 20 -2 3 14 47 -2 4 14 77 -2 5 14 68 -2 6 14 60 -2 7 14 68 -2 8 14 32 -2 9 14 6 -2 1 80 1451 -2 2 80 1038 -2 3 80 1716 -2 4 80 3636 -2 5 80 3463 -2 6 80 3585 -2 7 80 8340 -2 8 80 4470 -2 9 80 1478 +2 1 14 19 +2 2 14 32 +2 3 14 65 +2 4 14 106 +2 5 14 82 +2 6 14 69 +2 7 14 89 +2 8 14 19 +2 9 14 8 +2 1 80 1395 +2 2 80 936 +2 3 80 1721 +2 4 80 3813 +2 5 80 3204 +2 6 80 3234 +2 7 80 8965 +2 8 80 4518 +2 9 80 1341 diff --git a/test/expected/outputIRS30.txt b/test/expected/outputIRS30.txt index 1b2f2f06d..ce19fb55d 100644 --- a/test/expected/outputIRS30.txt +++ b/test/expected/outputIRS30.txt @@ -1,21 +1,21 @@ -1 1 0 50 -1 2 0 107 -1 3 0 131 -1 4 0 101 -1 5 0 101 -1 6 0 489 +1 1 0 49 +1 2 0 109 +1 3 0 124 +1 4 0 110 +1 5 0 100 +1 6 0 487 1 1 3 0 -1 2 3 1 -1 3 3 1 -1 4 3 0 -1 5 3 4 -1 6 3 27 +1 2 3 3 +1 3 3 4 +1 4 3 4 +1 5 3 3 +1 6 3 21 1 1 5 0 -1 2 5 5.29321 -1 3 5 7.72131 -1 4 5 0 -1 5 5 24.6479 -1 6 5 153.891 +1 2 5 19.1775 +1 3 5 26.6573 +1 4 5 21.572 +1 5 5 18.7438 +1 6 5 112.516 1 1 11 0 1 2 11 0 1 3 11 0 @@ -34,7 +34,7 @@ 1 4 13 0 1 5 13 0 1 6 13 0 -1 0 26 0.0103599 +1 0 26 0.0110305 1 1 46 0 1 2 46 0 1 3 46 0 @@ -47,30 +47,30 @@ 1 4 52 0 1 5 52 0 1 6 52 0 -2 1 0 49 +2 1 0 48 2 2 0 107 -2 3 0 130 -2 4 0 102 -2 5 0 103 -2 6 0 488 +2 3 0 126 +2 4 0 109 +2 5 0 102 +2 6 0 487 2 1 3 0 -2 2 3 2 -2 3 3 4 -2 4 3 1 -2 5 3 2 -2 6 3 26 +2 2 3 1 +2 3 3 3 +2 4 3 2 +2 5 3 5 +2 6 3 20 2 1 5 0 -2 2 5 11.319 -2 3 5 36.1073 -2 4 5 7.87954 -2 5 5 16.3245 -2 6 5 162.093 +2 2 5 8.78079 +2 3 5 23.8167 +2 4 5 11.8063 +2 5 5 36.2306 +2 6 5 104.251 2 1 11 0 2 2 11 0 2 3 11 0 -2 4 11 1 -2 5 11 1 -2 6 11 0 +2 4 11 0 +2 5 11 0 +2 6 11 1 2 1 12 0 2 2 12 0 2 3 12 0 @@ -83,7 +83,7 @@ 2 4 13 0 2 5 13 0 2 6 13 0 -2 0 26 0.0103599 +2 0 26 0.0110305 2 1 46 0 2 2 46 0 2 3 46 0 @@ -96,29 +96,29 @@ 2 4 52 0 2 5 52 0 2 6 52 0 -3 1 0 47 +3 1 0 50 3 2 0 105 -3 3 0 134 -3 4 0 100 -3 5 0 104 -3 6 0 489 +3 3 0 127 +3 4 0 106 +3 5 0 103 +3 6 0 488 3 1 3 0 -3 2 3 2 -3 3 3 5 +3 2 3 1 +3 3 3 3 3 4 3 2 -3 5 3 4 -3 6 3 26 +3 5 3 5 +3 6 3 27 3 1 5 0 -3 2 5 9.29049 -3 3 5 32.0217 -3 4 5 13.2797 -3 5 5 27.145 -3 6 5 157.234 +3 2 5 9.65967 +3 3 5 23.4291 +3 4 5 14.4977 +3 5 5 29.9987 +3 6 5 161.824 3 1 11 0 3 2 11 0 -3 3 11 1 -3 4 11 1 -3 5 11 1 +3 3 11 0 +3 4 11 0 +3 5 11 0 3 6 11 2 3 1 12 0 3 2 12 0 @@ -132,7 +132,7 @@ 3 4 13 0 3 5 13 0 3 6 13 0 -3 0 26 0.0103599 +3 0 26 0.0110305 3 1 46 0 3 2 46 0 3 3 46 0 @@ -145,30 +145,30 @@ 3 4 52 0 3 5 52 0 3 6 52 0 -4 1 0 50 -4 2 0 104 -4 3 0 132 -4 4 0 98 -4 5 0 106 -4 6 0 489 +4 1 0 52 +4 2 0 103 +4 3 0 127 +4 4 0 107 +4 5 0 103 +4 6 0 487 4 1 3 0 -4 2 3 0 -4 3 3 7 -4 4 3 5 +4 2 3 3 +4 3 3 2 +4 4 3 1 4 5 3 4 -4 6 3 29 +4 6 3 24 4 1 5 0 -4 2 5 0 -4 3 5 52.52 -4 4 5 30.167 -4 5 5 28.1326 -4 6 5 182.13 +4 2 5 23.9524 +4 3 5 10.8642 +4 4 5 4.74541 +4 5 5 24.7686 +4 6 5 147.804 4 1 11 0 4 2 11 0 -4 3 11 1 +4 3 11 0 4 4 11 1 -4 5 11 1 -4 6 11 4 +4 5 11 0 +4 6 11 5 4 1 12 0 4 2 12 0 4 3 12 0 @@ -176,12 +176,12 @@ 4 5 12 0 4 6 12 0 4 1 13 0 -4 2 13 1 +4 2 13 0 4 3 13 0 4 4 13 0 4 5 13 0 4 6 13 0 -4 0 26 0.0103599 +4 0 26 0.0110305 4 1 46 0 4 2 46 0 4 3 46 0 @@ -194,30 +194,30 @@ 4 4 52 0 4 5 52 0 4 6 52 0 -5 1 0 48 -5 2 0 105 -5 3 0 131 -5 4 0 99 -5 5 0 108 -5 6 0 488 +5 1 0 56 +5 2 0 102 +5 3 0 129 +5 4 0 108 +5 5 0 102 +5 6 0 482 5 1 3 0 -5 2 3 0 -5 3 3 8 -5 4 3 4 -5 5 3 7 -5 6 3 30 +5 2 3 2 +5 3 3 1 +5 4 3 5 +5 5 3 3 +5 6 3 20 5 1 5 0 -5 2 5 0 -5 3 5 65.1783 -5 4 5 25.2993 -5 5 5 36.8013 -5 6 5 187.329 +5 2 5 15.3338 +5 3 5 6.56061 +5 4 5 30.4625 +5 5 5 23.0848 +5 6 5 124.599 5 1 11 0 -5 2 11 0 +5 2 11 2 5 3 11 1 -5 4 11 1 -5 5 11 0 -5 6 11 2 +5 4 11 2 +5 5 11 1 +5 6 11 1 5 1 12 0 5 2 12 0 5 3 12 0 @@ -230,43 +230,43 @@ 5 4 13 0 5 5 13 0 5 6 13 0 -5 0 26 0.0103599 -5 1 46 14 -5 2 46 24 -5 3 46 49 -5 4 46 35 -5 5 46 39 -5 6 46 173 +5 0 26 0.0110305 +5 1 46 17 +5 2 46 35 +5 3 46 44 +5 4 46 45 +5 5 46 34 +5 6 46 164 5 1 52 0 5 2 52 0 5 3 52 0 5 4 52 0 5 5 52 0 5 6 52 0 -6 1 0 49 -6 2 0 107 -6 3 0 128 -6 4 0 102 -6 5 0 103 -6 6 0 490 +6 1 0 54 +6 2 0 102 +6 3 0 129 +6 4 0 109 +6 5 0 102 +6 6 0 483 6 1 3 0 6 2 3 1 -6 3 3 6 -6 4 3 5 -6 5 3 6 -6 6 3 26 +6 3 3 1 +6 4 3 4 +6 5 3 3 +6 6 3 16 6 1 5 0 -6 2 5 6.12922 -6 3 5 47.4075 -6 4 5 30.5137 -6 5 5 35.0942 -6 6 5 163.741 +6 2 5 6.60165 +6 3 5 5.89211 +6 4 5 20.699 +6 5 5 24.5956 +6 6 5 97.2999 6 1 11 0 -6 2 11 0 +6 2 11 1 6 3 11 0 -6 4 11 0 +6 4 11 1 6 5 11 0 -6 6 11 0 +6 6 11 1 6 1 12 0 6 2 12 0 6 3 12 0 @@ -279,43 +279,43 @@ 6 4 13 0 6 5 13 0 6 6 13 0 -6 0 26 0.0103599 -6 1 46 16 -6 2 46 40 -6 3 46 48 -6 4 46 38 -6 5 46 33 -6 6 46 161 +6 0 26 0.0110305 +6 1 46 21 +6 2 46 34 +6 3 46 46 +6 4 46 35 +6 5 46 38 +6 6 46 179 6 1 52 0 6 2 52 0 6 3 52 0 6 4 52 0 6 5 52 0 6 6 52 0 -7 1 0 50 -7 2 0 108 -7 3 0 128 -7 4 0 103 -7 5 0 96 -7 6 0 494 +7 1 0 51 +7 2 0 104 +7 3 0 127 +7 4 0 110 +7 5 0 102 +7 6 0 485 7 1 3 0 7 2 3 1 -7 3 3 3 +7 3 3 0 7 4 3 3 -7 5 3 4 -7 6 3 22 +7 5 3 2 +7 6 3 19 7 1 5 0 -7 2 5 4.5511 -7 3 5 20.6491 -7 4 5 18.9301 -7 5 5 29.7304 -7 6 5 128.689 +7 2 5 4.22925 +7 3 5 0 +7 4 5 25.265 +7 5 5 15.5992 +7 6 5 102.002 7 1 11 0 -7 2 11 0 +7 2 11 1 7 3 11 0 7 4 11 0 -7 5 11 1 -7 6 11 0 +7 5 11 0 +7 6 11 1 7 1 12 0 7 2 12 0 7 3 12 0 @@ -328,7 +328,7 @@ 7 4 13 0 7 5 13 0 7 6 13 0 -7 0 26 0.0103599 +7 0 26 0.0110305 7 1 46 0 7 2 46 0 7 3 46 0 @@ -337,34 +337,34 @@ 7 6 46 0 7 1 52 0 7 2 52 3 -7 3 52 35 -7 4 52 23 -7 5 52 26 -7 6 52 69 -8 1 0 52 +7 3 52 31 +7 4 52 16 +7 5 52 24 +7 6 52 60 +8 1 0 46 8 2 0 106 -8 3 0 129 -8 4 0 103 -8 5 0 96 -8 6 0 493 +8 3 0 128 +8 4 0 110 +8 5 0 103 +8 6 0 486 8 1 3 0 -8 2 3 2 -8 3 3 1 +8 2 3 1 +8 3 3 2 8 4 3 3 -8 5 3 3 -8 6 3 19 +8 5 3 2 +8 6 3 11 8 1 5 0 -8 2 5 10.3087 -8 3 5 4.92942 -8 4 5 16.3651 -8 5 5 24.7366 -8 6 5 119.417 +8 2 5 7.38165 +8 3 5 11.3988 +8 4 5 22.9951 +8 5 5 17.4026 +8 6 5 56.0518 8 1 11 0 8 2 11 0 8 3 11 0 -8 4 11 0 -8 5 11 1 -8 6 11 0 +8 4 11 1 +8 5 11 0 +8 6 11 1 8 1 12 0 8 2 12 0 8 3 12 0 @@ -377,7 +377,7 @@ 8 4 13 0 8 5 13 0 8 6 13 0 -8 0 26 0.0103599 +8 0 26 0.0110305 8 1 46 0 8 2 46 0 8 3 46 0 @@ -390,30 +390,30 @@ 8 4 52 0 8 5 52 0 8 6 52 0 -9 1 0 52 +9 1 0 49 9 2 0 106 -9 3 0 129 -9 4 0 102 -9 5 0 97 -9 6 0 493 +9 3 0 125 +9 4 0 107 +9 5 0 105 +9 6 0 487 9 1 3 0 9 2 3 1 -9 3 3 4 -9 4 3 2 -9 5 3 2 -9 6 3 25 +9 3 3 2 +9 4 3 1 +9 5 3 4 +9 6 3 11 9 1 5 0 -9 2 5 8.95247 -9 3 5 21.1585 -9 4 5 8.51099 -9 5 5 16.2748 -9 6 5 150.981 +9 2 5 13.0845 +9 3 5 9.46347 +9 4 5 10.0749 +9 5 5 26.9492 +9 6 5 57.3278 9 1 11 0 9 2 11 0 -9 3 11 1 -9 4 11 2 +9 3 11 0 +9 4 11 0 9 5 11 0 -9 6 11 2 +9 6 11 0 9 1 12 0 9 2 12 0 9 3 12 0 @@ -426,7 +426,7 @@ 9 4 13 0 9 5 13 0 9 6 13 0 -9 0 26 0.0103599 +9 0 26 0.0110305 9 1 46 0 9 2 46 0 9 3 46 0 @@ -439,28 +439,28 @@ 9 4 52 0 9 5 52 0 9 6 52 0 -10 1 0 50 -10 2 0 107 -10 3 0 130 -10 4 0 102 -10 5 0 99 -10 6 0 491 +10 1 0 53 +10 2 0 104 +10 3 0 123 +10 4 0 109 +10 5 0 103 +10 6 0 487 10 1 3 0 -10 2 3 0 -10 3 3 5 -10 4 3 2 -10 5 3 3 -10 6 3 23 +10 2 3 1 +10 3 3 0 +10 4 3 0 +10 5 3 4 +10 6 3 9 10 1 5 0 -10 2 5 0 -10 3 5 45.2775 -10 4 5 9.40317 -10 5 5 20.089 -10 6 5 137.338 +10 2 5 11.6408 +10 3 5 0 +10 4 5 0 +10 5 5 25.5496 +10 6 5 46.8015 10 1 11 0 10 2 11 0 -10 3 11 0 -10 4 11 0 +10 3 11 1 +10 4 11 1 10 5 11 0 10 6 11 1 10 1 12 0 @@ -475,7 +475,7 @@ 10 4 13 0 10 5 13 0 10 6 13 0 -10 0 26 0.0103599 +10 0 26 0.0110305 10 1 46 0 10 2 46 0 10 3 46 0 @@ -488,29 +488,29 @@ 10 4 52 0 10 5 52 0 10 6 52 0 -11 1 0 47 -11 2 0 111 -11 3 0 128 -11 4 0 105 -11 5 0 98 -11 6 0 490 +11 1 0 53 +11 2 0 106 +11 3 0 123 +11 4 0 107 +11 5 0 104 +11 6 0 486 11 1 3 0 -11 2 3 0 -11 3 3 5 -11 4 3 1 -11 5 3 2 -11 6 3 20 +11 2 3 2 +11 3 3 0 +11 4 3 0 +11 5 3 4 +11 6 3 6 11 1 5 0 -11 2 5 0 -11 3 5 42.14 -11 4 5 5.16242 -11 5 5 9.87379 -11 6 5 114.017 +11 2 5 13.4164 +11 3 5 0 +11 4 5 0 +11 5 5 20.8919 +11 6 5 33.7463 11 1 11 0 11 2 11 0 11 3 11 0 -11 4 11 1 -11 5 11 0 +11 4 11 0 +11 5 11 1 11 6 11 1 11 1 12 0 11 2 12 0 @@ -524,7 +524,7 @@ 11 4 13 0 11 5 13 0 11 6 13 0 -11 0 26 0.0103599 +11 0 26 0.0110305 11 1 46 0 11 2 46 0 11 3 46 0 @@ -537,30 +537,30 @@ 11 4 52 0 11 5 52 0 11 6 52 0 -12 1 0 49 +12 1 0 52 12 2 0 107 -12 3 0 131 -12 4 0 104 -12 5 0 97 -12 6 0 491 +12 3 0 120 +12 4 0 108 +12 5 0 104 +12 6 0 488 12 1 3 0 -12 2 3 0 -12 3 3 3 -12 4 3 1 -12 5 3 0 -12 6 3 13 +12 2 3 1 +12 3 3 0 +12 4 3 0 +12 5 3 1 +12 6 3 4 12 1 5 0 -12 2 5 0 -12 3 5 22.9042 -12 4 5 4.50011 -12 5 5 0 -12 6 5 78.9518 +12 2 5 6.39094 +12 3 5 0 +12 4 5 0 +12 5 5 6.34696 +12 6 5 26.4123 12 1 11 0 -12 2 11 0 -12 3 11 1 +12 2 11 1 +12 3 11 0 12 4 11 0 -12 5 11 0 -12 6 11 2 +12 5 11 1 +12 6 11 0 12 1 12 0 12 2 12 0 12 3 12 0 @@ -573,7 +573,7 @@ 12 4 13 0 12 5 13 0 12 6 13 0 -12 0 26 0.0103599 +12 0 26 0.0110305 12 1 46 0 12 2 46 0 12 3 46 0 @@ -586,24 +586,24 @@ 12 4 52 0 12 5 52 0 12 6 52 0 -13 1 0 49 -13 2 0 108 -13 3 0 133 -13 4 0 100 -13 5 0 98 -13 6 0 491 +13 1 0 54 +13 2 0 106 +13 3 0 121 +13 4 0 105 +13 5 0 106 +13 6 0 487 13 1 3 0 -13 2 3 0 -13 3 3 3 +13 2 3 1 +13 3 3 0 13 4 3 0 -13 5 3 0 -13 6 3 10 +13 5 3 1 +13 6 3 4 13 1 5 0 -13 2 5 0 -13 3 5 23.6598 +13 2 5 10.4782 +13 3 5 0 13 4 5 0 -13 5 5 0 -13 6 5 56.4971 +13 5 5 5.40185 +13 6 5 24.6511 13 1 11 0 13 2 11 0 13 3 11 0 @@ -622,7 +622,7 @@ 13 4 13 0 13 5 13 0 13 6 13 0 -13 0 26 0.0103599 +13 0 26 0.0110305 13 1 46 0 13 2 46 0 13 3 46 0 @@ -635,24 +635,24 @@ 13 4 52 0 13 5 52 0 13 6 52 0 -14 1 0 48 -14 2 0 110 -14 3 0 131 -14 4 0 102 -14 5 0 96 -14 6 0 492 +14 1 0 50 +14 2 0 108 +14 3 0 123 +14 4 0 105 +14 5 0 104 +14 6 0 489 14 1 3 0 -14 2 3 0 -14 3 3 2 +14 2 3 1 +14 3 3 0 14 4 3 0 -14 5 3 0 -14 6 3 10 +14 5 3 2 +14 6 3 4 14 1 5 0 -14 2 5 0 -14 3 5 13.0526 +14 2 5 6.8574 +14 3 5 0 14 4 5 0 -14 5 5 0 -14 6 5 59.5865 +14 5 5 12.9052 +14 6 5 27.1357 14 1 11 0 14 2 11 0 14 3 11 0 @@ -671,7 +671,7 @@ 14 4 13 0 14 5 13 0 14 6 13 0 -14 0 26 0.00686001 +14 0 26 0.00491954 14 1 46 0 14 2 46 0 14 3 46 0 @@ -684,30 +684,30 @@ 14 4 52 0 14 5 52 0 14 6 52 0 -15 1 0 51 -15 2 0 109 -15 3 0 133 -15 4 0 99 -15 5 0 97 +15 1 0 53 +15 2 0 108 +15 3 0 122 +15 4 0 102 +15 5 0 104 15 6 0 490 15 1 3 0 -15 2 3 0 -15 3 3 1 +15 2 3 2 +15 3 3 0 15 4 3 0 -15 5 3 1 -15 6 3 7 +15 5 3 2 +15 6 3 6 15 1 5 0 -15 2 5 0 -15 3 5 5.43883 +15 2 5 13.8921 +15 3 5 0 15 4 5 0 -15 5 5 10.237 -15 6 5 44.9723 +15 5 5 11.0654 +15 6 5 34.5884 15 1 11 0 15 2 11 0 15 3 11 0 15 4 11 0 15 5 11 0 -15 6 11 0 +15 6 11 1 15 1 12 0 15 2 12 0 15 3 12 0 @@ -720,7 +720,7 @@ 15 4 13 0 15 5 13 0 15 6 13 0 -15 0 26 0.00686001 +15 0 26 0.00491954 15 1 46 0 15 2 46 0 15 3 46 0 @@ -733,30 +733,30 @@ 15 4 52 0 15 5 52 0 15 6 52 0 -16 1 0 49 -16 2 0 111 -16 3 0 133 -16 4 0 98 -16 5 0 97 -16 6 0 491 +16 1 0 50 +16 2 0 110 +16 3 0 122 +16 4 0 102 +16 5 0 105 +16 6 0 490 16 1 3 0 -16 2 3 0 -16 3 3 1 -16 4 3 1 +16 2 3 1 +16 3 3 0 +16 4 3 0 16 5 3 2 -16 6 3 8 +16 6 3 3 16 1 5 0 -16 2 5 0 -16 3 5 7.52537 -16 4 5 6.17478 -16 5 5 18.8257 -16 6 5 47.9387 +16 2 5 4.88688 +16 3 5 0 +16 4 5 0 +16 5 5 9.9031 +16 6 5 17.7697 16 1 11 0 16 2 11 0 16 3 11 0 -16 4 11 0 +16 4 11 1 16 5 11 0 -16 6 11 2 +16 6 11 0 16 1 12 0 16 2 12 0 16 3 12 0 @@ -769,7 +769,7 @@ 16 4 13 0 16 5 13 0 16 6 13 0 -16 0 26 0.00686001 +16 0 26 0.00491954 16 1 46 0 16 2 46 0 16 3 46 0 @@ -782,29 +782,29 @@ 16 4 52 0 16 5 52 0 16 6 52 0 -17 1 0 48 -17 2 0 110 -17 3 0 133 -17 4 0 100 -17 5 0 97 -17 6 0 491 +17 1 0 51 +17 2 0 111 +17 3 0 122 +17 4 0 103 +17 5 0 102 +17 6 0 490 17 1 3 0 17 2 3 0 -17 3 3 1 -17 4 3 1 -17 5 3 1 -17 6 3 8 +17 3 3 0 +17 4 3 0 +17 5 3 2 +17 6 3 3 17 1 5 0 17 2 5 0 -17 3 5 4.69354 -17 4 5 3.96327 -17 5 5 10.3489 -17 6 5 49.167 +17 3 5 0 +17 4 5 0 +17 5 5 9.29719 +17 6 5 16.0069 17 1 11 0 17 2 11 0 17 3 11 0 17 4 11 0 -17 5 11 1 +17 5 11 0 17 6 11 2 17 1 12 0 17 2 12 0 @@ -818,7 +818,7 @@ 17 4 13 0 17 5 13 0 17 6 13 0 -17 0 26 0.00686001 +17 0 26 0.00491954 17 1 46 0 17 2 46 0 17 3 46 0 @@ -831,30 +831,30 @@ 17 4 52 0 17 5 52 0 17 6 52 0 -18 1 0 47 -18 2 0 112 -18 3 0 134 -18 4 0 98 -18 5 0 97 +18 1 0 51 +18 2 0 110 +18 3 0 122 +18 4 0 104 +18 5 0 101 18 6 0 491 18 1 3 0 18 2 3 0 -18 3 3 1 -18 4 3 1 -18 5 3 1 -18 6 3 7 +18 3 3 0 +18 4 3 0 +18 5 3 2 +18 6 3 3 18 1 5 0 18 2 5 0 -18 3 5 4.49945 -18 4 5 7.77807 -18 5 5 8.71225 -18 6 5 44.1304 +18 3 5 0 +18 4 5 0 +18 5 5 8.99225 +18 6 5 15.6531 18 1 11 0 18 2 11 0 18 3 11 0 18 4 11 0 18 5 11 0 -18 6 11 1 +18 6 11 0 18 1 12 0 18 2 12 0 18 3 12 0 @@ -867,7 +867,7 @@ 18 4 13 0 18 5 13 0 18 6 13 0 -18 0 26 0.00686001 +18 0 26 0.00491954 18 1 46 0 18 2 46 0 18 3 46 0 @@ -880,24 +880,24 @@ 18 4 52 0 18 5 52 0 18 6 52 0 -19 1 0 46 -19 2 0 110 -19 3 0 136 -19 4 0 98 -19 5 0 99 -19 6 0 490 +19 1 0 53 +19 2 0 109 +19 3 0 123 +19 4 0 104 +19 5 0 101 +19 6 0 489 19 1 3 0 -19 2 3 0 -19 3 3 1 -19 4 3 2 +19 2 3 1 +19 3 3 0 +19 4 3 0 19 5 3 1 -19 6 3 9 +19 6 3 2 19 1 5 0 -19 2 5 0 -19 3 5 4.50035 -19 4 5 14.2986 -19 5 5 9.06694 -19 6 5 54.2965 +19 2 5 3.59311 +19 3 5 0 +19 4 5 0 +19 5 5 5.95569 +19 6 5 13.6621 19 1 11 0 19 2 11 0 19 3 11 0 @@ -916,43 +916,43 @@ 19 4 13 0 19 5 13 0 19 6 13 0 -19 0 26 0.00686001 -19 1 46 11 -19 2 46 31 -19 3 46 45 -19 4 46 24 -19 5 46 23 -19 6 46 137 +19 0 26 0.00491954 +19 1 46 13 +19 2 46 35 +19 3 46 40 +19 4 46 26 +19 5 46 29 +19 6 46 143 19 1 52 0 19 2 52 0 19 3 52 0 19 4 52 0 19 5 52 0 19 6 52 0 -20 1 0 48 -20 2 0 108 -20 3 0 135 -20 4 0 100 -20 5 0 97 -20 6 0 491 +20 1 0 52 +20 2 0 111 +20 3 0 124 +20 4 0 102 +20 5 0 103 +20 6 0 487 20 1 3 0 20 2 3 0 -20 3 3 2 -20 4 3 2 +20 3 3 1 +20 4 3 0 20 5 3 1 -20 6 3 9 +20 6 3 2 20 1 5 0 20 2 5 0 -20 3 5 11.0492 -20 4 5 13.8227 -20 5 5 6.85351 -20 6 5 59.5945 +20 3 5 5.5265 +20 4 5 0 +20 5 5 6.06103 +20 6 5 13.1345 20 1 11 0 20 2 11 0 20 3 11 0 20 4 11 0 20 5 11 0 -20 6 11 2 +20 6 11 0 20 1 12 0 20 2 12 0 20 3 12 0 @@ -965,92 +965,92 @@ 20 4 13 0 20 5 13 0 20 6 13 0 -20 0 26 0.00686001 -20 1 46 15 -20 2 46 33 -20 3 46 45 -20 4 46 38 -20 5 46 34 -20 6 46 185 +20 0 26 0.00491954 +20 1 46 26 +20 2 46 36 +20 3 46 40 +20 4 46 39 +20 5 46 28 +20 6 46 179 20 1 52 0 20 2 52 0 20 3 52 0 20 4 52 0 20 5 52 0 20 6 52 0 -21 1 0 51 -21 2 0 105 -21 3 0 134 +21 1 0 49 +21 2 0 114 +21 3 0 123 21 4 0 102 -21 5 0 93 -21 6 0 494 -21 1 3 1 +21 5 0 104 +21 6 0 487 +21 1 3 0 21 2 3 0 -21 3 3 2 -21 4 3 3 -21 5 3 1 -21 6 3 11 -21 1 5 6.11222 +21 3 3 0 +21 4 3 0 +21 5 3 2 +21 6 3 2 +21 1 5 0 21 2 5 0 -21 3 5 9.17769 -21 4 5 20.817 -21 5 5 5.59512 -21 6 5 66.5977 +21 3 5 0 +21 4 5 0 +21 5 5 13.2562 +21 6 5 9.83515 21 1 11 0 21 2 11 0 21 3 11 0 21 4 11 0 21 5 11 0 -21 6 11 4 +21 6 11 1 21 1 12 0 21 2 12 0 21 3 12 0 21 4 12 0 21 5 12 0 -21 6 12 1 +21 6 12 0 21 1 13 0 21 2 13 0 21 3 13 0 21 4 13 0 21 5 13 0 21 6 13 0 -21 0 26 0.00686001 -21 1 46 3 -21 2 46 8 -21 3 46 4 -21 4 46 7 -21 5 46 3 -21 6 46 22 +21 0 26 0.00491954 +21 1 46 0 +21 2 46 2 +21 3 46 3 +21 4 46 4 +21 5 46 9 +21 6 46 27 21 1 52 0 21 2 52 0 21 3 52 0 21 4 52 0 21 5 52 0 21 6 52 0 -22 1 0 52 -22 2 0 101 -22 3 0 135 -22 4 0 103 -22 5 0 92 -22 6 0 496 -22 1 3 1 +22 1 0 48 +22 2 0 116 +22 3 0 121 +22 4 0 101 +22 5 0 104 +22 6 0 489 +22 1 3 0 22 2 3 0 -22 3 3 2 -22 4 3 1 -22 5 3 1 -22 6 3 9 -22 1 5 5.84313 +22 3 3 1 +22 4 3 0 +22 5 3 2 +22 6 3 0 +22 1 5 0 22 2 5 0 -22 3 5 8.54304 -22 4 5 4.27927 -22 5 5 5.46602 -22 6 5 51.7788 +22 3 5 6.59574 +22 4 5 0 +22 5 5 12.931 +22 6 5 0 22 1 11 0 22 2 11 0 22 3 11 0 -22 4 11 1 -22 5 11 1 -22 6 11 1 +22 4 11 0 +22 5 11 0 +22 6 11 0 22 1 12 0 22 2 12 0 22 3 12 0 @@ -1063,7 +1063,7 @@ 22 4 13 0 22 5 13 0 22 6 13 0 -22 0 26 0.00686001 +22 0 26 0.00491954 22 1 46 0 22 2 46 0 22 3 46 0 @@ -1076,24 +1076,24 @@ 22 4 52 0 22 5 52 0 22 6 52 0 -23 1 0 52 -23 2 0 100 -23 3 0 134 -23 4 0 106 -23 5 0 93 -23 6 0 494 -23 1 3 1 +23 1 0 49 +23 2 0 115 +23 3 0 119 +23 4 0 103 +23 5 0 101 +23 6 0 492 +23 1 3 0 23 2 3 0 23 3 3 1 -23 4 3 1 -23 5 3 1 -23 6 3 6 -23 1 5 4.40612 +23 4 3 0 +23 5 3 2 +23 6 3 0 +23 1 5 0 23 2 5 0 -23 3 5 6.12789 -23 4 5 4.29976 -23 5 5 4.03497 -23 6 5 36.5314 +23 3 5 5.5826 +23 4 5 0 +23 5 5 11.3143 +23 6 5 0 23 1 11 0 23 2 11 0 23 3 11 0 @@ -1112,7 +1112,7 @@ 23 4 13 0 23 5 13 0 23 6 13 0 -23 0 26 0.00686001 +23 0 26 0.00491954 23 1 46 0 23 2 46 0 23 3 46 0 @@ -1125,24 +1125,24 @@ 23 4 52 0 23 5 52 0 23 6 52 0 -24 1 0 52 -24 2 0 101 -24 3 0 133 -24 4 0 105 -24 5 0 95 -24 6 0 493 -24 1 3 1 +24 1 0 49 +24 2 0 115 +24 3 0 120 +24 4 0 104 +24 5 0 101 +24 6 0 490 +24 1 3 0 24 2 3 0 -24 3 3 1 +24 3 3 0 24 4 3 0 -24 5 3 1 -24 6 3 5 -24 1 5 4.02969 +24 5 3 2 +24 6 3 0 +24 1 5 0 24 2 5 0 -24 3 5 6.01052 +24 3 5 0 24 4 5 0 -24 5 5 5.32435 -24 6 5 26.4476 +24 5 5 10.0857 +24 6 5 0 24 1 11 0 24 2 11 0 24 3 11 0 @@ -1161,7 +1161,7 @@ 24 4 13 0 24 5 13 0 24 6 13 0 -24 0 26 0.00686001 +24 0 26 0.00491954 24 1 46 0 24 2 46 0 24 3 46 0 @@ -1174,24 +1174,24 @@ 24 4 52 0 24 5 52 0 24 6 52 0 -25 1 0 49 -25 2 0 106 -25 3 0 130 +25 1 0 51 +25 2 0 112 +25 3 0 120 25 4 0 104 -25 5 0 97 -25 6 0 493 -25 1 3 1 +25 5 0 102 +25 6 0 490 +25 1 3 0 25 2 3 0 25 3 3 0 25 4 3 0 25 5 3 1 -25 6 3 5 -25 1 5 4.1031 +25 6 3 0 +25 1 5 0 25 2 5 0 25 3 5 0 25 4 5 0 -25 5 5 4.84236 -25 6 5 25.7705 +25 5 5 6.44758 +25 6 5 0 25 1 11 0 25 2 11 0 25 3 11 0 @@ -1209,8 +1209,8 @@ 25 3 13 0 25 4 13 0 25 5 13 0 -25 6 13 1 -25 0 26 0.00686001 +25 6 13 0 +25 0 26 0.00491954 25 1 46 0 25 2 46 0 25 3 46 0 diff --git a/test/expected/outputRach5IC.txt b/test/expected/outputRach5IC.txt index 444fb8a9f..0d16c036b 100644 --- a/test/expected/outputRach5IC.txt +++ b/test/expected/outputRach5IC.txt @@ -1,21 +1,21 @@ -1 1 0 50 -1 2 0 107 -1 3 0 131 -1 4 0 101 -1 5 0 101 -1 6 0 489 +1 1 0 47 +1 2 0 117 +1 3 0 119 +1 4 0 107 +1 5 0 103 +1 6 0 486 1 1 3 0 -1 2 3 1 -1 3 3 1 -1 4 3 0 -1 5 3 5 -1 6 3 27 +1 2 3 2 +1 3 3 6 +1 4 3 2 +1 5 3 7 +1 6 3 19 1 1 5 0 -1 2 5 5.29321 -1 3 5 7.72131 -1 4 5 0 -1 5 5 31.4942 -1 6 5 153.891 +1 2 5 18.1571 +1 3 5 40.7811 +1 4 5 10.1085 +1 5 5 51.894 +1 6 5 100.969 1 1 11 0 1 2 11 0 1 3 11 0 @@ -34,7 +34,7 @@ 1 4 13 0 1 5 13 0 1 6 13 0 -1 0 26 0.0101426 +1 0 26 0.0120175 1 1 52 0 1 2 52 0 1 3 52 0 @@ -53,36 +53,36 @@ 1 4 61 0 1 5 61 0 1 6 61 0 -1 1 68 19.0411 -1 2 68 312.808 -1 3 68 974.932 -1 4 68 1275 -1 5 68 1753.92 -1 6 68 19286.3 +1 1 68 17.2329 +1 2 68 333.74 +1 3 68 912.986 +1 4 68 1329.26 +1 5 68 1794.88 +1 6 68 19235.2 2 1 0 49 -2 2 0 107 -2 3 0 130 -2 4 0 102 -2 5 0 103 -2 6 0 488 +2 2 0 115 +2 3 0 120 +2 4 0 107 +2 5 0 102 +2 6 0 486 2 1 3 0 2 2 3 2 2 3 3 4 -2 4 3 1 -2 5 3 3 -2 6 3 26 +2 4 3 3 +2 5 3 7 +2 6 3 22 2 1 5 0 -2 2 5 11.319 -2 3 5 36.1073 -2 4 5 7.87954 -2 5 5 22.006 -2 6 5 162.093 +2 2 5 17.0457 +2 3 5 31.7466 +2 4 5 16.6936 +2 5 5 48.2782 +2 6 5 130.616 2 1 11 0 2 2 11 0 -2 3 11 0 -2 4 11 1 -2 5 11 1 -2 6 11 0 +2 3 11 1 +2 4 11 0 +2 5 11 0 +2 6 11 2 2 1 12 0 2 2 12 0 2 3 12 0 @@ -95,7 +95,7 @@ 2 4 13 0 2 5 13 0 2 6 13 0 -2 0 26 0.0101426 +2 0 26 0.0120175 2 1 52 0 2 2 52 0 2 3 52 0 @@ -114,49 +114,49 @@ 2 4 61 0 2 5 61 0 2 6 61 0 -2 1 68 18.4658 -2 2 68 312.151 -2 3 68 963.822 -2 4 68 1281.96 -2 5 68 1790.92 -2 6 68 19247.8 -3 1 0 47 -3 2 0 105 -3 3 0 134 -3 4 0 100 +2 1 68 18.7671 +2 2 68 327.685 +2 3 68 916.137 +2 4 68 1326.55 +2 5 68 1771.93 +2 6 68 19249.1 +3 1 0 48 +3 2 0 116 +3 3 0 120 +3 4 0 107 3 5 0 104 -3 6 0 489 +3 6 0 484 3 1 3 0 3 2 3 2 -3 3 3 5 -3 4 3 2 -3 5 3 5 -3 6 3 25 +3 3 3 2 +3 4 3 3 +3 5 3 6 +3 6 3 32 3 1 5 0 -3 2 5 9.29049 -3 3 5 32.0217 -3 4 5 13.2797 -3 5 5 32.621 -3 6 5 148.393 +3 2 5 14.3643 +3 3 5 22.3076 +3 4 5 13.9011 +3 5 5 37.8311 +3 6 5 193.992 3 1 11 0 -3 2 11 0 -3 3 11 1 -3 4 11 1 -3 5 11 1 -3 6 11 2 +3 2 11 2 +3 3 11 2 +3 4 11 0 +3 5 11 2 +3 6 11 4 3 1 12 0 3 2 12 0 3 3 12 0 3 4 12 0 3 5 12 0 -3 6 12 0 +3 6 12 1 3 1 13 0 3 2 13 0 3 3 13 0 3 4 13 0 -3 5 13 0 +3 5 13 2 3 6 13 0 -3 0 26 0.0101426 +3 0 26 0.0120175 3 1 52 0 3 2 52 0 3 3 52 0 @@ -175,49 +175,49 @@ 3 4 61 0 3 5 61 0 3 6 61 0 -3 1 68 16.1781 -3 2 68 300.658 -3 3 68 994.712 -3 4 68 1260.19 -3 5 68 1809.52 -3 6 68 19307.9 -4 1 0 50 -4 2 0 104 -4 3 0 132 -4 4 0 98 -4 5 0 106 -4 6 0 489 +3 1 68 18.2877 +3 2 68 330.137 +3 3 68 915.959 +3 4 68 1325.37 +3 5 68 1810.41 +3 6 68 19195.4 +4 1 0 48 +4 2 0 117 +4 3 0 120 +4 4 0 107 +4 5 0 105 +4 6 0 482 4 1 3 0 -4 2 3 0 -4 3 3 7 -4 4 3 5 -4 5 3 5 -4 6 3 28 +4 2 3 4 +4 3 3 2 +4 4 3 2 +4 5 3 8 +4 6 3 26 4 1 5 0 -4 2 5 0 -4 3 5 52.52 -4 4 5 30.167 -4 5 5 37.7186 -4 6 5 174.294 +4 2 5 32.7542 +4 3 5 16.7325 +4 4 5 10.6882 +4 5 5 46.2229 +4 6 5 160.557 4 1 11 0 -4 2 11 0 -4 3 11 1 -4 4 11 1 -4 5 11 1 -4 6 11 4 +4 2 11 1 +4 3 11 0 +4 4 11 0 +4 5 11 0 +4 6 11 3 4 1 12 0 4 2 12 0 4 3 12 0 4 4 12 0 -4 5 12 0 +4 5 12 1 4 6 12 0 4 1 13 0 -4 2 13 1 +4 2 13 0 4 3 13 0 -4 4 13 0 +4 4 13 1 4 5 13 0 4 6 13 0 -4 0 26 0.0101426 +4 0 26 0.0120175 4 1 52 0 4 2 52 0 4 3 52 0 @@ -236,36 +236,36 @@ 4 4 61 0 4 5 61 0 4 6 61 0 -4 1 68 18.4658 -4 2 68 301.904 -4 3 68 980.644 -4 4 68 1225.22 -4 5 68 1843.15 -4 6 68 19295.7 +4 1 68 17.4795 +4 2 68 336.74 +4 3 68 920.808 +4 4 68 1329.16 +4 5 68 1834.01 +4 6 68 19141.2 5 1 0 48 -5 2 0 105 -5 3 0 131 -5 4 0 99 -5 5 0 108 -5 6 0 488 +5 2 0 115 +5 3 0 119 +5 4 0 110 +5 5 0 107 +5 6 0 480 5 1 3 0 -5 2 3 0 -5 3 3 7 -5 4 3 4 -5 5 3 8 -5 6 3 29 +5 2 3 5 +5 3 3 3 +5 4 3 3 +5 5 3 7 +5 6 3 28 5 1 5 0 -5 2 5 0 -5 3 5 60.1141 -5 4 5 25.2993 -5 5 5 45.5345 -5 6 5 181.988 +5 2 5 32.9499 +5 3 5 26.8381 +5 4 5 26.3564 +5 5 5 36.0389 +5 6 5 183.708 5 1 11 0 5 2 11 0 -5 3 11 1 +5 3 11 0 5 4 11 1 5 5 11 0 -5 6 11 2 +5 6 11 0 5 1 12 0 5 2 12 0 5 3 12 0 @@ -276,57 +276,57 @@ 5 2 13 0 5 3 13 0 5 4 13 0 -5 5 13 0 +5 5 13 1 5 6 13 0 -5 0 26 0.0101426 +5 0 26 0.0120175 5 1 52 0 5 2 52 0 5 3 52 0 5 4 52 0 5 5 52 0 5 6 52 0 -5 1 56 14 -5 2 56 24 -5 3 56 49 -5 4 56 36 +5 1 56 15 +5 2 56 44 +5 3 56 48 +5 4 56 32 5 5 56 38 -5 6 56 172 +5 6 56 177 5 1 61 0 5 2 61 0 5 3 61 0 5 4 61 0 5 5 61 0 5 6 61 0 -5 1 68 17.2877 -5 2 68 303.507 -5 3 68 971.411 -5 4 68 1233.3 -5 5 68 1881.99 -5 6 68 19246.7 +5 1 68 17.0959 +5 2 68 327.986 +5 3 68 900.603 +5 4 68 1358.04 +5 5 68 1872.78 +5 6 68 19071.5 6 1 0 49 -6 2 0 107 -6 3 0 128 -6 4 0 102 -6 5 0 103 -6 6 0 490 +6 2 0 115 +6 3 0 116 +6 4 0 109 +6 5 0 109 +6 6 0 481 6 1 3 0 6 2 3 2 -6 3 3 5 -6 4 3 6 -6 5 3 7 -6 6 3 25 +6 3 3 3 +6 4 3 5 +6 5 3 6 +6 6 3 26 6 1 5 0 -6 2 5 11.3791 -6 3 5 42.9831 -6 4 5 35.2362 -6 5 5 44.0017 -6 6 5 155.519 +6 2 5 12.6074 +6 3 5 25.4993 +6 4 5 36.683 +6 5 5 27.4125 +6 6 5 171.402 6 1 11 0 -6 2 11 1 -6 3 11 0 -6 4 11 0 +6 2 11 0 +6 3 11 1 +6 4 11 1 6 5 11 0 -6 6 11 0 +6 6 11 2 6 1 12 0 6 2 12 0 6 3 12 0 @@ -339,55 +339,55 @@ 6 4 13 0 6 5 13 0 6 6 13 0 -6 0 26 0.0101426 +6 0 26 0.0120175 6 1 52 0 6 2 52 0 6 3 52 0 6 4 52 0 6 5 52 0 6 6 52 0 -6 1 56 16 -6 2 56 41 -6 3 56 48 -6 4 56 37 -6 5 56 33 -6 6 56 162 +6 1 56 21 +6 2 56 37 +6 3 56 35 +6 4 56 46 +6 5 56 37 +6 6 56 176 6 1 61 0 6 2 61 0 6 3 61 0 6 4 61 0 6 5 61 0 6 6 61 0 -6 1 68 18.274 -6 2 68 314.247 -6 3 68 951.986 -6 4 68 1271.63 -6 5 68 1805.18 -6 6 68 19326.9 -7 1 0 50 -7 2 0 108 -7 3 0 128 -7 4 0 103 -7 5 0 96 -7 6 0 494 +6 1 68 18.0137 +6 2 68 336.575 +6 3 68 880.233 +6 4 68 1337.04 +6 5 68 1901.64 +6 6 68 19064.7 +7 1 0 51 +7 2 0 111 +7 3 0 115 +7 4 0 109 +7 5 0 112 +7 6 0 481 7 1 3 0 -7 2 3 3 -7 3 3 3 -7 4 3 4 -7 5 3 4 -7 6 3 22 +7 2 3 2 +7 3 3 2 +7 4 3 3 +7 5 3 3 +7 6 3 24 7 1 5 0 -7 2 5 21.9657 -7 3 5 20.6491 -7 4 5 23.1017 -7 5 5 29.7304 -7 6 5 129.286 +7 2 5 10.3835 +7 3 5 15.7955 +7 4 5 25.1176 +7 5 5 12.8098 +7 6 5 158.864 7 1 11 0 -7 2 11 0 +7 2 11 1 7 3 11 0 -7 4 11 0 -7 5 11 1 -7 6 11 0 +7 4 11 1 +7 5 11 2 +7 6 11 2 7 1 12 0 7 2 12 0 7 3 12 0 @@ -400,13 +400,13 @@ 7 4 13 0 7 5 13 0 7 6 13 0 -7 0 26 0.0101426 +7 0 26 0.0120175 7 1 52 0 -7 2 52 3 -7 3 52 35 -7 4 52 23 -7 5 52 27 -7 6 52 68 +7 2 52 1 +7 3 52 20 +7 4 52 29 +7 5 52 16 +7 6 52 85 7 1 56 0 7 2 56 0 7 3 56 0 @@ -419,36 +419,36 @@ 7 4 61 0 7 5 61 0 7 6 61 0 -7 1 68 18.411 -7 2 68 316.151 -7 3 68 952.534 -7 4 68 1285.07 -7 5 68 1681.99 -7 6 68 19447.3 +7 1 68 19.3288 +7 2 68 327.904 +7 3 68 865.726 +7 4 68 1330.96 +7 5 68 1955.78 +7 6 68 19104.2 8 1 0 52 -8 2 0 106 -8 3 0 129 -8 4 0 103 -8 5 0 96 -8 6 0 493 +8 2 0 113 +8 3 0 114 +8 4 0 111 +8 5 0 110 +8 6 0 479 8 1 3 0 -8 2 3 2 -8 3 3 2 +8 2 3 0 +8 3 3 3 8 4 3 3 -8 5 3 5 -8 6 3 28 +8 5 3 6 +8 6 3 29 8 1 5 0 -8 2 5 9.67996 -8 3 5 15.7362 -8 4 5 16.3651 -8 5 5 40.115 -8 6 5 182.128 +8 2 5 0 +8 3 5 24.1794 +8 4 5 25.4652 +8 5 5 33.7952 +8 6 5 202.647 8 1 11 0 -8 2 11 1 +8 2 11 0 8 3 11 0 -8 4 11 0 -8 5 11 1 -8 6 11 5 +8 4 11 1 +8 5 11 0 +8 6 11 2 8 1 12 0 8 2 12 0 8 3 12 0 @@ -461,7 +461,7 @@ 8 4 13 0 8 5 13 0 8 6 13 0 -8 0 26 0.0101426 +8 0 26 0.0120175 8 1 52 0 8 2 52 0 8 3 52 0 @@ -480,39 +480,39 @@ 8 4 61 0 8 5 61 0 8 6 61 0 -8 1 68 20.6164 -8 2 68 310.904 -8 3 68 958.11 -8 4 68 1283.59 -8 5 68 1681.27 -8 6 68 19406.9 -9 1 0 52 -9 2 0 106 -9 3 0 129 -9 4 0 102 -9 5 0 97 -9 6 0 493 +8 1 68 19.8356 +8 2 68 335.068 +8 3 68 860.219 +8 4 68 1359.96 +8 5 68 1924.88 +8 6 68 19056.3 +9 1 0 53 +9 2 0 115 +9 3 0 111 +9 4 0 111 +9 5 0 111 +9 6 0 478 9 1 3 0 9 2 3 1 -9 3 3 6 -9 4 3 3 -9 5 3 4 -9 6 3 40 +9 3 3 3 +9 4 3 2 +9 5 3 5 +9 6 3 28 9 1 5 0 -9 2 5 4.97366 -9 3 5 35.4749 -9 4 5 17.3461 -9 5 5 28.9816 -9 6 5 237.026 +9 2 5 9.09956 +9 3 5 21.644 +9 4 5 15.9584 +9 5 5 29.7298 +9 6 5 189.427 9 1 11 0 9 2 11 0 -9 3 11 2 -9 4 11 2 +9 3 11 0 +9 4 11 1 9 5 11 1 -9 6 11 3 +9 6 11 2 9 1 12 0 9 2 12 0 -9 3 12 1 +9 3 12 0 9 4 12 0 9 5 12 0 9 6 12 0 @@ -522,7 +522,7 @@ 9 4 13 0 9 5 13 0 9 6 13 0 -9 0 26 0.0101426 +9 0 26 0.0120175 9 1 52 0 9 2 52 0 9 3 52 0 @@ -541,36 +541,36 @@ 9 4 61 0 9 5 61 0 9 6 61 0 -9 1 68 21.5616 -9 2 68 315.589 -9 3 68 963.74 -9 4 68 1272.04 -9 5 68 1699.16 -9 6 68 19416.8 -10 1 0 50 -10 2 0 107 -10 3 0 130 -10 4 0 102 -10 5 0 99 -10 6 0 491 +9 1 68 21.0959 +9 2 68 346.425 +9 3 68 839.438 +9 4 68 1354.12 +9 5 68 1938.95 +9 6 68 18998.7 +10 1 0 52 +10 2 0 115 +10 3 0 111 +10 4 0 113 +10 5 0 109 +10 6 0 479 10 1 3 0 10 2 3 1 -10 3 3 6 -10 4 3 3 -10 5 3 4 -10 6 3 39 +10 3 3 3 +10 4 3 1 +10 5 3 5 +10 6 3 22 10 1 5 0 -10 2 5 7.42359 -10 3 5 49.379 -10 4 5 20.3013 -10 5 5 23.7482 -10 6 5 235.948 +10 2 5 8.83594 +10 3 5 18.2226 +10 4 5 3.89448 +10 5 5 32.1042 +10 6 5 137.02 10 1 11 0 10 2 11 0 -10 3 11 0 +10 3 11 1 10 4 11 0 10 5 11 0 -10 6 11 4 +10 6 11 3 10 1 12 0 10 2 12 0 10 3 12 0 @@ -583,7 +583,7 @@ 10 4 13 0 10 5 13 0 10 6 13 0 -10 0 26 0.0101426 +10 0 26 0.0120175 10 1 52 0 10 2 52 0 10 3 52 0 @@ -602,36 +602,36 @@ 10 4 61 0 10 5 61 0 10 6 61 0 -10 1 68 19.9178 -10 2 68 313.329 -10 3 68 969.397 -10 4 68 1270.42 -10 5 68 1737.23 -10 6 68 19348.2 -11 1 0 47 -11 2 0 111 -11 3 0 128 -11 4 0 105 -11 5 0 98 -11 6 0 490 +10 1 68 21.0548 +10 2 68 347.849 +10 3 68 838.603 +10 4 68 1383.32 +10 5 68 1908 +10 6 68 19032 +11 1 0 52 +11 2 0 116 +11 3 0 111 +11 4 0 114 +11 5 0 109 +11 6 0 477 11 1 3 0 -11 2 3 0 -11 3 3 7 -11 4 3 3 -11 5 3 2 -11 6 3 33 +11 2 3 1 +11 3 3 1 +11 4 3 1 +11 5 3 4 +11 6 3 20 11 1 5 0 -11 2 5 0 -11 3 5 50.5021 -11 4 5 16.0643 -11 5 5 9.87379 -11 6 5 189.131 +11 2 5 9.45169 +11 3 5 5.72256 +11 4 5 5.81697 +11 5 5 24.1694 +11 6 5 117.026 11 1 11 0 -11 2 11 1 +11 2 11 0 11 3 11 0 11 4 11 0 11 5 11 0 -11 6 11 3 +11 6 11 0 11 1 12 0 11 2 12 0 11 3 12 0 @@ -644,7 +644,7 @@ 11 4 13 0 11 5 13 0 11 6 13 0 -11 0 26 0.0101426 +11 0 26 0.0120175 11 1 52 0 11 2 52 0 11 3 52 0 @@ -657,42 +657,42 @@ 11 4 56 0 11 5 56 0 11 6 56 0 -11 1 61 3 -11 2 61 18 -11 3 61 37 -11 4 61 31 -11 5 61 28 -11 6 61 117 -11 1 68 17.4247 -11 2 68 322.274 -11 3 68 955.014 -11 4 68 1308.93 -11 5 68 1725.33 -11 6 68 19275.4 -12 1 0 49 -12 2 0 107 -12 3 0 131 -12 4 0 104 -12 5 0 97 -12 6 0 491 +11 1 61 1 +11 2 61 25 +11 3 61 29 +11 4 61 17 +11 5 61 31 +11 6 61 111 +11 1 68 21.1644 +11 2 68 350.356 +11 3 68 837.712 +11 4 68 1397.7 +11 5 68 1911.96 +11 6 68 18942.6 +12 1 0 48 +12 2 0 118 +12 3 0 111 +12 4 0 113 +12 5 0 111 +12 6 0 478 12 1 3 0 -12 2 3 0 -12 3 3 4 -12 4 3 2 -12 5 3 1 -12 6 3 18 +12 2 3 1 +12 3 3 1 +12 4 3 0 +12 5 3 4 +12 6 3 15 12 1 5 0 -12 2 5 0 -12 3 5 29.8632 -12 4 5 9.48437 -12 5 5 6.62968 -12 6 5 109.49 +12 2 5 7.27127 +12 3 5 4.9989 +12 4 5 0 +12 5 5 22.2831 +12 6 5 82.4256 12 1 11 0 12 2 11 0 12 3 11 0 12 4 11 0 -12 5 11 0 -12 6 11 3 +12 5 11 1 +12 6 11 1 12 1 12 0 12 2 12 0 12 3 12 0 @@ -705,7 +705,7 @@ 12 4 13 0 12 5 13 0 12 6 13 0 -12 0 26 0.0101426 +12 0 26 0.0120175 12 1 52 0 12 2 52 0 12 3 52 0 @@ -718,36 +718,36 @@ 12 4 56 0 12 5 56 0 12 6 56 0 -12 1 61 4 -12 2 61 37 -12 3 61 41 -12 4 61 29 -12 5 61 26 -12 6 61 169 -12 1 68 18.5616 -12 2 68 315.192 -12 3 68 980.644 -12 4 68 1302.55 -12 5 68 1709.32 -12 6 68 19335.8 +12 1 61 7 +12 2 61 43 +12 3 61 34 +12 4 61 43 +12 5 61 30 +12 6 61 179 +12 1 68 17.5753 +12 2 68 353.945 +12 3 68 836.863 +12 4 68 1381.95 +12 5 68 1946.03 +12 6 68 19001.9 13 1 0 49 -13 2 0 108 -13 3 0 133 -13 4 0 100 -13 5 0 98 -13 6 0 491 +13 2 0 119 +13 3 0 110 +13 4 0 113 +13 5 0 110 +13 6 0 478 13 1 3 0 -13 2 3 0 -13 3 3 4 +13 2 3 1 +13 3 3 0 13 4 3 0 -13 5 3 1 -13 6 3 16 +13 5 3 3 +13 6 3 8 13 1 5 0 -13 2 5 0 -13 3 5 29.6553 +13 2 5 5.01388 +13 3 5 0 13 4 5 0 -13 5 5 5.20304 -13 6 5 93.199 +13 5 5 17.9211 +13 6 5 41.7193 13 1 11 0 13 2 11 0 13 3 11 0 @@ -766,7 +766,7 @@ 13 4 13 0 13 5 13 0 13 6 13 0 -13 0 26 0.0101426 +13 0 26 0.0120175 13 1 52 0 13 2 52 0 13 3 52 0 @@ -780,39 +780,39 @@ 13 5 56 0 13 6 56 0 13 1 61 3 -13 2 61 11 -13 3 61 18 -13 4 61 14 -13 5 61 12 -13 6 61 47 -13 1 68 18.3699 -13 2 68 317.055 -13 3 68 1001.52 -13 4 68 1250.85 -13 5 68 1719.9 -13 6 68 19376.1 +13 2 61 16 +13 3 61 11 +13 4 61 23 +13 5 61 14 +13 6 61 59 +13 1 68 17.1781 +13 2 68 362.233 +13 3 68 835.973 +13 4 68 1386.22 +13 5 68 1930.05 +13 6 68 18966.2 14 1 0 48 -14 2 0 110 -14 3 0 131 -14 4 0 102 -14 5 0 96 -14 6 0 492 +14 2 0 118 +14 3 0 109 +14 4 0 116 +14 5 0 107 +14 6 0 481 14 1 3 0 -14 2 3 0 -14 3 3 3 -14 4 3 0 -14 5 3 1 -14 6 3 16 +14 2 3 1 +14 3 3 2 +14 4 3 2 +14 5 3 3 +14 6 3 10 14 1 5 0 -14 2 5 0 -14 3 5 21.2988 -14 4 5 0 -14 5 5 5.04516 -14 6 5 98.449 +14 2 5 5.06608 +14 3 5 12.4726 +14 4 5 14.3067 +14 5 5 13.4009 +14 6 5 63.0246 14 1 11 0 14 2 11 0 14 3 11 0 -14 4 11 0 +14 4 11 1 14 5 11 0 14 6 11 0 14 1 12 0 @@ -827,7 +827,7 @@ 14 4 13 0 14 5 13 0 14 6 13 0 -14 0 26 0.00829693 +14 0 26 0.00893941 14 1 52 0 14 2 52 0 14 3 52 0 @@ -846,36 +846,36 @@ 14 4 61 0 14 5 61 0 14 6 61 0 -14 1 68 18.0274 -14 2 68 323.986 -14 3 68 987.37 -14 4 68 1274.19 -14 5 68 1683.53 -14 6 68 19435.5 -15 1 0 51 -15 2 0 109 -15 3 0 133 -15 4 0 99 -15 5 0 97 -15 6 0 490 +14 1 68 16.7123 +14 2 68 357.575 +14 3 68 820.425 +14 4 68 1425.66 +14 5 68 1878.96 +14 6 68 19065.6 +15 1 0 50 +15 2 0 119 +15 3 0 106 +15 4 0 116 +15 5 0 104 +15 6 0 484 15 1 3 0 -15 2 3 0 -15 3 3 2 -15 4 3 1 -15 5 3 3 -15 6 3 13 +15 2 3 1 +15 3 3 1 +15 4 3 3 +15 5 3 0 +15 6 3 9 15 1 5 0 -15 2 5 0 -15 3 5 11.8238 -15 4 5 6.84268 -15 5 5 24.2316 -15 6 5 77.6143 +15 2 5 4.6259 +15 3 5 6.01108 +15 4 5 20.7485 +15 5 5 0 +15 6 5 61.0603 15 1 11 0 15 2 11 0 15 3 11 0 15 4 11 0 15 5 11 0 -15 6 11 0 +15 6 11 2 15 1 12 0 15 2 12 0 15 3 12 0 @@ -888,7 +888,7 @@ 15 4 13 0 15 5 13 0 15 6 13 0 -15 0 26 0.00829693 +15 0 26 0.00893941 15 1 52 0 15 2 52 0 15 3 52 0 @@ -907,36 +907,36 @@ 15 4 61 0 15 5 61 0 15 6 61 0 -15 1 68 20.2877 -15 2 68 323.973 -15 3 68 1008.27 -15 4 68 1237.42 -15 5 68 1696.49 -15 6 68 19385.4 -16 1 0 49 -16 2 0 111 -16 3 0 133 -16 4 0 98 -16 5 0 97 -16 6 0 491 +15 1 68 17.7945 +15 2 68 364.288 +15 3 68 795.192 +15 4 68 1430.16 +15 5 68 1822.62 +15 6 68 19121.7 +16 1 0 51 +16 2 0 117 +16 3 0 105 +16 4 0 116 +16 5 0 106 +16 6 0 484 16 1 3 0 16 2 3 0 -16 3 3 3 -16 4 3 4 -16 5 3 3 -16 6 3 17 +16 3 3 1 +16 4 3 2 +16 5 3 1 +16 6 3 10 16 1 5 0 16 2 5 0 -16 3 5 19.1571 -16 4 5 23.5232 -16 5 5 27.781 -16 6 5 101.587 +16 3 5 4.49234 +16 4 5 17.5768 +16 5 5 6.01271 +16 6 5 63.5793 16 1 11 0 16 2 11 0 16 3 11 0 16 4 11 1 16 5 11 0 -16 6 11 2 +16 6 11 3 16 1 12 0 16 2 12 0 16 3 12 0 @@ -946,10 +946,10 @@ 16 1 13 0 16 2 13 0 16 3 13 0 -16 4 13 0 +16 4 13 1 16 5 13 0 16 6 13 0 -16 0 26 0.00829693 +16 0 26 0.00893941 16 1 52 0 16 2 52 0 16 3 52 0 @@ -968,36 +968,36 @@ 16 4 61 0 16 5 61 0 16 6 61 0 -16 1 68 18.6986 -16 2 68 326.973 -16 3 68 1009.26 -16 4 68 1220.45 -16 5 68 1689.52 -16 6 68 19385.3 -17 1 0 48 -17 2 0 110 -17 3 0 133 -17 4 0 100 -17 5 0 97 -17 6 0 491 +16 1 68 20.0137 +16 2 68 363.959 +16 3 68 783.877 +16 4 68 1429.26 +16 5 68 1861.27 +16 6 68 19161.5 +17 1 0 53 +17 2 0 115 +17 3 0 107 +17 4 0 112 +17 5 0 106 +17 6 0 486 17 1 3 0 -17 2 3 1 -17 3 3 2 -17 4 3 4 -17 5 3 2 +17 2 3 0 +17 3 3 0 +17 4 3 2 +17 5 3 0 17 6 3 14 17 1 5 0 -17 2 5 10.161 -17 3 5 8.20093 -17 4 5 21.9507 -17 5 5 18.7522 -17 6 5 79.1999 +17 2 5 0 +17 3 5 0 +17 4 5 18.5055 +17 5 5 0 +17 6 5 94.4319 17 1 11 0 17 2 11 0 17 3 11 0 -17 4 11 0 -17 5 11 1 -17 6 11 2 +17 4 11 1 +17 5 11 0 +17 6 11 1 17 1 12 0 17 2 12 0 17 3 12 0 @@ -1010,7 +1010,7 @@ 17 4 13 0 17 5 13 0 17 6 13 0 -17 0 26 0.00829693 +17 0 26 0.00893941 17 1 52 0 17 2 52 0 17 3 52 0 @@ -1029,36 +1029,36 @@ 17 4 61 0 17 5 61 0 17 6 61 0 -17 1 68 17.1507 -17 2 68 323 -17 3 68 1005.18 -17 4 68 1243.66 -17 5 68 1692.44 -17 6 68 19412 -18 1 0 47 -18 2 0 112 -18 3 0 134 -18 4 0 98 -18 5 0 97 -18 6 0 491 +17 1 68 21.411 +17 2 68 355.521 +17 3 68 792.603 +17 4 68 1385.96 +17 5 68 1859.9 +17 6 68 19241.4 +18 1 0 53 +18 2 0 115 +18 3 0 108 +18 4 0 113 +18 5 0 101 +18 6 0 489 18 1 3 0 -18 2 3 1 -18 3 3 2 -18 4 3 4 -18 5 3 2 -18 6 3 12 +18 2 3 0 +18 3 3 0 +18 4 3 1 +18 5 3 0 +18 6 3 13 18 1 5 0 -18 2 5 8.37398 -18 3 5 13.7287 -18 4 5 20.5356 -18 5 5 17.5127 -18 6 5 70.9341 +18 2 5 0 +18 3 5 0 +18 4 5 4.08286 +18 5 5 0 +18 6 5 85.4678 18 1 11 0 18 2 11 0 18 3 11 0 -18 4 11 0 -18 5 11 0 -18 6 11 0 +18 4 11 1 +18 5 11 1 +18 6 11 2 18 1 12 0 18 2 12 0 18 3 12 0 @@ -1068,10 +1068,10 @@ 18 1 13 0 18 2 13 0 18 3 13 0 -18 4 13 0 +18 4 13 1 18 5 13 0 18 6 13 0 -18 0 26 0.00829693 +18 0 26 0.00893941 18 1 52 0 18 2 52 0 18 3 52 0 @@ -1090,36 +1090,36 @@ 18 4 61 0 18 5 61 0 18 6 61 0 -18 1 68 16.6849 -18 2 68 330.137 -18 3 68 1021.19 -18 4 68 1221.82 -18 5 68 1690.34 -18 6 68 19424.5 -19 1 0 46 -19 2 0 110 -19 3 0 136 -19 4 0 98 -19 5 0 99 -19 6 0 490 +18 1 68 21.5205 +18 2 68 352.932 +18 3 68 796.466 +18 4 68 1404.29 +18 5 68 1772.51 +18 6 68 19273.8 +19 1 0 53 +19 2 0 117 +19 3 0 110 +19 4 0 111 +19 5 0 101 +19 6 0 487 19 1 3 0 -19 2 3 1 -19 3 3 2 +19 2 3 0 +19 3 3 0 19 4 3 3 19 5 3 2 -19 6 3 15 +19 6 3 13 19 1 5 0 -19 2 5 8.28312 -19 3 5 13.6971 -19 4 5 23.7806 -19 5 5 15.6811 -19 6 5 89.6821 +19 2 5 0 +19 3 5 0 +19 4 5 23.1659 +19 5 5 13.4464 +19 6 5 79.8073 19 1 11 0 19 2 11 0 19 3 11 0 19 4 11 0 -19 5 11 1 -19 6 11 1 +19 5 11 0 +19 6 11 0 19 1 12 0 19 2 12 0 19 3 12 0 @@ -1132,54 +1132,54 @@ 19 4 13 0 19 5 13 0 19 6 13 0 -19 0 26 0.00829693 +19 0 26 0.00893941 19 1 52 0 19 2 52 0 19 3 52 0 19 4 52 0 19 5 52 0 19 6 52 0 -19 1 56 11 -19 2 56 33 -19 3 56 44 -19 4 56 21 -19 5 56 22 -19 6 56 137 +19 1 56 12 +19 2 56 35 +19 3 56 31 +19 4 56 32 +19 5 56 37 +19 6 56 132 19 1 61 0 19 2 61 0 19 3 61 0 19 4 61 0 19 5 61 0 19 6 61 0 -19 1 68 15.9589 -19 2 68 321.11 -19 3 68 1032.3 -19 4 68 1219.9 -19 5 68 1728.41 -19 6 68 19429.5 -20 1 0 48 -20 2 0 108 -20 3 0 135 -20 4 0 100 -20 5 0 97 -20 6 0 491 +19 1 68 21.137 +19 2 68 356.479 +19 3 68 815.411 +19 4 68 1383.52 +19 5 68 1774.73 +19 6 68 19232.9 +20 1 0 53 +20 2 0 115 +20 3 0 112 +20 4 0 112 +20 5 0 100 +20 6 0 487 20 1 3 0 20 2 3 1 20 3 3 3 -20 4 3 3 +20 4 3 4 20 5 3 1 -20 6 3 17 +20 6 3 20 20 1 5 0 -20 2 5 5.58738 -20 3 5 20.4836 -20 4 5 18.9883 -20 5 5 6.85351 -20 6 5 107.226 +20 2 5 10.7694 +20 3 5 25.0648 +20 4 5 25.0409 +20 5 5 5.95543 +20 6 5 125.066 20 1 11 0 20 2 11 0 -20 3 11 0 -20 4 11 0 -20 5 11 0 +20 3 11 1 +20 4 11 1 +20 5 11 2 20 6 11 2 20 1 12 0 20 2 12 0 @@ -1193,79 +1193,79 @@ 20 4 13 0 20 5 13 0 20 6 13 0 -20 0 26 0.00829693 +20 0 26 0.00893941 20 1 52 0 20 2 52 0 20 3 52 0 20 4 52 0 20 5 52 0 20 6 52 0 -20 1 56 16 -20 2 56 32 -20 3 56 45 -20 4 56 41 -20 5 56 35 -20 6 56 177 +20 1 56 32 +20 2 56 40 +20 3 56 35 +20 4 56 43 +20 5 56 28 +20 6 56 180 20 1 61 0 20 2 61 0 20 3 61 0 20 4 61 0 20 5 61 0 20 6 61 0 -20 1 68 17.726 -20 2 68 319.904 -20 3 68 1023.4 -20 4 68 1243.1 -20 5 68 1691.45 -20 6 68 19433.9 -21 1 0 51 -21 2 0 105 -21 3 0 134 -21 4 0 102 -21 5 0 93 -21 6 0 494 -21 1 3 1 -21 2 3 2 -21 3 3 5 -21 4 3 6 -21 5 3 1 -21 6 3 22 -21 1 5 6.11222 -21 2 5 11.0543 -21 3 5 35.1706 -21 4 5 34.5013 -21 5 5 5.59512 -21 6 5 134.678 +20 1 68 22.4521 +20 2 68 352.082 +20 3 68 829.521 +20 4 68 1402.67 +20 5 68 1763.01 +20 6 68 19240.5 +21 1 0 50 +21 2 0 117 +21 3 0 115 +21 4 0 110 +21 5 0 103 +21 6 0 484 +21 1 3 0 +21 2 3 0 +21 3 3 2 +21 4 3 4 +21 5 3 3 +21 6 3 16 +21 1 5 0 +21 2 5 0 +21 3 5 17.4669 +21 4 5 25.2742 +21 5 5 18.4498 +21 6 5 99.0028 21 1 11 0 21 2 11 0 21 3 11 0 -21 4 11 0 +21 4 11 1 21 5 11 0 -21 6 11 5 +21 6 11 1 21 1 12 0 21 2 12 0 21 3 12 0 21 4 12 0 21 5 12 0 -21 6 12 1 +21 6 12 0 21 1 13 0 21 2 13 0 -21 3 13 1 +21 3 13 0 21 4 13 0 21 5 13 0 21 6 13 0 -21 0 26 0.00829693 +21 0 26 0.00893941 21 1 52 0 21 2 52 0 21 3 52 0 21 4 52 0 21 5 52 0 21 6 52 0 -21 1 56 3 -21 2 56 8 +21 1 56 1 +21 2 56 6 21 3 56 4 -21 4 56 9 -21 5 56 3 +21 4 56 7 +21 5 56 2 21 6 56 23 21 1 61 0 21 2 61 0 @@ -1273,36 +1273,36 @@ 21 4 61 0 21 5 61 0 21 6 61 0 -21 1 68 19.8767 -21 2 68 318.205 -21 3 68 1019.51 -21 4 68 1271.38 -21 5 68 1619.23 -21 6 68 19468 -22 1 0 52 -22 2 0 101 -22 3 0 135 -22 4 0 103 -22 5 0 92 -22 6 0 496 -22 1 3 1 +21 1 68 19.0137 +21 2 68 347.671 +21 3 68 848.795 +21 4 68 1376.81 +21 5 68 1816.38 +21 6 68 19146.9 +22 1 0 47 +22 2 0 120 +22 3 0 113 +22 4 0 111 +22 5 0 104 +22 6 0 484 +22 1 3 0 22 2 3 1 -22 3 3 6 -22 4 3 3 +22 3 3 3 +22 4 3 2 22 5 3 2 -22 6 3 19 -22 1 5 5.84313 -22 2 5 5.62363 -22 3 5 39.6324 -22 4 5 15.5435 -22 5 5 13.3116 -22 6 5 108.312 +22 6 3 13 +22 1 5 0 +22 2 5 3.84059 +22 3 5 19.9998 +22 4 5 12.1835 +22 5 5 8.21236 +22 6 5 74.7425 22 1 11 0 -22 2 11 0 -22 3 11 0 -22 4 11 2 -22 5 11 1 -22 6 11 4 +22 2 11 1 +22 3 11 1 +22 4 11 1 +22 5 11 2 +22 6 11 0 22 1 12 0 22 2 12 0 22 3 12 0 @@ -1312,10 +1312,10 @@ 22 1 13 0 22 2 13 0 22 3 13 0 -22 4 13 0 +22 4 13 1 22 5 13 0 22 6 13 0 -22 0 26 0.00829693 +22 0 26 0.00893941 22 1 52 0 22 2 52 0 22 3 52 0 @@ -1334,36 +1334,36 @@ 22 4 61 0 22 5 61 0 22 6 61 0 -22 1 68 20.4247 -22 2 68 297.137 -22 3 68 1020.62 -22 4 68 1279.78 -22 5 68 1596.85 -22 6 68 19533 -23 1 0 52 -23 2 0 100 -23 3 0 134 -23 4 0 106 -23 5 0 93 -23 6 0 494 -23 1 3 1 -23 2 3 1 -23 3 3 4 -23 4 3 1 -23 5 3 3 -23 6 3 15 -23 1 5 4.40612 -23 2 5 5.98418 -23 3 5 30.7787 -23 4 5 4.29976 -23 5 5 26.1439 -23 6 5 86.84 +22 1 68 16.863 +22 2 68 360.466 +22 3 68 838.178 +22 4 68 1390.85 +22 5 68 1839.92 +22 6 68 19186.7 +23 1 0 48 +23 2 0 121 +23 3 0 113 +23 4 0 110 +23 5 0 104 +23 6 0 483 +23 1 3 0 +23 2 3 0 +23 3 3 2 +23 4 3 0 +23 5 3 1 +23 6 3 9 +23 1 5 0 +23 2 5 0 +23 3 5 14.5113 +23 4 5 0 +23 5 5 4.30445 +23 6 5 48.8943 23 1 11 0 23 2 11 0 23 3 11 0 -23 4 11 2 +23 4 11 0 23 5 11 0 -23 6 11 2 +23 6 11 0 23 1 12 0 23 2 12 0 23 3 12 0 @@ -1376,7 +1376,7 @@ 23 4 13 0 23 5 13 0 23 6 13 0 -23 0 26 0.00829693 +23 0 26 0.00893941 23 1 52 0 23 2 52 0 23 3 52 0 @@ -1395,33 +1395,33 @@ 23 4 61 0 23 5 61 0 23 6 61 0 -23 1 68 20.5342 -23 2 68 288.479 -23 3 68 1006.59 -23 4 68 1313.42 -23 5 68 1619.47 -23 6 68 19501.8 -24 1 0 52 -24 2 0 101 -24 3 0 133 -24 4 0 105 -24 5 0 95 -24 6 0 493 -24 1 3 1 -24 2 3 1 -24 3 3 1 +23 1 68 16.9589 +23 2 68 367.356 +23 3 68 842.493 +23 4 68 1379.93 +23 5 68 1838.41 +23 6 68 19129.1 +24 1 0 48 +24 2 0 121 +24 3 0 110 +24 4 0 113 +24 5 0 104 +24 6 0 483 +24 1 3 0 +24 2 3 0 +24 3 3 2 24 4 3 0 -24 5 3 3 -24 6 3 9 -24 1 5 4.02969 -24 2 5 4.72618 -24 3 5 5.54798 +24 5 3 0 +24 6 3 6 +24 1 5 0 +24 2 5 0 +24 3 5 9.05637 24 4 5 0 -24 5 5 25.9441 -24 6 5 57.1626 +24 5 5 0 +24 6 5 29.1136 24 1 11 0 24 2 11 0 -24 3 11 1 +24 3 11 0 24 4 11 0 24 5 11 0 24 6 11 0 @@ -1437,7 +1437,7 @@ 24 4 13 0 24 5 13 0 24 6 13 0 -24 0 26 0.00829693 +24 0 26 0.00893941 24 1 52 0 24 2 52 0 24 3 52 0 @@ -1456,36 +1456,36 @@ 24 4 61 0 24 5 61 0 24 6 61 0 -24 1 68 21.4795 -24 2 68 293.699 -24 3 68 1002.62 -24 4 68 1297.08 -24 5 68 1652.21 -24 6 68 19465.1 +24 1 68 17.3562 +24 2 68 373.096 +24 3 68 816.644 +24 4 68 1414.12 +24 5 68 1841.92 +24 6 68 19124.5 25 1 0 49 -25 2 0 106 -25 3 0 130 -25 4 0 104 -25 5 0 97 -25 6 0 493 -25 1 3 1 -25 2 3 1 -25 3 3 0 -25 4 3 0 -25 5 3 4 -25 6 3 7 -25 1 5 4.1031 -25 2 5 5.51702 -25 3 5 0 -25 4 5 0 -25 5 5 27.206 -25 6 5 45.3571 +25 2 0 117 +25 3 0 113 +25 4 0 109 +25 5 0 106 +25 6 0 485 +25 1 3 0 +25 2 3 0 +25 3 3 1 +25 4 3 1 +25 5 3 0 +25 6 3 3 +25 1 5 0 +25 2 5 0 +25 3 5 4.45123 +25 4 5 4.15492 +25 5 5 0 +25 6 5 16.1263 25 1 11 0 25 2 11 0 25 3 11 0 25 4 11 0 25 5 11 0 -25 6 11 0 +25 6 11 2 25 1 12 0 25 2 12 0 25 3 12 0 @@ -1497,8 +1497,8 @@ 25 3 13 0 25 4 13 0 25 5 13 0 -25 6 13 1 -25 0 26 0.00829693 +25 6 13 0 +25 0 26 0.00893941 25 1 52 0 25 2 52 0 25 3 52 0 @@ -1512,14 +1512,14 @@ 25 5 56 0 25 6 56 0 25 1 61 3 -25 2 61 23 -25 3 61 25 -25 4 61 5 -25 5 61 14 +25 2 61 19 +25 3 61 19 +25 4 61 19 +25 5 61 30 25 6 61 86 -25 1 68 18.9041 -25 2 68 307.219 -25 3 68 986.589 -25 4 68 1280.67 -25 5 68 1685.15 -25 6 68 19468.6 +25 1 68 18.2329 +25 2 68 362.274 +25 3 68 835.822 +25 4 68 1361.71 +25 5 68 1870.63 +25 6 68 19204.2