From c8d0a87451a3b2935f5d61bc702c3b7d054719da Mon Sep 17 00:00:00 2001 From: Dariusz Murakowski Date: Fri, 11 Apr 2014 17:48:03 -0400 Subject: [PATCH] Update unit tests. Add new one with simple two-site parameters. --- test/importState.test.expected-dat | 404 ++++++++++++++++++------------------- test/newFormat.test.expected-dat | 374 +++++++++++++++++----------------- test/simple2site.test | 3 + test/simple2site.test.expected-dat | 20 ++ test/simple2site.test.expected-err | 0 test/simple2site.test.expected-out | 35 ++++ test/simple2site.test.expected-sum | 2 + test/test1_01-00.test.expected-dat | 312 ++++++++++++++-------------- test/test1_01-01.test.expected-dat | 314 ++++++++++++++-------------- test/test1_01-10.test.expected-dat | 356 ++++++++++++++++---------------- test/test1_01-11.test.expected-dat | 314 ++++++++++++++-------------- test/test1_10-00.test.expected-dat | 402 ++++++++++++++++++------------------ test/test1_10-01.test.expected-dat | 372 +++++++++++++++++----------------- test/test1_10-10.test.expected-dat | 390 ++++++++++++++++++----------------- test/test1_10-11.test.expected-dat | 372 +++++++++++++++++----------------- test/test1_11-00.test.expected-dat | 404 ++++++++++++++++++------------------- test/test1_11-01.test.expected-dat | 374 +++++++++++++++++----------------- test/test1_11-10.test.expected-dat | 382 +++++++++++++++++------------------ test/test1_11-11.test.expected-dat | 374 +++++++++++++++++----------------- test/verbose.test.expected-dat | 404 ++++++++++++++++++------------------- 20 files changed, 2789 insertions(+), 2819 deletions(-) create mode 100755 test/simple2site.test create mode 100644 test/simple2site.test.expected-dat create mode 100644 test/simple2site.test.expected-err create mode 100644 test/simple2site.test.expected-out create mode 100644 test/simple2site.test.expected-sum diff --git a/test/importState.test.expected-dat b/test/importState.test.expected-dat index ee88d0f..f837b74 100644 --- a/test/importState.test.expected-dat +++ b/test/importState.test.expected-dat @@ -1,205 +1,199 @@ -1 -1 2 5.388530e+01 1 30 57 60 74 78 90 -1 4 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.162988e+01 13 30 57 60 74 78 90 -1 5 5.001102e+01 14 30 57 60 74 78 90 -1 7 4.489658e+01 24 30 57 60 74 78 90 -1 10 4.480868e+01 25 30 57 60 74 78 90 -1 18 4.697990e+01 26 30 57 60 74 78 90 -1 12 4.721079e+01 27 30 57 60 74 78 90 -1 7 4.710177e+01 28 30 57 60 74 78 90 -1 17 4.303401e+01 29 30 57 60 74 78 90 -1 5 4.636270e+01 30 31 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 2 5.106816e+01 30 34 57 60 74 78 90 -1 7 5.100229e+01 30 35 57 60 74 78 90 -1 8 4.884998e+01 30 36 57 60 74 78 90 -1 2 5.093938e+01 30 44 57 60 74 78 90 -1 1 4.959263e+01 30 57 59 60 74 78 90 -1 2 4.992432e+01 30 57 60 62 74 78 90 -1 7 4.955427e+01 30 57 60 66 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 5 5.035831e+01 30 57 60 70 74 78 90 -1 5 5.103031e+01 30 57 60 71 74 78 90 -1 11 3.946418e+01 30 57 60 74 78 -1 99800 4.898003e+01 30 57 60 74 78 90 -1 3 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 14 4.330013e+01 30 57 74 78 90 -1 6 4.235476e+01 30 60 74 78 90 -1 8 3.101881e+01 57 60 74 78 90 -2 -2 6 5.009987e+01 11 30 57 60 74 78 90 -2 9 4.846652e+01 12 30 57 60 74 78 90 -2 6 5.001102e+01 14 30 57 60 74 78 90 -2 30 4.489658e+01 24 30 57 60 74 78 90 -2 31 4.480868e+01 25 30 57 60 74 78 90 -2 30 4.697990e+01 26 30 57 60 74 78 90 -2 30 4.721079e+01 27 30 57 60 74 78 90 -2 25 4.710177e+01 28 30 57 60 74 78 90 -2 48 4.303401e+01 29 30 57 60 74 78 90 -2 33 4.636270e+01 30 31 57 60 74 78 90 -2 23 4.199699e+01 30 32 57 60 74 78 90 -2 3 5.106816e+01 30 34 57 60 74 78 90 -2 4 5.100229e+01 30 35 57 60 74 78 90 -2 16 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.225090e+01 30 37 57 60 74 78 90 -2 2 5.092417e+01 30 40 57 60 74 78 90 -2 2 5.102157e+01 30 56 57 60 74 78 90 -2 13 4.959263e+01 30 57 59 60 74 78 90 -2 7 4.992432e+01 30 57 60 62 74 78 90 -2 3 5.046417e+01 30 57 60 63 74 78 90 -2 9 4.955427e+01 30 57 60 66 74 78 90 -2 2 5.131319e+01 30 57 60 68 74 78 90 -2 6 5.035831e+01 30 57 60 70 74 78 90 -2 3 5.103031e+01 30 57 60 71 74 78 90 -2 3 4.949353e+01 30 57 60 74 76 78 90 -2 37 3.946418e+01 30 57 60 74 78 -2 99457 4.898003e+01 30 57 60 74 78 90 -2 9 4.924109e+01 30 57 60 74 78 90 91 -2 27 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 46 4.330013e+01 30 57 74 78 90 -2 17 4.235476e+01 30 60 74 78 90 -2 31 3.101881e+01 57 60 74 78 90 -3 -3 3 4.520192e+01 0 30 57 60 74 78 -3 11 5.009987e+01 11 30 57 60 74 78 90 -3 27 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.001102e+01 14 30 57 60 74 78 90 -3 61 4.489658e+01 24 30 57 60 74 78 90 -3 73 4.480868e+01 25 30 57 60 74 78 90 -3 62 4.697990e+01 26 30 57 60 74 78 90 -3 75 4.721079e+01 27 30 57 60 74 78 90 -3 50 4.710177e+01 28 30 57 60 74 78 90 -3 103 4.303401e+01 29 30 57 60 74 78 90 -3 78 4.636270e+01 30 31 57 60 74 78 90 -3 58 4.199699e+01 30 32 57 60 74 78 90 -3 3 5.106816e+01 30 34 57 60 74 78 90 -3 27 4.884998e+01 30 36 57 60 74 78 90 -3 1 5.093938e+01 30 44 57 60 74 78 90 -3 16 4.959263e+01 30 57 59 60 74 78 90 -3 1 5.093039e+01 30 57 60 61 74 78 90 -3 3 4.992432e+01 30 57 60 62 74 78 90 -3 6 5.046417e+01 30 57 60 63 74 78 90 -3 1 4.955427e+01 30 57 60 66 74 78 90 -3 3 5.049801e+01 30 57 60 69 74 78 90 -3 1 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.103031e+01 30 57 60 71 74 78 90 -3 14 4.949353e+01 30 57 60 74 76 78 90 -3 94 3.946418e+01 30 57 60 74 78 -3 98854 4.898003e+01 30 57 60 74 78 90 -3 17 4.924109e+01 30 57 60 74 78 90 91 -3 4 5.010340e+01 30 57 60 74 78 90 92 -3 69 4.293612e+01 30 57 60 74 90 -3 62 4.027826e+01 30 57 60 78 90 -3 98 4.330013e+01 30 57 74 78 90 -3 39 4.235476e+01 30 60 74 78 90 -3 83 3.101881e+01 57 60 74 78 90 -1 -1 2 5.326373e+01 3 30 57 60 74 78 90 -1 1 5.009987e+01 11 30 57 60 74 78 90 -1 6 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.001102e+01 14 30 57 60 74 78 90 -1 4 5.209925e+01 18 30 57 60 74 78 90 -1 22 4.489658e+01 24 30 57 60 74 78 90 -1 8 4.480868e+01 25 30 57 60 74 78 90 -1 4 4.697990e+01 26 30 57 60 74 78 90 -1 12 4.721079e+01 27 30 57 60 74 78 90 -1 9 4.710177e+01 28 30 57 60 74 78 90 -1 4 4.303401e+01 29 30 57 60 74 78 90 -1 14 4.636270e+01 30 31 57 60 74 78 90 -1 15 4.199699e+01 30 32 57 60 74 78 90 -1 1 5.106816e+01 30 34 57 60 74 78 90 -1 2 5.100229e+01 30 35 57 60 74 78 90 -1 14 4.884998e+01 30 36 57 60 74 78 90 -1 3 4.959263e+01 30 57 59 60 74 78 90 -1 3 5.093039e+01 30 57 60 61 74 78 90 -1 16 4.992432e+01 30 57 60 62 74 78 90 -1 1 5.046417e+01 30 57 60 63 74 78 90 -1 3 5.365774e+01 30 57 60 65 74 78 90 -1 6 5.049801e+01 30 57 60 69 74 78 90 -1 4 4.949353e+01 30 57 60 74 76 78 90 -1 16 3.946418e+01 30 57 60 74 78 -1 99755 4.898003e+01 30 57 60 74 78 90 -1 8 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 1 5.331382e+01 30 57 60 74 78 90 97 -1 14 4.293612e+01 30 57 60 74 90 -1 10 4.027826e+01 30 57 60 78 90 -1 13 4.330013e+01 30 57 74 78 90 -1 16 4.235476e+01 30 60 74 78 90 -1 9 3.101881e+01 57 60 74 78 90 -2 -2 9 4.846652e+01 12 30 57 60 74 78 90 -2 1 5.001102e+01 14 30 57 60 74 78 90 -2 1 5.209925e+01 18 30 57 60 74 78 90 -2 57 4.489658e+01 24 30 57 60 74 78 90 -2 22 4.480868e+01 25 30 57 60 74 78 90 -2 12 4.697990e+01 26 30 57 60 74 78 90 -2 25 4.721079e+01 27 30 57 60 74 78 90 -2 25 4.710177e+01 28 30 57 60 74 78 90 -2 19 4.303401e+01 29 30 57 60 74 78 90 -2 26 4.636270e+01 30 31 57 60 74 78 90 -2 39 4.199699e+01 30 32 57 60 74 78 90 -2 12 5.100229e+01 30 35 57 60 74 78 90 -2 22 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.092417e+01 30 40 57 60 74 78 90 -2 2 5.550344e+01 30 42 57 60 74 78 90 -2 6 4.959263e+01 30 57 59 60 74 78 90 -2 19 4.992432e+01 30 57 60 62 74 78 90 -2 1 5.046417e+01 30 57 60 63 74 78 90 -2 2 4.955427e+01 30 57 60 66 74 78 90 -2 4 5.131319e+01 30 57 60 68 74 78 90 -2 4 5.049801e+01 30 57 60 69 74 78 90 -2 1 5.035831e+01 30 57 60 70 74 78 90 -2 7 4.949353e+01 30 57 60 74 76 78 90 -2 45 3.946418e+01 30 57 60 74 78 -2 99429 4.898003e+01 30 57 60 74 78 90 -2 20 4.924109e+01 30 57 60 74 78 90 91 -2 2 5.010340e+01 30 57 60 74 78 90 92 -2 2 5.172090e+01 30 57 60 74 78 90 98 -2 37 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 41 4.330013e+01 30 57 74 78 90 -2 47 4.235476e+01 30 60 74 78 90 -2 29 3.101881e+01 57 60 74 78 90 -3 -3 4 5.009987e+01 11 30 57 60 74 78 90 -3 21 4.846652e+01 12 30 57 60 74 78 90 -3 3 5.162988e+01 13 30 57 60 74 78 90 -3 6 5.001102e+01 14 30 57 60 74 78 90 -3 6 5.209925e+01 18 30 57 60 74 78 90 -3 3 5.408172e+01 22 30 57 60 74 78 90 -3 129 4.489658e+01 24 30 57 60 74 78 90 -3 63 4.480868e+01 25 30 57 60 74 78 90 -3 30 4.697990e+01 26 30 57 60 74 78 90 -3 46 4.721079e+01 27 30 57 60 74 78 90 -3 45 4.710177e+01 28 30 57 60 74 78 90 -3 39 4.303401e+01 29 30 57 60 74 78 90 -3 54 4.636270e+01 30 31 57 60 74 78 90 -3 96 4.199699e+01 30 32 57 60 74 78 90 -3 4 5.106816e+01 30 34 57 60 74 78 90 -3 3 5.100229e+01 30 35 57 60 74 78 90 -3 22 4.884998e+01 30 36 57 60 74 78 90 -3 2 5.271108e+01 30 38 57 60 74 78 90 -3 7 5.102157e+01 30 56 57 60 74 78 90 -3 8 4.959263e+01 30 57 59 60 74 78 90 -3 2 5.093039e+01 30 57 60 61 74 78 90 -3 12 4.992432e+01 30 57 60 62 74 78 90 -3 4 5.046417e+01 30 57 60 63 74 78 90 -3 5 4.955427e+01 30 57 60 66 74 78 90 -3 6 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.313605e+01 30 57 60 73 74 78 90 -3 3 4.949353e+01 30 57 60 74 76 78 90 -3 119 3.946418e+01 30 57 60 74 78 -3 2 5.301417e+01 30 57 60 74 78 87 90 -3 98782 4.898003e+01 30 57 60 74 78 90 -3 19 4.924109e+01 30 57 60 74 78 90 91 -3 78 4.293612e+01 30 57 60 74 90 -3 89 4.027826e+01 30 57 60 78 90 -3 90 4.330013e+01 30 57 74 78 90 -3 118 4.235476e+01 30 60 74 78 90 -3 78 3.101881e+01 57 60 74 78 90 +1 2 5.388530e+01 1,30,57,60,74,78,90 +1 4 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.162988e+01 13,30,57,60,74,78,90 +1 5 5.001102e+01 14,30,57,60,74,78,90 +1 7 4.489658e+01 24,30,57,60,74,78,90 +1 10 4.480868e+01 25,30,57,60,74,78,90 +1 18 4.697990e+01 26,30,57,60,74,78,90 +1 12 4.721079e+01 27,30,57,60,74,78,90 +1 7 4.710177e+01 28,30,57,60,74,78,90 +1 17 4.303401e+01 29,30,57,60,74,78,90 +1 5 4.636270e+01 30,31,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 2 5.106816e+01 30,34,57,60,74,78,90 +1 7 5.100229e+01 30,35,57,60,74,78,90 +1 8 4.884998e+01 30,36,57,60,74,78,90 +1 2 5.093938e+01 30,44,57,60,74,78,90 +1 1 4.959263e+01 30,57,59,60,74,78,90 +1 2 4.992432e+01 30,57,60,62,74,78,90 +1 7 4.955427e+01 30,57,60,66,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 5 5.035831e+01 30,57,60,70,74,78,90 +1 5 5.103031e+01 30,57,60,71,74,78,90 +1 11 3.946418e+01 30,57,60,74,78 +1 99800 4.898003e+01 30,57,60,74,78,90 +1 3 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 14 4.330013e+01 30,57,74,78,90 +1 6 4.235476e+01 30,60,74,78,90 +1 8 3.101881e+01 57,60,74,78,90 +2 6 5.009987e+01 11,30,57,60,74,78,90 +2 9 4.846652e+01 12,30,57,60,74,78,90 +2 6 5.001102e+01 14,30,57,60,74,78,90 +2 30 4.489658e+01 24,30,57,60,74,78,90 +2 31 4.480868e+01 25,30,57,60,74,78,90 +2 30 4.697990e+01 26,30,57,60,74,78,90 +2 30 4.721079e+01 27,30,57,60,74,78,90 +2 25 4.710177e+01 28,30,57,60,74,78,90 +2 48 4.303401e+01 29,30,57,60,74,78,90 +2 33 4.636270e+01 30,31,57,60,74,78,90 +2 23 4.199699e+01 30,32,57,60,74,78,90 +2 3 5.106816e+01 30,34,57,60,74,78,90 +2 4 5.100229e+01 30,35,57,60,74,78,90 +2 16 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.225090e+01 30,37,57,60,74,78,90 +2 2 5.092417e+01 30,40,57,60,74,78,90 +2 2 5.102157e+01 30,56,57,60,74,78,90 +2 13 4.959263e+01 30,57,59,60,74,78,90 +2 7 4.992432e+01 30,57,60,62,74,78,90 +2 3 5.046417e+01 30,57,60,63,74,78,90 +2 9 4.955427e+01 30,57,60,66,74,78,90 +2 2 5.131319e+01 30,57,60,68,74,78,90 +2 6 5.035831e+01 30,57,60,70,74,78,90 +2 3 5.103031e+01 30,57,60,71,74,78,90 +2 3 4.949353e+01 30,57,60,74,76,78,90 +2 37 3.946418e+01 30,57,60,74,78 +2 99457 4.898003e+01 30,57,60,74,78,90 +2 9 4.924109e+01 30,57,60,74,78,90,91 +2 27 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 46 4.330013e+01 30,57,74,78,90 +2 17 4.235476e+01 30,60,74,78,90 +2 31 3.101881e+01 57,60,74,78,90 +3 3 4.520192e+01 0,30,57,60,74,78 +3 11 5.009987e+01 11,30,57,60,74,78,90 +3 27 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.001102e+01 14,30,57,60,74,78,90 +3 61 4.489658e+01 24,30,57,60,74,78,90 +3 73 4.480868e+01 25,30,57,60,74,78,90 +3 62 4.697990e+01 26,30,57,60,74,78,90 +3 75 4.721079e+01 27,30,57,60,74,78,90 +3 50 4.710177e+01 28,30,57,60,74,78,90 +3 103 4.303401e+01 29,30,57,60,74,78,90 +3 78 4.636270e+01 30,31,57,60,74,78,90 +3 58 4.199699e+01 30,32,57,60,74,78,90 +3 3 5.106816e+01 30,34,57,60,74,78,90 +3 27 4.884998e+01 30,36,57,60,74,78,90 +3 1 5.093938e+01 30,44,57,60,74,78,90 +3 16 4.959263e+01 30,57,59,60,74,78,90 +3 1 5.093039e+01 30,57,60,61,74,78,90 +3 3 4.992432e+01 30,57,60,62,74,78,90 +3 6 5.046417e+01 30,57,60,63,74,78,90 +3 1 4.955427e+01 30,57,60,66,74,78,90 +3 3 5.049801e+01 30,57,60,69,74,78,90 +3 1 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.103031e+01 30,57,60,71,74,78,90 +3 14 4.949353e+01 30,57,60,74,76,78,90 +3 94 3.946418e+01 30,57,60,74,78 +3 98854 4.898003e+01 30,57,60,74,78,90 +3 17 4.924109e+01 30,57,60,74,78,90,91 +3 4 5.010340e+01 30,57,60,74,78,90,92 +3 69 4.293612e+01 30,57,60,74,90 +3 62 4.027826e+01 30,57,60,78,90 +3 98 4.330013e+01 30,57,74,78,90 +3 39 4.235476e+01 30,60,74,78,90 +3 83 3.101881e+01 57,60,74,78,90 +1 2 5.326373e+01 3,30,57,60,74,78,90 +1 1 5.009987e+01 11,30,57,60,74,78,90 +1 6 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.001102e+01 14,30,57,60,74,78,90 +1 4 5.209925e+01 18,30,57,60,74,78,90 +1 22 4.489658e+01 24,30,57,60,74,78,90 +1 8 4.480868e+01 25,30,57,60,74,78,90 +1 4 4.697990e+01 26,30,57,60,74,78,90 +1 12 4.721079e+01 27,30,57,60,74,78,90 +1 9 4.710177e+01 28,30,57,60,74,78,90 +1 4 4.303401e+01 29,30,57,60,74,78,90 +1 14 4.636270e+01 30,31,57,60,74,78,90 +1 15 4.199699e+01 30,32,57,60,74,78,90 +1 1 5.106816e+01 30,34,57,60,74,78,90 +1 2 5.100229e+01 30,35,57,60,74,78,90 +1 14 4.884998e+01 30,36,57,60,74,78,90 +1 3 4.959263e+01 30,57,59,60,74,78,90 +1 3 5.093039e+01 30,57,60,61,74,78,90 +1 16 4.992432e+01 30,57,60,62,74,78,90 +1 1 5.046417e+01 30,57,60,63,74,78,90 +1 3 5.365774e+01 30,57,60,65,74,78,90 +1 6 5.049801e+01 30,57,60,69,74,78,90 +1 4 4.949353e+01 30,57,60,74,76,78,90 +1 16 3.946418e+01 30,57,60,74,78 +1 99755 4.898003e+01 30,57,60,74,78,90 +1 8 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 1 5.331382e+01 30,57,60,74,78,90,97 +1 14 4.293612e+01 30,57,60,74,90 +1 10 4.027826e+01 30,57,60,78,90 +1 13 4.330013e+01 30,57,74,78,90 +1 16 4.235476e+01 30,60,74,78,90 +1 9 3.101881e+01 57,60,74,78,90 +2 9 4.846652e+01 12,30,57,60,74,78,90 +2 1 5.001102e+01 14,30,57,60,74,78,90 +2 1 5.209925e+01 18,30,57,60,74,78,90 +2 57 4.489658e+01 24,30,57,60,74,78,90 +2 22 4.480868e+01 25,30,57,60,74,78,90 +2 12 4.697990e+01 26,30,57,60,74,78,90 +2 25 4.721079e+01 27,30,57,60,74,78,90 +2 25 4.710177e+01 28,30,57,60,74,78,90 +2 19 4.303401e+01 29,30,57,60,74,78,90 +2 26 4.636270e+01 30,31,57,60,74,78,90 +2 39 4.199699e+01 30,32,57,60,74,78,90 +2 12 5.100229e+01 30,35,57,60,74,78,90 +2 22 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.092417e+01 30,40,57,60,74,78,90 +2 2 5.550344e+01 30,42,57,60,74,78,90 +2 6 4.959263e+01 30,57,59,60,74,78,90 +2 19 4.992432e+01 30,57,60,62,74,78,90 +2 1 5.046417e+01 30,57,60,63,74,78,90 +2 2 4.955427e+01 30,57,60,66,74,78,90 +2 4 5.131319e+01 30,57,60,68,74,78,90 +2 4 5.049801e+01 30,57,60,69,74,78,90 +2 1 5.035831e+01 30,57,60,70,74,78,90 +2 7 4.949353e+01 30,57,60,74,76,78,90 +2 45 3.946418e+01 30,57,60,74,78 +2 99429 4.898003e+01 30,57,60,74,78,90 +2 20 4.924109e+01 30,57,60,74,78,90,91 +2 2 5.010340e+01 30,57,60,74,78,90,92 +2 2 5.172090e+01 30,57,60,74,78,90,98 +2 37 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 41 4.330013e+01 30,57,74,78,90 +2 47 4.235476e+01 30,60,74,78,90 +2 29 3.101881e+01 57,60,74,78,90 +3 4 5.009987e+01 11,30,57,60,74,78,90 +3 21 4.846652e+01 12,30,57,60,74,78,90 +3 3 5.162988e+01 13,30,57,60,74,78,90 +3 6 5.001102e+01 14,30,57,60,74,78,90 +3 6 5.209925e+01 18,30,57,60,74,78,90 +3 3 5.408172e+01 22,30,57,60,74,78,90 +3 129 4.489658e+01 24,30,57,60,74,78,90 +3 63 4.480868e+01 25,30,57,60,74,78,90 +3 30 4.697990e+01 26,30,57,60,74,78,90 +3 46 4.721079e+01 27,30,57,60,74,78,90 +3 45 4.710177e+01 28,30,57,60,74,78,90 +3 39 4.303401e+01 29,30,57,60,74,78,90 +3 54 4.636270e+01 30,31,57,60,74,78,90 +3 96 4.199699e+01 30,32,57,60,74,78,90 +3 4 5.106816e+01 30,34,57,60,74,78,90 +3 3 5.100229e+01 30,35,57,60,74,78,90 +3 22 4.884998e+01 30,36,57,60,74,78,90 +3 2 5.271108e+01 30,38,57,60,74,78,90 +3 7 5.102157e+01 30,56,57,60,74,78,90 +3 8 4.959263e+01 30,57,59,60,74,78,90 +3 2 5.093039e+01 30,57,60,61,74,78,90 +3 12 4.992432e+01 30,57,60,62,74,78,90 +3 4 5.046417e+01 30,57,60,63,74,78,90 +3 5 4.955427e+01 30,57,60,66,74,78,90 +3 6 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.313605e+01 30,57,60,73,74,78,90 +3 3 4.949353e+01 30,57,60,74,76,78,90 +3 119 3.946418e+01 30,57,60,74,78 +3 2 5.301417e+01 30,57,60,74,78,87,90 +3 98782 4.898003e+01 30,57,60,74,78,90 +3 19 4.924109e+01 30,57,60,74,78,90,91 +3 78 4.293612e+01 30,57,60,74,90 +3 89 4.027826e+01 30,57,60,78,90 +3 90 4.330013e+01 30,57,74,78,90 +3 118 4.235476e+01 30,60,74,78,90 +3 78 3.101881e+01 57,60,74,78,90 diff --git a/test/newFormat.test.expected-dat b/test/newFormat.test.expected-dat index 1e76363..f74751e 100644 --- a/test/newFormat.test.expected-dat +++ b/test/newFormat.test.expected-dat @@ -1,190 +1,184 @@ -1 -1 2 4.888530e+01 1 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.662988e+01 13 30 57 60 74 78 90 -1 5 4.501102e+01 14 30 57 60 74 78 90 -1 1 4.489658e+01 24 30 57 60 74 78 90 -1 2 4.480868e+01 25 30 57 60 74 78 90 -1 2 4.710177e+01 28 30 57 60 74 78 90 -1 12 4.303401e+01 29 30 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 1 4.606816e+01 30 34 57 60 74 78 90 -1 8 4.600229e+01 30 35 57 60 74 78 90 -1 9 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 1 4.492432e+01 30 57 60 62 74 78 90 -1 5 4.455427e+01 30 57 60 66 74 78 90 -1 2 4.631319e+01 30 57 60 68 74 78 90 -1 10 4.535831e+01 30 57 60 70 74 78 90 -1 1 4.603031e+01 30 57 60 71 74 78 90 -1 10 3.446418e+01 30 57 60 74 78 -1 99860 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 11 3.793612e+01 30 57 60 74 90 -1 8 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 7 3.735476e+01 30 60 74 78 90 -1 7 3.101881e+01 57 60 74 78 90 -2 -2 2 5.000754e+01 0 30 57 60 74 78 90 -2 7 4.509987e+01 11 30 57 60 74 78 90 -2 15 4.346652e+01 12 30 57 60 74 78 90 -2 2 4.662988e+01 13 30 57 60 74 78 90 -2 5 4.501102e+01 14 30 57 60 74 78 90 -2 3 4.489658e+01 24 30 57 60 74 78 90 -2 6 4.480868e+01 25 30 57 60 74 78 90 -2 3 4.721079e+01 27 30 57 60 74 78 90 -2 32 4.303401e+01 29 30 57 60 74 78 90 -2 4 4.636270e+01 30 31 57 60 74 78 90 -2 13 4.199699e+01 30 32 57 60 74 78 90 -2 3 4.606816e+01 30 34 57 60 74 78 90 -2 3 4.600229e+01 30 35 57 60 74 78 90 -2 18 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.592417e+01 30 40 57 60 74 78 90 -2 2 4.593938e+01 30 44 57 60 74 78 90 -2 14 4.459263e+01 30 57 59 60 74 78 90 -2 5 4.492432e+01 30 57 60 62 74 78 90 -2 2 4.865774e+01 30 57 60 65 74 78 90 -2 11 4.455427e+01 30 57 60 66 74 78 90 -2 2 4.631319e+01 30 57 60 68 74 78 90 -2 2 4.549801e+01 30 57 60 69 74 78 90 -2 2 4.535831e+01 30 57 60 70 74 78 90 -2 1 4.449353e+01 30 57 60 74 76 78 90 -2 29 3.446418e+01 30 57 60 74 78 -2 99642 4.398003e+01 30 57 60 74 78 90 -2 11 4.424109e+01 30 57 60 74 78 90 91 -2 3 4.510340e+01 30 57 60 74 78 90 92 -2 27 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 19 3.735476e+01 30 60 74 78 90 -2 35 3.101881e+01 57 60 74 78 90 -3 -3 4 4.826373e+01 3 30 57 60 74 78 90 -3 4 4.776004e+01 9 30 57 60 74 78 90 -3 8 4.509987e+01 11 30 57 60 74 78 90 -3 36 4.346652e+01 12 30 57 60 74 78 90 -3 6 4.501102e+01 14 30 57 60 74 78 90 -3 2 4.780335e+01 19 30 57 60 74 78 90 -3 4 4.489658e+01 24 30 57 60 74 78 90 -3 3 4.480868e+01 25 30 57 60 74 78 90 -3 56 4.303401e+01 29 30 57 60 74 78 90 -3 43 4.199699e+01 30 32 57 60 74 78 90 -3 3 4.606816e+01 30 34 57 60 74 78 90 -3 22 4.384998e+01 30 36 57 60 74 78 90 -3 3 4.593938e+01 30 44 57 60 74 78 90 -3 12 4.459263e+01 30 57 59 60 74 78 90 -3 1 4.593039e+01 30 57 60 61 74 78 90 -3 2 4.492432e+01 30 57 60 62 74 78 90 -3 1 4.546417e+01 30 57 60 63 74 78 90 -3 1 4.865774e+01 30 57 60 65 74 78 90 -3 17 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.631319e+01 30 57 60 68 74 78 90 -3 3 4.535831e+01 30 57 60 70 74 78 90 -3 4 4.603031e+01 30 57 60 71 74 78 90 -3 2 4.449353e+01 30 57 60 74 76 78 90 -3 82 3.446418e+01 30 57 60 74 78 -3 99314 4.398003e+01 30 57 60 74 78 90 -3 10 4.424109e+01 30 57 60 74 78 90 91 -3 66 3.793612e+01 30 57 60 74 90 -3 63 3.527826e+01 30 57 60 78 90 -3 92 3.830013e+01 30 57 74 78 90 -3 44 3.735476e+01 30 60 74 78 90 -3 89 3.101881e+01 57 60 74 78 90 -1 -1 3 4.509987e+01 11 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 4 4.662988e+01 13 30 57 60 74 78 90 -1 6 4.501102e+01 14 30 57 60 74 78 90 -1 1 5.047597e+01 21 30 57 60 74 78 90 -1 6 4.489658e+01 24 30 57 60 74 78 90 -1 4 4.710177e+01 28 30 57 60 74 78 90 -1 5 4.303401e+01 29 30 57 60 74 78 90 -1 9 4.199699e+01 30 32 57 60 74 78 90 -1 3 4.606816e+01 30 34 57 60 74 78 90 -1 13 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.592417e+01 30 40 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 2 4.459263e+01 30 57 59 60 74 78 90 -1 7 4.492432e+01 30 57 60 62 74 78 90 -1 4 4.546417e+01 30 57 60 63 74 78 90 -1 1 4.455427e+01 30 57 60 66 74 78 90 -1 1 4.631319e+01 30 57 60 68 74 78 90 -1 2 4.549801e+01 30 57 60 69 74 78 90 -1 3 4.603031e+01 30 57 60 71 74 78 90 -1 3 4.449353e+01 30 57 60 74 76 78 90 -1 19 3.446418e+01 30 57 60 74 78 -1 1 4.822720e+01 30 57 60 74 78 86 90 -1 99825 4.398003e+01 30 57 60 74 78 90 -1 2 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 14 3.793612e+01 30 57 60 74 90 -1 10 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 17 3.735476e+01 30 60 74 78 90 -1 12 3.101881e+01 57 60 74 78 90 -2 -2 3 4.509987e+01 11 30 57 60 74 78 90 -2 17 4.346652e+01 12 30 57 60 74 78 90 -2 6 4.501102e+01 14 30 57 60 74 78 90 -2 1 4.709925e+01 18 30 57 60 74 78 90 -2 8 4.489658e+01 24 30 57 60 74 78 90 -2 7 4.480868e+01 25 30 57 60 74 78 90 -2 12 4.303401e+01 29 30 57 60 74 78 90 -2 34 4.199699e+01 30 32 57 60 74 78 90 -2 1 4.606816e+01 30 34 57 60 74 78 90 -2 16 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.665818e+01 30 44 57 60 74 76 78 90 -2 3 4.593938e+01 30 44 57 60 74 78 90 -2 3 4.459263e+01 30 57 59 60 74 78 90 -2 7 4.492432e+01 30 57 60 62 74 78 90 -2 1 4.546417e+01 30 57 60 63 74 78 90 -2 2 4.455427e+01 30 57 60 66 74 78 90 -2 4 4.549801e+01 30 57 60 69 74 78 90 -2 3 4.535831e+01 30 57 60 70 74 78 90 -2 3 4.603031e+01 30 57 60 71 74 78 90 -2 4 4.449353e+01 30 57 60 74 76 78 90 -2 56 3.446418e+01 30 57 60 74 78 -2 99604 4.398003e+01 30 57 60 74 78 90 -2 9 4.424109e+01 30 57 60 74 78 90 91 -2 2 4.672090e+01 30 57 60 74 78 90 98 -2 38 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 41 3.830013e+01 30 57 74 78 90 -2 44 3.735476e+01 30 60 74 78 90 -2 39 3.101881e+01 57 60 74 78 90 -3 -3 3 3.646552e+01 0 57 60 74 78 90 -3 7 4.509987e+01 11 30 57 60 74 78 90 -3 41 4.346652e+01 12 30 57 60 74 78 90 -3 15 4.501102e+01 14 30 57 60 74 78 90 -3 1 4.943149e+01 17 30 57 60 74 78 90 -3 2 4.489658e+01 24 30 57 60 74 78 90 -3 7 4.480868e+01 25 30 57 60 74 78 90 -3 20 4.303401e+01 29 30 57 60 74 78 90 -3 65 4.199699e+01 30 32 57 60 74 78 90 -3 3 4.600229e+01 30 35 57 60 74 78 90 -3 19 4.384998e+01 30 36 57 60 74 78 90 -3 5 4.593938e+01 30 44 57 60 74 78 90 -3 2 4.602157e+01 30 56 57 60 74 78 90 -3 14 4.459263e+01 30 57 59 60 74 78 90 -3 3 4.593039e+01 30 57 60 61 74 78 90 -3 10 4.492432e+01 30 57 60 62 74 78 90 -3 4 4.546417e+01 30 57 60 63 74 78 90 -3 3 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.549801e+01 30 57 60 69 74 78 90 -3 4 4.535831e+01 30 57 60 70 74 78 90 -3 2 4.603031e+01 30 57 60 71 74 78 90 -3 1 4.449353e+01 30 57 60 74 76 78 90 -3 135 3.446418e+01 30 57 60 74 78 -3 99142 4.398003e+01 30 57 60 74 78 90 -3 14 4.424109e+01 30 57 60 74 78 90 91 -3 80 3.793612e+01 30 57 60 74 90 -3 95 3.527826e+01 30 57 60 78 90 -3 93 3.830013e+01 30 57 74 78 90 -3 1 2.828830e+01 30 60 74 78 -3 106 3.735476e+01 30 60 74 78 90 -3 1 3.624070e+01 57 60 74 78 83 90 -3 99 3.101881e+01 57 60 74 78 90 +1 2 4.888530e+01 1,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.662988e+01 13,30,57,60,74,78,90 +1 5 4.501102e+01 14,30,57,60,74,78,90 +1 1 4.489658e+01 24,30,57,60,74,78,90 +1 2 4.480868e+01 25,30,57,60,74,78,90 +1 2 4.710177e+01 28,30,57,60,74,78,90 +1 12 4.303401e+01 29,30,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 1 4.606816e+01 30,34,57,60,74,78,90 +1 8 4.600229e+01 30,35,57,60,74,78,90 +1 9 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 1 4.492432e+01 30,57,60,62,74,78,90 +1 5 4.455427e+01 30,57,60,66,74,78,90 +1 2 4.631319e+01 30,57,60,68,74,78,90 +1 10 4.535831e+01 30,57,60,70,74,78,90 +1 1 4.603031e+01 30,57,60,71,74,78,90 +1 10 3.446418e+01 30,57,60,74,78 +1 99860 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 11 3.793612e+01 30,57,60,74,90 +1 8 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 7 3.735476e+01 30,60,74,78,90 +1 7 3.101881e+01 57,60,74,78,90 +2 2 5.000754e+01 0,30,57,60,74,78,90 +2 7 4.509987e+01 11,30,57,60,74,78,90 +2 15 4.346652e+01 12,30,57,60,74,78,90 +2 2 4.662988e+01 13,30,57,60,74,78,90 +2 5 4.501102e+01 14,30,57,60,74,78,90 +2 3 4.489658e+01 24,30,57,60,74,78,90 +2 6 4.480868e+01 25,30,57,60,74,78,90 +2 3 4.721079e+01 27,30,57,60,74,78,90 +2 32 4.303401e+01 29,30,57,60,74,78,90 +2 4 4.636270e+01 30,31,57,60,74,78,90 +2 13 4.199699e+01 30,32,57,60,74,78,90 +2 3 4.606816e+01 30,34,57,60,74,78,90 +2 3 4.600229e+01 30,35,57,60,74,78,90 +2 18 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.592417e+01 30,40,57,60,74,78,90 +2 2 4.593938e+01 30,44,57,60,74,78,90 +2 14 4.459263e+01 30,57,59,60,74,78,90 +2 5 4.492432e+01 30,57,60,62,74,78,90 +2 2 4.865774e+01 30,57,60,65,74,78,90 +2 11 4.455427e+01 30,57,60,66,74,78,90 +2 2 4.631319e+01 30,57,60,68,74,78,90 +2 2 4.549801e+01 30,57,60,69,74,78,90 +2 2 4.535831e+01 30,57,60,70,74,78,90 +2 1 4.449353e+01 30,57,60,74,76,78,90 +2 29 3.446418e+01 30,57,60,74,78 +2 99642 4.398003e+01 30,57,60,74,78,90 +2 11 4.424109e+01 30,57,60,74,78,90,91 +2 3 4.510340e+01 30,57,60,74,78,90,92 +2 27 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 19 3.735476e+01 30,60,74,78,90 +2 35 3.101881e+01 57,60,74,78,90 +3 4 4.826373e+01 3,30,57,60,74,78,90 +3 4 4.776004e+01 9,30,57,60,74,78,90 +3 8 4.509987e+01 11,30,57,60,74,78,90 +3 36 4.346652e+01 12,30,57,60,74,78,90 +3 6 4.501102e+01 14,30,57,60,74,78,90 +3 2 4.780335e+01 19,30,57,60,74,78,90 +3 4 4.489658e+01 24,30,57,60,74,78,90 +3 3 4.480868e+01 25,30,57,60,74,78,90 +3 56 4.303401e+01 29,30,57,60,74,78,90 +3 43 4.199699e+01 30,32,57,60,74,78,90 +3 3 4.606816e+01 30,34,57,60,74,78,90 +3 22 4.384998e+01 30,36,57,60,74,78,90 +3 3 4.593938e+01 30,44,57,60,74,78,90 +3 12 4.459263e+01 30,57,59,60,74,78,90 +3 1 4.593039e+01 30,57,60,61,74,78,90 +3 2 4.492432e+01 30,57,60,62,74,78,90 +3 1 4.546417e+01 30,57,60,63,74,78,90 +3 1 4.865774e+01 30,57,60,65,74,78,90 +3 17 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.631319e+01 30,57,60,68,74,78,90 +3 3 4.535831e+01 30,57,60,70,74,78,90 +3 4 4.603031e+01 30,57,60,71,74,78,90 +3 2 4.449353e+01 30,57,60,74,76,78,90 +3 82 3.446418e+01 30,57,60,74,78 +3 99314 4.398003e+01 30,57,60,74,78,90 +3 10 4.424109e+01 30,57,60,74,78,90,91 +3 66 3.793612e+01 30,57,60,74,90 +3 63 3.527826e+01 30,57,60,78,90 +3 92 3.830013e+01 30,57,74,78,90 +3 44 3.735476e+01 30,60,74,78,90 +3 89 3.101881e+01 57,60,74,78,90 +1 3 4.509987e+01 11,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 4 4.662988e+01 13,30,57,60,74,78,90 +1 6 4.501102e+01 14,30,57,60,74,78,90 +1 1 5.047597e+01 21,30,57,60,74,78,90 +1 6 4.489658e+01 24,30,57,60,74,78,90 +1 4 4.710177e+01 28,30,57,60,74,78,90 +1 5 4.303401e+01 29,30,57,60,74,78,90 +1 9 4.199699e+01 30,32,57,60,74,78,90 +1 3 4.606816e+01 30,34,57,60,74,78,90 +1 13 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.592417e+01 30,40,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 2 4.459263e+01 30,57,59,60,74,78,90 +1 7 4.492432e+01 30,57,60,62,74,78,90 +1 4 4.546417e+01 30,57,60,63,74,78,90 +1 1 4.455427e+01 30,57,60,66,74,78,90 +1 1 4.631319e+01 30,57,60,68,74,78,90 +1 2 4.549801e+01 30,57,60,69,74,78,90 +1 3 4.603031e+01 30,57,60,71,74,78,90 +1 3 4.449353e+01 30,57,60,74,76,78,90 +1 19 3.446418e+01 30,57,60,74,78 +1 1 4.822720e+01 30,57,60,74,78,86,90 +1 99825 4.398003e+01 30,57,60,74,78,90 +1 2 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 14 3.793612e+01 30,57,60,74,90 +1 10 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 17 3.735476e+01 30,60,74,78,90 +1 12 3.101881e+01 57,60,74,78,90 +2 3 4.509987e+01 11,30,57,60,74,78,90 +2 17 4.346652e+01 12,30,57,60,74,78,90 +2 6 4.501102e+01 14,30,57,60,74,78,90 +2 1 4.709925e+01 18,30,57,60,74,78,90 +2 8 4.489658e+01 24,30,57,60,74,78,90 +2 7 4.480868e+01 25,30,57,60,74,78,90 +2 12 4.303401e+01 29,30,57,60,74,78,90 +2 34 4.199699e+01 30,32,57,60,74,78,90 +2 1 4.606816e+01 30,34,57,60,74,78,90 +2 16 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.665818e+01 30,44,57,60,74,76,78,90 +2 3 4.593938e+01 30,44,57,60,74,78,90 +2 3 4.459263e+01 30,57,59,60,74,78,90 +2 7 4.492432e+01 30,57,60,62,74,78,90 +2 1 4.546417e+01 30,57,60,63,74,78,90 +2 2 4.455427e+01 30,57,60,66,74,78,90 +2 4 4.549801e+01 30,57,60,69,74,78,90 +2 3 4.535831e+01 30,57,60,70,74,78,90 +2 3 4.603031e+01 30,57,60,71,74,78,90 +2 4 4.449353e+01 30,57,60,74,76,78,90 +2 56 3.446418e+01 30,57,60,74,78 +2 99604 4.398003e+01 30,57,60,74,78,90 +2 9 4.424109e+01 30,57,60,74,78,90,91 +2 2 4.672090e+01 30,57,60,74,78,90,98 +2 38 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 41 3.830013e+01 30,57,74,78,90 +2 44 3.735476e+01 30,60,74,78,90 +2 39 3.101881e+01 57,60,74,78,90 +3 3 3.646552e+01 0,57,60,74,78,90 +3 7 4.509987e+01 11,30,57,60,74,78,90 +3 41 4.346652e+01 12,30,57,60,74,78,90 +3 15 4.501102e+01 14,30,57,60,74,78,90 +3 1 4.943149e+01 17,30,57,60,74,78,90 +3 2 4.489658e+01 24,30,57,60,74,78,90 +3 7 4.480868e+01 25,30,57,60,74,78,90 +3 20 4.303401e+01 29,30,57,60,74,78,90 +3 65 4.199699e+01 30,32,57,60,74,78,90 +3 3 4.600229e+01 30,35,57,60,74,78,90 +3 19 4.384998e+01 30,36,57,60,74,78,90 +3 5 4.593938e+01 30,44,57,60,74,78,90 +3 2 4.602157e+01 30,56,57,60,74,78,90 +3 14 4.459263e+01 30,57,59,60,74,78,90 +3 3 4.593039e+01 30,57,60,61,74,78,90 +3 10 4.492432e+01 30,57,60,62,74,78,90 +3 4 4.546417e+01 30,57,60,63,74,78,90 +3 3 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.549801e+01 30,57,60,69,74,78,90 +3 4 4.535831e+01 30,57,60,70,74,78,90 +3 2 4.603031e+01 30,57,60,71,74,78,90 +3 1 4.449353e+01 30,57,60,74,76,78,90 +3 135 3.446418e+01 30,57,60,74,78 +3 99142 4.398003e+01 30,57,60,74,78,90 +3 14 4.424109e+01 30,57,60,74,78,90,91 +3 80 3.793612e+01 30,57,60,74,90 +3 95 3.527826e+01 30,57,60,78,90 +3 93 3.830013e+01 30,57,74,78,90 +3 1 2.828830e+01 30,60,74,78 +3 106 3.735476e+01 30,60,74,78,90 +3 1 3.624070e+01 57,60,74,78,83,90 +3 99 3.101881e+01 57,60,74,78,90 diff --git a/test/simple2site.test b/test/simple2site.test new file mode 100755 index 0000000..46488d1 --- /dev/null +++ b/test/simple2site.test @@ -0,0 +1,3 @@ +#!/bin/bash +WF=../wf +${WF} -v -seed 66314 -r -n 100000 -g 3 -numruns 2 -mu 1.0e-3 -i simple2site -s allWT -e simple2site -o simple2site.test diff --git a/test/simple2site.test.expected-dat b/test/simple2site.test.expected-dat new file mode 100644 index 0000000..4847b61 --- /dev/null +++ b/test/simple2site.test.expected-dat @@ -0,0 +1,20 @@ +1 99577 1.000000e+01 +1 199 1.319984e+00 0 +1 224 1.834139e+00 1 +2 98744 1.000000e+01 +2 628 1.319984e+00 0 +2 628 1.834139e+00 1 +3 97013 1.000000e+01 +3 1519 1.319984e+00 0 +3 2 -1.498153e+00 0,1 +3 1466 1.834139e+00 1 +1 99566 1.000000e+01 +1 195 1.319984e+00 0 +1 239 1.834139e+00 1 +2 98738 1.000000e+01 +2 607 1.319984e+00 0 +2 655 1.834139e+00 1 +3 96969 1.000000e+01 +3 1483 1.319984e+00 0 +3 4 -1.498153e+00 0,1 +3 1544 1.834139e+00 1 diff --git a/test/simple2site.test.expected-err b/test/simple2site.test.expected-err new file mode 100644 index 0000000..e69de29 diff --git a/test/simple2site.test.expected-out b/test/simple2site.test.expected-out new file mode 100644 index 0000000..6ad58dc --- /dev/null +++ b/test/simple2site.test.expected-out @@ -0,0 +1,35 @@ +seed = 66314 +1; +0 1 | +survival probability 0.5 number survived 49967 total number 49967 +survival probability 0.99983 number survived 98 total number 98 0 +survival probability 0.999716 number survived 113 total number 113 1 +checkpoint, total_deaths = 49822 +The total population size is 50178 +survival probability 0.49111 number survived 48860 total number 48860 +survival probability 0.999824 number survived 303 total number 303 0 +survival probability 0.999706 number survived 324 total number 324 1 +checkpoint, total_deaths = 50513 +The total population size is 49487 +survival probability 0.473577 number survived 46668 total number 46668 +survival probability 0.999811 number survived 720 total number 720 0 +survival probability 0.999989 number survived 1 total number 1 0 1 +survival probability 0.999684 number survived 719 total number 719 1 +checkpoint, total_deaths = 51892 +The total population size is 48108 +survival probability 0.500024 number survived 50302 total number 50302 +survival probability 0.99983 number survived 104 total number 104 0 +survival probability 0.999716 number survived 120 total number 120 1 +checkpoint, total_deaths = 49474 +The total population size is 50526 +survival probability 0.49089 number survived 48769 total number 48769 +survival probability 0.999824 number survived 286 total number 286 0 +survival probability 0.999705 number survived 330 total number 330 1 +checkpoint, total_deaths = 50615 +The total population size is 49385 +survival probability 0.473481 number survived 46675 total number 46675 +survival probability 0.999811 number survived 703 total number 703 0 +survival probability 0.999989 number survived 2 total number 2 0 1 +survival probability 0.999684 number survived 743 total number 743 1 +checkpoint, total_deaths = 51877 +The total population size is 48123 diff --git a/test/simple2site.test.expected-sum b/test/simple2site.test.expected-sum new file mode 100644 index 0000000..fd24143 --- /dev/null +++ b/test/simple2site.test.expected-sum @@ -0,0 +1,2 @@ +3 1519 0 +3 1544 1 diff --git a/test/test1_01-00.test.expected-dat b/test/test1_01-00.test.expected-dat index e46af5b..7145eb5 100644 --- a/test/test1_01-00.test.expected-dat +++ b/test/test1_01-00.test.expected-dat @@ -1,159 +1,153 @@ -1 -1 2 5.388530e+01 1 30 57 60 74 78 90 -1 4 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.162988e+01 13 30 57 60 74 78 90 -1 5 5.001102e+01 14 30 57 60 74 78 90 -1 1 5.106816e+01 30 34 57 60 74 78 90 -1 6 5.100229e+01 30 35 57 60 74 78 90 -1 6 4.884998e+01 30 36 57 60 74 78 90 -1 4 5.093938e+01 30 44 57 60 74 78 90 -1 3 4.959263e+01 30 57 59 60 74 78 90 -1 2 4.992432e+01 30 57 60 62 74 78 90 -1 7 4.955427e+01 30 57 60 66 74 78 90 -1 2 5.131319e+01 30 57 60 68 74 78 90 -1 8 5.035831e+01 30 57 60 70 74 78 90 -1 2 5.103031e+01 30 57 60 71 74 78 90 -1 10 3.946418e+01 30 57 60 74 78 -1 99884 4.898003e+01 30 57 60 74 78 90 -1 4 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 13 4.330013e+01 30 57 74 78 90 -1 7 4.235476e+01 30 60 74 78 90 -1 7 3.101881e+01 57 60 74 78 90 -2 -2 2 5.500754e+01 0 30 57 60 74 78 90 -2 1 5.326373e+01 3 30 57 60 74 78 90 -2 13 4.846652e+01 12 30 57 60 74 78 90 -2 1 5.001102e+01 14 30 57 60 74 78 90 -2 4 5.199699e+01 30 32 57 60 74 78 90 -2 2 5.106816e+01 30 34 57 60 74 78 90 -2 3 5.100229e+01 30 35 57 60 74 78 90 -2 20 4.884998e+01 30 36 57 60 74 78 90 -2 3 5.092417e+01 30 40 57 60 74 78 90 -2 5 5.093938e+01 30 44 57 60 74 78 90 -2 12 4.959263e+01 30 57 59 60 74 78 90 -2 5 4.992432e+01 30 57 60 62 74 78 90 -2 1 5.365774e+01 30 57 60 65 74 78 90 -2 13 4.955427e+01 30 57 60 66 74 78 90 -2 1 5.131319e+01 30 57 60 68 74 78 90 -2 3 5.049801e+01 30 57 60 69 74 78 90 -2 2 5.035831e+01 30 57 60 70 74 78 90 -2 1 4.949353e+01 30 57 60 74 76 78 90 -2 22 3.946418e+01 30 57 60 74 78 -2 99717 4.898003e+01 30 57 60 74 78 90 -2 9 4.924109e+01 30 57 60 74 78 90 91 -2 3 5.010340e+01 30 57 60 74 78 90 92 -2 27 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 45 4.330013e+01 30 57 74 78 90 -2 20 4.235476e+01 30 60 74 78 90 -2 34 3.101881e+01 57 60 74 78 90 -3 -3 7 5.009987e+01 11 30 57 60 74 78 90 -3 31 4.846652e+01 12 30 57 60 74 78 90 -3 3 5.001102e+01 14 30 57 60 74 78 90 -3 1 4.572266e+01 30 32 57 74 78 90 -3 6 5.106816e+01 30 34 57 60 74 78 90 -3 18 4.884998e+01 30 36 57 60 74 78 90 -3 3 5.092417e+01 30 40 57 60 74 78 90 -3 2 5.102157e+01 30 56 57 60 74 78 90 -3 13 4.959263e+01 30 57 59 60 74 78 90 -3 13 4.992432e+01 30 57 60 62 74 78 90 -3 9 4.955427e+01 30 57 60 66 74 78 90 -3 2 5.131319e+01 30 57 60 68 74 78 90 -3 3 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.103031e+01 30 57 60 71 74 78 90 -3 7 4.949353e+01 30 57 60 74 76 78 90 -3 59 3.946418e+01 30 57 60 74 78 -3 99451 4.898003e+01 30 57 60 74 78 90 -3 13 4.924109e+01 30 57 60 74 78 90 91 -3 2 5.010340e+01 30 57 60 74 78 90 92 -3 68 4.293612e+01 30 57 60 74 90 -3 62 4.027826e+01 30 57 60 78 90 -3 93 4.330013e+01 30 57 74 78 90 -3 46 4.235476e+01 30 60 74 78 90 -3 2 3.783420e+01 42 57 60 74 78 90 -3 84 3.101881e+01 57 60 74 78 90 -1 -1 3 5.009987e+01 11 30 57 60 74 78 90 -1 6 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.162988e+01 13 30 57 60 74 78 90 -1 4 5.001102e+01 14 30 57 60 74 78 90 -1 6 5.106816e+01 30 34 57 60 74 78 90 -1 3 4.884998e+01 30 36 57 60 74 78 90 -1 7 5.093938e+01 30 44 57 60 74 78 90 -1 1 5.102157e+01 30 56 57 60 74 78 90 -1 2 4.959263e+01 30 57 59 60 74 78 90 -1 6 4.992432e+01 30 57 60 62 74 78 90 -1 1 5.046417e+01 30 57 60 63 74 78 90 -1 2 5.131319e+01 30 57 60 68 74 78 90 -1 2 5.049801e+01 30 57 60 69 74 78 90 -1 2 4.949353e+01 30 57 60 74 76 78 90 -1 21 3.946418e+01 30 57 60 74 78 -1 2 5.357980e+01 30 57 60 74 78 82 90 -1 1 5.322720e+01 30 57 60 74 78 86 90 -1 99856 4.898003e+01 30 57 60 74 78 90 -1 3 4.924109e+01 30 57 60 74 78 90 91 -1 3 5.010340e+01 30 57 60 74 78 90 92 -1 14 4.293612e+01 30 57 60 74 90 -1 10 4.027826e+01 30 57 60 78 90 -1 12 4.330013e+01 30 57 74 78 90 -1 19 4.235476e+01 30 60 74 78 90 -1 12 3.101881e+01 57 60 74 78 90 -2 -2 3 5.276004e+01 9 30 57 60 74 78 90 -2 3 5.009987e+01 11 30 57 60 74 78 90 -2 16 4.846652e+01 12 30 57 60 74 78 90 -2 3 5.162988e+01 13 30 57 60 74 78 90 -2 1 5.001102e+01 14 30 57 60 74 78 90 -2 1 5.209925e+01 18 30 57 60 74 78 90 -2 1 5.106816e+01 30 34 57 60 74 78 90 -2 9 4.884998e+01 30 36 57 60 74 78 90 -2 5 5.092417e+01 30 40 57 60 74 78 90 -2 2 5.093938e+01 30 44 57 60 74 78 90 -2 3 5.102157e+01 30 56 57 60 74 78 90 -2 4 4.992432e+01 30 57 60 62 74 78 90 -2 7 5.046417e+01 30 57 60 63 74 78 90 -2 8 4.955427e+01 30 57 60 66 74 78 90 -2 3 5.131319e+01 30 57 60 68 74 78 90 -2 9 5.049801e+01 30 57 60 69 74 78 90 -2 49 3.946418e+01 30 57 60 74 78 -2 99654 4.898003e+01 30 57 60 74 78 90 -2 9 4.924109e+01 30 57 60 74 78 90 91 -2 1 5.010340e+01 30 57 60 74 78 90 92 -2 6 5.172090e+01 30 57 60 74 78 90 98 -2 41 4.293612e+01 30 57 60 74 90 -2 32 4.027826e+01 30 57 60 78 90 -2 38 4.330013e+01 30 57 74 78 90 -2 52 4.235476e+01 30 60 74 78 90 -2 40 3.101881e+01 57 60 74 78 90 -3 -3 6 5.009987e+01 11 30 57 60 74 78 90 -3 39 4.846652e+01 12 30 57 60 74 78 90 -3 2 5.001102e+01 14 30 57 60 74 78 90 -3 2 5.280335e+01 19 30 57 60 74 78 90 -3 2 5.106816e+01 30 34 57 60 74 78 90 -3 2 5.100229e+01 30 35 57 60 74 78 90 -3 14 4.884998e+01 30 36 57 60 74 78 90 -3 1 5.225090e+01 30 37 57 60 74 78 90 -3 5 5.092417e+01 30 40 57 60 74 78 90 -3 3 5.102157e+01 30 56 57 60 74 78 90 -3 4 4.959263e+01 30 57 59 60 74 78 90 -3 1 4.113247e+01 30 57 60 61 74 78 -3 4 5.093039e+01 30 57 60 61 74 78 90 -3 4 4.992432e+01 30 57 60 62 74 78 90 -3 7 4.955427e+01 30 57 60 66 74 78 90 -3 4 5.049801e+01 30 57 60 69 74 78 90 -3 3 5.103031e+01 30 57 60 71 74 78 90 -3 6 4.949353e+01 30 57 60 74 76 78 90 -3 127 3.946418e+01 30 57 60 74 78 -3 2 5.366933e+01 30 57 60 74 78 89 90 -3 99251 4.898003e+01 30 57 60 74 78 90 -3 12 4.924109e+01 30 57 60 74 78 90 91 -3 86 4.293612e+01 30 57 60 74 90 -3 93 4.027826e+01 30 57 60 78 90 -3 90 4.330013e+01 30 57 74 78 90 -3 122 4.235476e+01 30 60 74 78 90 -3 108 3.101881e+01 57 60 74 78 90 +1 2 5.388530e+01 1,30,57,60,74,78,90 +1 4 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.162988e+01 13,30,57,60,74,78,90 +1 5 5.001102e+01 14,30,57,60,74,78,90 +1 1 5.106816e+01 30,34,57,60,74,78,90 +1 6 5.100229e+01 30,35,57,60,74,78,90 +1 6 4.884998e+01 30,36,57,60,74,78,90 +1 4 5.093938e+01 30,44,57,60,74,78,90 +1 3 4.959263e+01 30,57,59,60,74,78,90 +1 2 4.992432e+01 30,57,60,62,74,78,90 +1 7 4.955427e+01 30,57,60,66,74,78,90 +1 2 5.131319e+01 30,57,60,68,74,78,90 +1 8 5.035831e+01 30,57,60,70,74,78,90 +1 2 5.103031e+01 30,57,60,71,74,78,90 +1 10 3.946418e+01 30,57,60,74,78 +1 99884 4.898003e+01 30,57,60,74,78,90 +1 4 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 13 4.330013e+01 30,57,74,78,90 +1 7 4.235476e+01 30,60,74,78,90 +1 7 3.101881e+01 57,60,74,78,90 +2 2 5.500754e+01 0,30,57,60,74,78,90 +2 1 5.326373e+01 3,30,57,60,74,78,90 +2 13 4.846652e+01 12,30,57,60,74,78,90 +2 1 5.001102e+01 14,30,57,60,74,78,90 +2 4 5.199699e+01 30,32,57,60,74,78,90 +2 2 5.106816e+01 30,34,57,60,74,78,90 +2 3 5.100229e+01 30,35,57,60,74,78,90 +2 20 4.884998e+01 30,36,57,60,74,78,90 +2 3 5.092417e+01 30,40,57,60,74,78,90 +2 5 5.093938e+01 30,44,57,60,74,78,90 +2 12 4.959263e+01 30,57,59,60,74,78,90 +2 5 4.992432e+01 30,57,60,62,74,78,90 +2 1 5.365774e+01 30,57,60,65,74,78,90 +2 13 4.955427e+01 30,57,60,66,74,78,90 +2 1 5.131319e+01 30,57,60,68,74,78,90 +2 3 5.049801e+01 30,57,60,69,74,78,90 +2 2 5.035831e+01 30,57,60,70,74,78,90 +2 1 4.949353e+01 30,57,60,74,76,78,90 +2 22 3.946418e+01 30,57,60,74,78 +2 99717 4.898003e+01 30,57,60,74,78,90 +2 9 4.924109e+01 30,57,60,74,78,90,91 +2 3 5.010340e+01 30,57,60,74,78,90,92 +2 27 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 45 4.330013e+01 30,57,74,78,90 +2 20 4.235476e+01 30,60,74,78,90 +2 34 3.101881e+01 57,60,74,78,90 +3 7 5.009987e+01 11,30,57,60,74,78,90 +3 31 4.846652e+01 12,30,57,60,74,78,90 +3 3 5.001102e+01 14,30,57,60,74,78,90 +3 1 4.572266e+01 30,32,57,74,78,90 +3 6 5.106816e+01 30,34,57,60,74,78,90 +3 18 4.884998e+01 30,36,57,60,74,78,90 +3 3 5.092417e+01 30,40,57,60,74,78,90 +3 2 5.102157e+01 30,56,57,60,74,78,90 +3 13 4.959263e+01 30,57,59,60,74,78,90 +3 13 4.992432e+01 30,57,60,62,74,78,90 +3 9 4.955427e+01 30,57,60,66,74,78,90 +3 2 5.131319e+01 30,57,60,68,74,78,90 +3 3 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.103031e+01 30,57,60,71,74,78,90 +3 7 4.949353e+01 30,57,60,74,76,78,90 +3 59 3.946418e+01 30,57,60,74,78 +3 99451 4.898003e+01 30,57,60,74,78,90 +3 13 4.924109e+01 30,57,60,74,78,90,91 +3 2 5.010340e+01 30,57,60,74,78,90,92 +3 68 4.293612e+01 30,57,60,74,90 +3 62 4.027826e+01 30,57,60,78,90 +3 93 4.330013e+01 30,57,74,78,90 +3 46 4.235476e+01 30,60,74,78,90 +3 2 3.783420e+01 42,57,60,74,78,90 +3 84 3.101881e+01 57,60,74,78,90 +1 3 5.009987e+01 11,30,57,60,74,78,90 +1 6 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.162988e+01 13,30,57,60,74,78,90 +1 4 5.001102e+01 14,30,57,60,74,78,90 +1 6 5.106816e+01 30,34,57,60,74,78,90 +1 3 4.884998e+01 30,36,57,60,74,78,90 +1 7 5.093938e+01 30,44,57,60,74,78,90 +1 1 5.102157e+01 30,56,57,60,74,78,90 +1 2 4.959263e+01 30,57,59,60,74,78,90 +1 6 4.992432e+01 30,57,60,62,74,78,90 +1 1 5.046417e+01 30,57,60,63,74,78,90 +1 2 5.131319e+01 30,57,60,68,74,78,90 +1 2 5.049801e+01 30,57,60,69,74,78,90 +1 2 4.949353e+01 30,57,60,74,76,78,90 +1 21 3.946418e+01 30,57,60,74,78 +1 2 5.357980e+01 30,57,60,74,78,82,90 +1 1 5.322720e+01 30,57,60,74,78,86,90 +1 99856 4.898003e+01 30,57,60,74,78,90 +1 3 4.924109e+01 30,57,60,74,78,90,91 +1 3 5.010340e+01 30,57,60,74,78,90,92 +1 14 4.293612e+01 30,57,60,74,90 +1 10 4.027826e+01 30,57,60,78,90 +1 12 4.330013e+01 30,57,74,78,90 +1 19 4.235476e+01 30,60,74,78,90 +1 12 3.101881e+01 57,60,74,78,90 +2 3 5.276004e+01 9,30,57,60,74,78,90 +2 3 5.009987e+01 11,30,57,60,74,78,90 +2 16 4.846652e+01 12,30,57,60,74,78,90 +2 3 5.162988e+01 13,30,57,60,74,78,90 +2 1 5.001102e+01 14,30,57,60,74,78,90 +2 1 5.209925e+01 18,30,57,60,74,78,90 +2 1 5.106816e+01 30,34,57,60,74,78,90 +2 9 4.884998e+01 30,36,57,60,74,78,90 +2 5 5.092417e+01 30,40,57,60,74,78,90 +2 2 5.093938e+01 30,44,57,60,74,78,90 +2 3 5.102157e+01 30,56,57,60,74,78,90 +2 4 4.992432e+01 30,57,60,62,74,78,90 +2 7 5.046417e+01 30,57,60,63,74,78,90 +2 8 4.955427e+01 30,57,60,66,74,78,90 +2 3 5.131319e+01 30,57,60,68,74,78,90 +2 9 5.049801e+01 30,57,60,69,74,78,90 +2 49 3.946418e+01 30,57,60,74,78 +2 99654 4.898003e+01 30,57,60,74,78,90 +2 9 4.924109e+01 30,57,60,74,78,90,91 +2 1 5.010340e+01 30,57,60,74,78,90,92 +2 6 5.172090e+01 30,57,60,74,78,90,98 +2 41 4.293612e+01 30,57,60,74,90 +2 32 4.027826e+01 30,57,60,78,90 +2 38 4.330013e+01 30,57,74,78,90 +2 52 4.235476e+01 30,60,74,78,90 +2 40 3.101881e+01 57,60,74,78,90 +3 6 5.009987e+01 11,30,57,60,74,78,90 +3 39 4.846652e+01 12,30,57,60,74,78,90 +3 2 5.001102e+01 14,30,57,60,74,78,90 +3 2 5.280335e+01 19,30,57,60,74,78,90 +3 2 5.106816e+01 30,34,57,60,74,78,90 +3 2 5.100229e+01 30,35,57,60,74,78,90 +3 14 4.884998e+01 30,36,57,60,74,78,90 +3 1 5.225090e+01 30,37,57,60,74,78,90 +3 5 5.092417e+01 30,40,57,60,74,78,90 +3 3 5.102157e+01 30,56,57,60,74,78,90 +3 4 4.959263e+01 30,57,59,60,74,78,90 +3 1 4.113247e+01 30,57,60,61,74,78 +3 4 5.093039e+01 30,57,60,61,74,78,90 +3 4 4.992432e+01 30,57,60,62,74,78,90 +3 7 4.955427e+01 30,57,60,66,74,78,90 +3 4 5.049801e+01 30,57,60,69,74,78,90 +3 3 5.103031e+01 30,57,60,71,74,78,90 +3 6 4.949353e+01 30,57,60,74,76,78,90 +3 127 3.946418e+01 30,57,60,74,78 +3 2 5.366933e+01 30,57,60,74,78,89,90 +3 99251 4.898003e+01 30,57,60,74,78,90 +3 12 4.924109e+01 30,57,60,74,78,90,91 +3 86 4.293612e+01 30,57,60,74,90 +3 93 4.027826e+01 30,57,60,78,90 +3 90 4.330013e+01 30,57,74,78,90 +3 122 4.235476e+01 30,60,74,78,90 +3 108 3.101881e+01 57,60,74,78,90 diff --git a/test/test1_01-01.test.expected-dat b/test/test1_01-01.test.expected-dat index 50a46de..6e1de7e 100644 --- a/test/test1_01-01.test.expected-dat +++ b/test/test1_01-01.test.expected-dat @@ -1,160 +1,154 @@ -1 -1 2 4.888530e+01 1 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.662988e+01 13 30 57 60 74 78 90 -1 5 4.501102e+01 14 30 57 60 74 78 90 -1 1 4.606816e+01 30 34 57 60 74 78 90 -1 6 4.600229e+01 30 35 57 60 74 78 90 -1 6 4.384998e+01 30 36 57 60 74 78 90 -1 4 4.593938e+01 30 44 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 2 4.492432e+01 30 57 60 62 74 78 90 -1 7 4.455427e+01 30 57 60 66 74 78 90 -1 2 4.631319e+01 30 57 60 68 74 78 90 -1 8 4.535831e+01 30 57 60 70 74 78 90 -1 2 4.603031e+01 30 57 60 71 74 78 90 -1 10 3.446418e+01 30 57 60 74 78 -1 99884 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 11 3.793612e+01 30 57 60 74 90 -1 8 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 7 3.735476e+01 30 60 74 78 90 -1 7 3.101881e+01 57 60 74 78 90 -2 -2 2 5.000754e+01 0 30 57 60 74 78 90 -2 1 4.826373e+01 3 30 57 60 74 78 90 -2 13 4.346652e+01 12 30 57 60 74 78 90 -2 1 4.501102e+01 14 30 57 60 74 78 90 -2 4 4.699699e+01 30 32 57 60 74 78 90 -2 2 4.606816e+01 30 34 57 60 74 78 90 -2 3 4.600229e+01 30 35 57 60 74 78 90 -2 20 4.384998e+01 30 36 57 60 74 78 90 -2 3 4.592417e+01 30 40 57 60 74 78 90 -2 5 4.593938e+01 30 44 57 60 74 78 90 -2 12 4.459263e+01 30 57 59 60 74 78 90 -2 5 4.492432e+01 30 57 60 62 74 78 90 -2 1 4.865774e+01 30 57 60 65 74 78 90 -2 13 4.455427e+01 30 57 60 66 74 78 90 -2 1 4.631319e+01 30 57 60 68 74 78 90 -2 3 4.549801e+01 30 57 60 69 74 78 90 -2 2 4.535831e+01 30 57 60 70 74 78 90 -2 1 4.449353e+01 30 57 60 74 76 78 90 -2 22 3.446418e+01 30 57 60 74 78 -2 99715 4.398003e+01 30 57 60 74 78 90 -2 11 4.424109e+01 30 57 60 74 78 90 91 -2 3 4.510340e+01 30 57 60 74 78 90 92 -2 27 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 19 3.735476e+01 30 60 74 78 90 -2 35 3.101881e+01 57 60 74 78 90 -3 -3 5 4.509987e+01 11 30 57 60 74 78 90 -3 28 4.346652e+01 12 30 57 60 74 78 90 -3 9 4.501102e+01 14 30 57 60 74 78 90 -3 1 4.699699e+01 30 32 57 60 74 78 90 -3 5 4.600229e+01 30 35 57 60 74 78 90 -3 23 4.384998e+01 30 36 57 60 74 78 90 -3 2 4.725090e+01 30 37 57 60 74 78 90 -3 5 4.593938e+01 30 44 57 60 74 78 90 -3 17 4.459263e+01 30 57 59 60 74 78 90 -3 10 4.492432e+01 30 57 60 62 74 78 90 -3 1 4.546417e+01 30 57 60 63 74 78 90 -3 18 4.455427e+01 30 57 60 66 74 78 90 -3 1 4.631319e+01 30 57 60 68 74 78 90 -3 6 4.549801e+01 30 57 60 69 74 78 90 -3 5 4.535831e+01 30 57 60 70 74 78 90 -3 3 4.603031e+01 30 57 60 71 74 78 90 -3 5 4.449353e+01 30 57 60 74 76 78 90 -3 60 3.446418e+01 30 57 60 74 78 -3 99409 4.398003e+01 30 57 60 74 78 90 -3 18 4.424109e+01 30 57 60 74 78 90 91 -3 10 4.510340e+01 30 57 60 74 78 90 92 -3 67 3.793612e+01 30 57 60 74 90 -3 63 3.527826e+01 30 57 60 78 90 -3 93 3.830013e+01 30 57 74 78 90 -3 50 3.735476e+01 30 60 74 78 90 -3 86 3.101881e+01 57 60 74 78 90 -1 -1 3 4.776004e+01 9 30 57 60 74 78 90 -1 4 4.509987e+01 11 30 57 60 74 78 90 -1 2 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.501102e+01 14 30 57 60 74 78 90 -1 7 4.600229e+01 30 35 57 60 74 78 90 -1 4 4.384998e+01 30 36 57 60 74 78 90 -1 3 4.725090e+01 30 37 57 60 74 78 90 -1 3 4.593938e+01 30 44 57 60 74 78 90 -1 4 4.602157e+01 30 56 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 8 4.492432e+01 30 57 60 62 74 78 90 -1 1 4.455427e+01 30 57 60 66 74 78 90 -1 3 4.535831e+01 30 57 60 70 74 78 90 -1 2 4.603031e+01 30 57 60 71 74 78 90 -1 9 4.449353e+01 30 57 60 74 76 78 90 -1 8 3.446418e+01 30 57 60 74 78 -1 99848 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 7 4.510340e+01 30 57 60 74 78 90 92 -1 2 4.672090e+01 30 57 60 74 78 90 98 -1 16 3.793612e+01 30 57 60 74 90 -1 14 3.527826e+01 30 57 60 78 90 -1 14 3.830013e+01 30 57 74 78 90 -1 14 3.735476e+01 30 60 74 78 90 -1 15 3.101881e+01 57 60 74 78 90 -2 -2 5 4.776004e+01 9 30 57 60 74 78 90 -2 5 4.509987e+01 11 30 57 60 74 78 90 -2 16 4.346652e+01 12 30 57 60 74 78 90 -2 6 4.501102e+01 14 30 57 60 74 78 90 -2 2 4.318341e+01 25 30 60 74 78 90 -2 1 4.600229e+01 30 35 57 60 74 78 90 -2 12 4.384998e+01 30 36 57 60 74 78 90 -2 5 4.602157e+01 30 56 57 60 74 78 90 -2 4 4.459263e+01 30 57 59 60 74 78 90 -2 9 4.492432e+01 30 57 60 62 74 78 90 -2 4 4.546417e+01 30 57 60 63 74 78 90 -2 2 4.455427e+01 30 57 60 66 74 78 90 -2 1 4.631319e+01 30 57 60 68 74 78 90 -2 1 4.549801e+01 30 57 60 69 74 78 90 -2 16 4.449353e+01 30 57 60 74 76 78 90 -2 30 3.446418e+01 30 57 60 74 78 -2 99654 4.398003e+01 30 57 60 74 78 90 -2 12 4.424109e+01 30 57 60 74 78 90 91 -2 8 4.510340e+01 30 57 60 74 78 90 92 -2 6 4.672090e+01 30 57 60 74 78 90 98 -2 44 3.793612e+01 30 57 60 74 90 -2 35 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 33 3.735476e+01 30 60 74 78 90 -2 44 3.101881e+01 57 60 74 78 90 -3 -3 8 4.509987e+01 11 30 57 60 74 78 90 -3 33 4.346652e+01 12 30 57 60 74 78 90 -3 8 4.501102e+01 14 30 57 60 74 78 90 -3 2 4.318341e+01 25 30 60 74 78 90 -3 2 4.699699e+01 30 32 57 60 74 78 90 -3 4 4.600229e+01 30 35 57 60 74 78 90 -3 11 4.384998e+01 30 36 57 60 74 78 90 -3 1 4.725090e+01 30 37 57 60 74 78 90 -3 4 4.602157e+01 30 56 57 60 74 78 90 -3 5 4.459263e+01 30 57 59 60 74 78 90 -3 2 4.593039e+01 30 57 60 61 74 78 90 -3 4 4.492432e+01 30 57 60 62 74 78 90 -3 12 4.546417e+01 30 57 60 63 74 78 90 -3 9 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.549801e+01 30 57 60 69 74 78 90 -3 2 4.535831e+01 30 57 60 70 74 78 90 -3 11 4.449353e+01 30 57 60 74 76 78 90 -3 85 3.446418e+01 30 57 60 74 78 -3 2 4.968682e+01 30 57 60 74 78 81 90 -3 99291 4.398003e+01 30 57 60 74 78 90 -3 12 4.424109e+01 30 57 60 74 78 90 91 -3 6 4.510340e+01 30 57 60 74 78 90 92 -3 88 3.793612e+01 30 57 60 74 90 -3 102 3.527826e+01 30 57 60 78 90 -3 3 3.981796e+01 30 57 63 74 78 90 -3 91 3.830013e+01 30 57 74 78 90 -3 89 3.735476e+01 30 60 74 78 90 -3 110 3.101881e+01 57 60 74 78 90 +1 2 4.888530e+01 1,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.662988e+01 13,30,57,60,74,78,90 +1 5 4.501102e+01 14,30,57,60,74,78,90 +1 1 4.606816e+01 30,34,57,60,74,78,90 +1 6 4.600229e+01 30,35,57,60,74,78,90 +1 6 4.384998e+01 30,36,57,60,74,78,90 +1 4 4.593938e+01 30,44,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 2 4.492432e+01 30,57,60,62,74,78,90 +1 7 4.455427e+01 30,57,60,66,74,78,90 +1 2 4.631319e+01 30,57,60,68,74,78,90 +1 8 4.535831e+01 30,57,60,70,74,78,90 +1 2 4.603031e+01 30,57,60,71,74,78,90 +1 10 3.446418e+01 30,57,60,74,78 +1 99884 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 11 3.793612e+01 30,57,60,74,90 +1 8 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 7 3.735476e+01 30,60,74,78,90 +1 7 3.101881e+01 57,60,74,78,90 +2 2 5.000754e+01 0,30,57,60,74,78,90 +2 1 4.826373e+01 3,30,57,60,74,78,90 +2 13 4.346652e+01 12,30,57,60,74,78,90 +2 1 4.501102e+01 14,30,57,60,74,78,90 +2 4 4.699699e+01 30,32,57,60,74,78,90 +2 2 4.606816e+01 30,34,57,60,74,78,90 +2 3 4.600229e+01 30,35,57,60,74,78,90 +2 20 4.384998e+01 30,36,57,60,74,78,90 +2 3 4.592417e+01 30,40,57,60,74,78,90 +2 5 4.593938e+01 30,44,57,60,74,78,90 +2 12 4.459263e+01 30,57,59,60,74,78,90 +2 5 4.492432e+01 30,57,60,62,74,78,90 +2 1 4.865774e+01 30,57,60,65,74,78,90 +2 13 4.455427e+01 30,57,60,66,74,78,90 +2 1 4.631319e+01 30,57,60,68,74,78,90 +2 3 4.549801e+01 30,57,60,69,74,78,90 +2 2 4.535831e+01 30,57,60,70,74,78,90 +2 1 4.449353e+01 30,57,60,74,76,78,90 +2 22 3.446418e+01 30,57,60,74,78 +2 99715 4.398003e+01 30,57,60,74,78,90 +2 11 4.424109e+01 30,57,60,74,78,90,91 +2 3 4.510340e+01 30,57,60,74,78,90,92 +2 27 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 19 3.735476e+01 30,60,74,78,90 +2 35 3.101881e+01 57,60,74,78,90 +3 5 4.509987e+01 11,30,57,60,74,78,90 +3 28 4.346652e+01 12,30,57,60,74,78,90 +3 9 4.501102e+01 14,30,57,60,74,78,90 +3 1 4.699699e+01 30,32,57,60,74,78,90 +3 5 4.600229e+01 30,35,57,60,74,78,90 +3 23 4.384998e+01 30,36,57,60,74,78,90 +3 2 4.725090e+01 30,37,57,60,74,78,90 +3 5 4.593938e+01 30,44,57,60,74,78,90 +3 17 4.459263e+01 30,57,59,60,74,78,90 +3 10 4.492432e+01 30,57,60,62,74,78,90 +3 1 4.546417e+01 30,57,60,63,74,78,90 +3 18 4.455427e+01 30,57,60,66,74,78,90 +3 1 4.631319e+01 30,57,60,68,74,78,90 +3 6 4.549801e+01 30,57,60,69,74,78,90 +3 5 4.535831e+01 30,57,60,70,74,78,90 +3 3 4.603031e+01 30,57,60,71,74,78,90 +3 5 4.449353e+01 30,57,60,74,76,78,90 +3 60 3.446418e+01 30,57,60,74,78 +3 99409 4.398003e+01 30,57,60,74,78,90 +3 18 4.424109e+01 30,57,60,74,78,90,91 +3 10 4.510340e+01 30,57,60,74,78,90,92 +3 67 3.793612e+01 30,57,60,74,90 +3 63 3.527826e+01 30,57,60,78,90 +3 93 3.830013e+01 30,57,74,78,90 +3 50 3.735476e+01 30,60,74,78,90 +3 86 3.101881e+01 57,60,74,78,90 +1 3 4.776004e+01 9,30,57,60,74,78,90 +1 4 4.509987e+01 11,30,57,60,74,78,90 +1 2 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.501102e+01 14,30,57,60,74,78,90 +1 7 4.600229e+01 30,35,57,60,74,78,90 +1 4 4.384998e+01 30,36,57,60,74,78,90 +1 3 4.725090e+01 30,37,57,60,74,78,90 +1 3 4.593938e+01 30,44,57,60,74,78,90 +1 4 4.602157e+01 30,56,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 8 4.492432e+01 30,57,60,62,74,78,90 +1 1 4.455427e+01 30,57,60,66,74,78,90 +1 3 4.535831e+01 30,57,60,70,74,78,90 +1 2 4.603031e+01 30,57,60,71,74,78,90 +1 9 4.449353e+01 30,57,60,74,76,78,90 +1 8 3.446418e+01 30,57,60,74,78 +1 99848 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 7 4.510340e+01 30,57,60,74,78,90,92 +1 2 4.672090e+01 30,57,60,74,78,90,98 +1 16 3.793612e+01 30,57,60,74,90 +1 14 3.527826e+01 30,57,60,78,90 +1 14 3.830013e+01 30,57,74,78,90 +1 14 3.735476e+01 30,60,74,78,90 +1 15 3.101881e+01 57,60,74,78,90 +2 5 4.776004e+01 9,30,57,60,74,78,90 +2 5 4.509987e+01 11,30,57,60,74,78,90 +2 16 4.346652e+01 12,30,57,60,74,78,90 +2 6 4.501102e+01 14,30,57,60,74,78,90 +2 2 4.318341e+01 25,30,60,74,78,90 +2 1 4.600229e+01 30,35,57,60,74,78,90 +2 12 4.384998e+01 30,36,57,60,74,78,90 +2 5 4.602157e+01 30,56,57,60,74,78,90 +2 4 4.459263e+01 30,57,59,60,74,78,90 +2 9 4.492432e+01 30,57,60,62,74,78,90 +2 4 4.546417e+01 30,57,60,63,74,78,90 +2 2 4.455427e+01 30,57,60,66,74,78,90 +2 1 4.631319e+01 30,57,60,68,74,78,90 +2 1 4.549801e+01 30,57,60,69,74,78,90 +2 16 4.449353e+01 30,57,60,74,76,78,90 +2 30 3.446418e+01 30,57,60,74,78 +2 99654 4.398003e+01 30,57,60,74,78,90 +2 12 4.424109e+01 30,57,60,74,78,90,91 +2 8 4.510340e+01 30,57,60,74,78,90,92 +2 6 4.672090e+01 30,57,60,74,78,90,98 +2 44 3.793612e+01 30,57,60,74,90 +2 35 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 33 3.735476e+01 30,60,74,78,90 +2 44 3.101881e+01 57,60,74,78,90 +3 8 4.509987e+01 11,30,57,60,74,78,90 +3 33 4.346652e+01 12,30,57,60,74,78,90 +3 8 4.501102e+01 14,30,57,60,74,78,90 +3 2 4.318341e+01 25,30,60,74,78,90 +3 2 4.699699e+01 30,32,57,60,74,78,90 +3 4 4.600229e+01 30,35,57,60,74,78,90 +3 11 4.384998e+01 30,36,57,60,74,78,90 +3 1 4.725090e+01 30,37,57,60,74,78,90 +3 4 4.602157e+01 30,56,57,60,74,78,90 +3 5 4.459263e+01 30,57,59,60,74,78,90 +3 2 4.593039e+01 30,57,60,61,74,78,90 +3 4 4.492432e+01 30,57,60,62,74,78,90 +3 12 4.546417e+01 30,57,60,63,74,78,90 +3 9 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.549801e+01 30,57,60,69,74,78,90 +3 2 4.535831e+01 30,57,60,70,74,78,90 +3 11 4.449353e+01 30,57,60,74,76,78,90 +3 85 3.446418e+01 30,57,60,74,78 +3 2 4.968682e+01 30,57,60,74,78,81,90 +3 99291 4.398003e+01 30,57,60,74,78,90 +3 12 4.424109e+01 30,57,60,74,78,90,91 +3 6 4.510340e+01 30,57,60,74,78,90,92 +3 88 3.793612e+01 30,57,60,74,90 +3 102 3.527826e+01 30,57,60,78,90 +3 3 3.981796e+01 30,57,63,74,78,90 +3 91 3.830013e+01 30,57,74,78,90 +3 89 3.735476e+01 30,60,74,78,90 +3 110 3.101881e+01 57,60,74,78,90 diff --git a/test/test1_01-10.test.expected-dat b/test/test1_01-10.test.expected-dat index adb286a..5c3cc1a 100644 --- a/test/test1_01-10.test.expected-dat +++ b/test/test1_01-10.test.expected-dat @@ -1,181 +1,175 @@ -1 -1 8 4.888530e+01 1 30 57 60 74 78 90 -1 5 4.846652e+01 12 30 57 60 74 78 90 -1 1 5.162988e+01 13 30 57 60 74 78 90 -1 4 5.001102e+01 14 30 57 60 74 78 90 -1 2 5.106816e+01 30 34 57 60 74 78 90 -1 6 5.100229e+01 30 35 57 60 74 78 90 -1 9 4.884998e+01 30 36 57 60 74 78 90 -1 1 5.093938e+01 30 44 57 60 74 78 90 -1 1 4.959263e+01 30 57 59 60 74 78 90 -1 5 4.992432e+01 30 57 60 62 74 78 90 -1 6 4.955427e+01 30 57 60 66 74 78 90 -1 4 5.131319e+01 30 57 60 68 74 78 90 -1 7 5.035831e+01 30 57 60 70 74 78 90 -1 1 5.103031e+01 30 57 60 71 74 78 90 -1 11 3.946418e+01 30 57 60 74 78 -1 99877 4.898003e+01 30 57 60 74 78 90 -1 4 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 13 4.330013e+01 30 57 74 78 90 -1 7 4.235476e+01 30 60 74 78 90 -1 7 3.601881e+01 57 60 74 78 90 -2 -2 4 5.000754e+01 0 30 57 60 74 78 90 -2 14 4.888530e+01 1 30 57 60 74 78 90 -2 5 5.009987e+01 11 30 57 60 74 78 90 -2 18 4.846652e+01 12 30 57 60 74 78 90 -2 11 5.001102e+01 14 30 57 60 74 78 90 -2 3 5.106816e+01 30 34 57 60 74 78 90 -2 3 5.100229e+01 30 35 57 60 74 78 90 -2 20 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.225090e+01 30 37 57 60 74 78 90 -2 2 5.093938e+01 30 44 57 60 74 78 90 -2 4 5.102157e+01 30 56 57 60 74 78 90 -2 5 4.959263e+01 30 57 59 60 74 78 90 -2 9 4.992432e+01 30 57 60 62 74 78 90 -2 2 5.046417e+01 30 57 60 63 74 78 90 -2 8 4.955427e+01 30 57 60 66 74 78 90 -2 2 5.049801e+01 30 57 60 69 74 78 90 -2 4 5.035831e+01 30 57 60 70 74 78 90 -2 1 5.103031e+01 30 57 60 71 74 78 90 -2 34 3.946418e+01 30 57 60 74 78 -2 99680 4.898003e+01 30 57 60 74 78 90 -2 7 4.924109e+01 30 57 60 74 78 90 91 -2 3 5.010340e+01 30 57 60 74 78 90 92 -2 2 5.331382e+01 30 57 60 74 78 90 97 -2 31 4.293612e+01 30 57 60 74 90 -2 32 4.027826e+01 30 57 60 78 90 -2 41 4.330013e+01 30 57 74 78 90 -2 19 4.235476e+01 30 60 74 78 90 -2 35 3.601881e+01 57 60 74 78 90 -3 -3 11 5.000754e+01 0 30 57 60 74 78 90 -3 19 4.888530e+01 1 30 57 60 74 78 90 -3 3 5.172672e+01 2 30 57 60 74 78 90 -3 3 5.326373e+01 3 30 57 60 74 78 90 -3 2 5.276004e+01 9 30 57 60 74 78 90 -3 5 5.009987e+01 11 30 57 60 74 78 90 -3 37 4.846652e+01 12 30 57 60 74 78 90 -3 3 5.162988e+01 13 30 57 60 74 78 90 -3 10 5.001102e+01 14 30 57 60 74 78 90 -3 4 5.106816e+01 30 34 57 60 74 78 90 -3 2 5.100229e+01 30 35 57 60 74 78 90 -3 26 4.884998e+01 30 36 57 60 74 78 90 -3 8 5.093938e+01 30 44 57 60 74 78 90 -3 1 5.102157e+01 30 56 57 60 74 78 90 -3 2 5.358783e+01 30 57 58 60 74 78 90 -3 10 4.959263e+01 30 57 59 60 74 78 90 -3 16 4.992432e+01 30 57 60 62 74 78 90 -3 3 5.046417e+01 30 57 60 63 74 78 90 -3 10 4.955427e+01 30 57 60 66 74 78 90 -3 3 5.131319e+01 30 57 60 68 74 78 90 -3 6 5.049801e+01 30 57 60 69 74 78 90 -3 2 5.035831e+01 30 57 60 70 74 78 90 -3 5 5.103031e+01 30 57 60 71 74 78 90 -3 4 4.949353e+01 30 57 60 74 76 78 90 -3 86 3.946418e+01 30 57 60 74 78 -3 99349 4.898003e+01 30 57 60 74 78 90 -3 13 4.924109e+01 30 57 60 74 78 90 91 -3 11 5.010340e+01 30 57 60 74 78 90 92 -3 69 4.293612e+01 30 57 60 74 90 -3 65 4.027826e+01 30 57 60 78 90 -3 80 4.330013e+01 30 57 74 78 90 -3 48 4.235476e+01 30 60 74 78 90 -3 1 4.677630e+01 57 60 74 78 79 90 -3 83 3.601881e+01 57 60 74 78 90 -1 -1 3 5.000754e+01 0 30 57 60 74 78 90 -1 8 4.888530e+01 1 30 57 60 74 78 90 -1 4 5.172672e+01 2 30 57 60 74 78 90 -1 2 5.242996e+01 4 30 57 60 74 78 90 -1 1 5.009987e+01 11 30 57 60 74 78 90 -1 7 4.846652e+01 12 30 57 60 74 78 90 -1 5 5.001102e+01 14 30 57 60 74 78 90 -1 2 5.199699e+01 30 32 57 60 74 78 90 -1 2 5.106816e+01 30 34 57 60 74 78 90 -1 2 5.100229e+01 30 35 57 60 74 78 90 -1 12 4.884998e+01 30 36 57 60 74 78 90 -1 2 5.225090e+01 30 37 57 60 74 78 90 -1 1 5.093938e+01 30 44 57 60 74 78 90 -1 2 5.624623e+01 30 54 57 60 74 78 90 -1 9 4.959263e+01 30 57 59 60 74 78 90 -1 2 5.093039e+01 30 57 60 61 74 78 90 -1 1 4.992432e+01 30 57 60 62 74 78 90 -1 5 5.131319e+01 30 57 60 68 74 78 90 -1 1 5.035831e+01 30 57 60 70 74 78 90 -1 3 4.949353e+01 30 57 60 74 76 78 90 -1 9 3.946418e+01 30 57 60 74 78 -1 99838 4.898003e+01 30 57 60 74 78 90 -1 14 4.924109e+01 30 57 60 74 78 90 91 -1 1 5.010340e+01 30 57 60 74 78 90 92 -1 2 5.172090e+01 30 57 60 74 78 90 98 -1 13 4.293612e+01 30 57 60 74 90 -1 13 4.027826e+01 30 57 60 78 90 -1 11 4.330013e+01 30 57 74 78 90 -1 16 4.235476e+01 30 60 74 78 90 -1 9 3.601881e+01 57 60 74 78 90 -2 -2 7 5.000754e+01 0 30 57 60 74 78 90 -2 7 4.888530e+01 1 30 57 60 74 78 90 -2 11 4.846652e+01 12 30 57 60 74 78 90 -2 1 5.106816e+01 30 34 57 60 74 78 90 -2 2 5.100229e+01 30 35 57 60 74 78 90 -2 20 4.884998e+01 30 36 57 60 74 78 90 -2 2 5.225090e+01 30 37 57 60 74 78 90 -2 2 5.093938e+01 30 44 57 60 74 78 90 -2 3 5.358783e+01 30 57 58 60 74 78 90 -2 12 4.959263e+01 30 57 59 60 74 78 90 -2 2 5.093039e+01 30 57 60 61 74 78 90 -2 3 4.992432e+01 30 57 60 62 74 78 90 -2 7 5.046417e+01 30 57 60 63 74 78 90 -2 2 5.131319e+01 30 57 60 68 74 78 90 -2 2 5.103031e+01 30 57 60 71 74 78 90 -2 5 4.949353e+01 30 57 60 74 76 78 90 -2 26 3.946418e+01 30 57 60 74 78 -2 99673 4.898003e+01 30 57 60 74 78 90 -2 28 4.924109e+01 30 57 60 74 78 90 91 -2 6 5.010340e+01 30 57 60 74 78 90 92 -2 2 5.172090e+01 30 57 60 74 78 90 98 -2 31 4.293612e+01 30 57 60 74 90 -2 39 4.027826e+01 30 57 60 78 90 -2 32 4.330013e+01 30 57 74 78 90 -2 2 4.462620e+01 30 59 60 74 78 90 -2 44 4.235476e+01 30 60 74 78 90 -2 26 3.601881e+01 57 60 74 78 90 -2 3 3.140493e+01 57 74 78 90 -3 -3 8 5.000754e+01 0 30 57 60 74 78 90 -3 15 4.888530e+01 1 30 57 60 74 78 90 -3 2 5.172672e+01 2 30 57 60 74 78 90 -3 3 5.242996e+01 4 30 57 60 74 78 90 -3 27 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.489658e+01 24 30 57 60 74 78 90 -3 3 4.211258e+01 30 34 57 60 78 90 -3 17 4.884998e+01 30 36 57 60 74 78 90 -3 5 5.092417e+01 30 40 57 60 74 78 90 -3 1 5.093938e+01 30 44 57 60 74 78 90 -3 1 5.102157e+01 30 56 57 60 74 78 90 -3 11 4.959263e+01 30 57 59 60 74 78 90 -3 3 5.093039e+01 30 57 60 61 74 78 90 -3 2 4.992432e+01 30 57 60 62 74 78 90 -3 6 5.046417e+01 30 57 60 63 74 78 90 -3 4 4.955427e+01 30 57 60 66 74 78 90 -3 2 5.049801e+01 30 57 60 69 74 78 90 -3 2 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.103031e+01 30 57 60 71 74 78 90 -3 6 4.949353e+01 30 57 60 74 76 78 90 -3 81 3.946418e+01 30 57 60 74 78 -3 99345 4.898003e+01 30 57 60 74 78 90 -3 16 4.924109e+01 30 57 60 74 78 90 91 -3 8 5.010340e+01 30 57 60 74 78 90 92 -3 71 4.293612e+01 30 57 60 74 90 -3 2 4.872315e+01 30 57 60 77 78 90 -3 100 4.027826e+01 30 57 60 78 90 -3 72 4.330013e+01 30 57 74 78 90 -3 4 4.462620e+01 30 59 60 74 78 90 -3 110 4.235476e+01 30 60 74 78 90 -3 63 3.601881e+01 57 60 74 78 90 -3 7 3.140493e+01 57 74 78 90 +1 8 4.888530e+01 1,30,57,60,74,78,90 +1 5 4.846652e+01 12,30,57,60,74,78,90 +1 1 5.162988e+01 13,30,57,60,74,78,90 +1 4 5.001102e+01 14,30,57,60,74,78,90 +1 2 5.106816e+01 30,34,57,60,74,78,90 +1 6 5.100229e+01 30,35,57,60,74,78,90 +1 9 4.884998e+01 30,36,57,60,74,78,90 +1 1 5.093938e+01 30,44,57,60,74,78,90 +1 1 4.959263e+01 30,57,59,60,74,78,90 +1 5 4.992432e+01 30,57,60,62,74,78,90 +1 6 4.955427e+01 30,57,60,66,74,78,90 +1 4 5.131319e+01 30,57,60,68,74,78,90 +1 7 5.035831e+01 30,57,60,70,74,78,90 +1 1 5.103031e+01 30,57,60,71,74,78,90 +1 11 3.946418e+01 30,57,60,74,78 +1 99877 4.898003e+01 30,57,60,74,78,90 +1 4 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 13 4.330013e+01 30,57,74,78,90 +1 7 4.235476e+01 30,60,74,78,90 +1 7 3.601881e+01 57,60,74,78,90 +2 4 5.000754e+01 0,30,57,60,74,78,90 +2 14 4.888530e+01 1,30,57,60,74,78,90 +2 5 5.009987e+01 11,30,57,60,74,78,90 +2 18 4.846652e+01 12,30,57,60,74,78,90 +2 11 5.001102e+01 14,30,57,60,74,78,90 +2 3 5.106816e+01 30,34,57,60,74,78,90 +2 3 5.100229e+01 30,35,57,60,74,78,90 +2 20 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.225090e+01 30,37,57,60,74,78,90 +2 2 5.093938e+01 30,44,57,60,74,78,90 +2 4 5.102157e+01 30,56,57,60,74,78,90 +2 5 4.959263e+01 30,57,59,60,74,78,90 +2 9 4.992432e+01 30,57,60,62,74,78,90 +2 2 5.046417e+01 30,57,60,63,74,78,90 +2 8 4.955427e+01 30,57,60,66,74,78,90 +2 2 5.049801e+01 30,57,60,69,74,78,90 +2 4 5.035831e+01 30,57,60,70,74,78,90 +2 1 5.103031e+01 30,57,60,71,74,78,90 +2 34 3.946418e+01 30,57,60,74,78 +2 99680 4.898003e+01 30,57,60,74,78,90 +2 7 4.924109e+01 30,57,60,74,78,90,91 +2 3 5.010340e+01 30,57,60,74,78,90,92 +2 2 5.331382e+01 30,57,60,74,78,90,97 +2 31 4.293612e+01 30,57,60,74,90 +2 32 4.027826e+01 30,57,60,78,90 +2 41 4.330013e+01 30,57,74,78,90 +2 19 4.235476e+01 30,60,74,78,90 +2 35 3.601881e+01 57,60,74,78,90 +3 11 5.000754e+01 0,30,57,60,74,78,90 +3 19 4.888530e+01 1,30,57,60,74,78,90 +3 3 5.172672e+01 2,30,57,60,74,78,90 +3 3 5.326373e+01 3,30,57,60,74,78,90 +3 2 5.276004e+01 9,30,57,60,74,78,90 +3 5 5.009987e+01 11,30,57,60,74,78,90 +3 37 4.846652e+01 12,30,57,60,74,78,90 +3 3 5.162988e+01 13,30,57,60,74,78,90 +3 10 5.001102e+01 14,30,57,60,74,78,90 +3 4 5.106816e+01 30,34,57,60,74,78,90 +3 2 5.100229e+01 30,35,57,60,74,78,90 +3 26 4.884998e+01 30,36,57,60,74,78,90 +3 8 5.093938e+01 30,44,57,60,74,78,90 +3 1 5.102157e+01 30,56,57,60,74,78,90 +3 2 5.358783e+01 30,57,58,60,74,78,90 +3 10 4.959263e+01 30,57,59,60,74,78,90 +3 16 4.992432e+01 30,57,60,62,74,78,90 +3 3 5.046417e+01 30,57,60,63,74,78,90 +3 10 4.955427e+01 30,57,60,66,74,78,90 +3 3 5.131319e+01 30,57,60,68,74,78,90 +3 6 5.049801e+01 30,57,60,69,74,78,90 +3 2 5.035831e+01 30,57,60,70,74,78,90 +3 5 5.103031e+01 30,57,60,71,74,78,90 +3 4 4.949353e+01 30,57,60,74,76,78,90 +3 86 3.946418e+01 30,57,60,74,78 +3 99349 4.898003e+01 30,57,60,74,78,90 +3 13 4.924109e+01 30,57,60,74,78,90,91 +3 11 5.010340e+01 30,57,60,74,78,90,92 +3 69 4.293612e+01 30,57,60,74,90 +3 65 4.027826e+01 30,57,60,78,90 +3 80 4.330013e+01 30,57,74,78,90 +3 48 4.235476e+01 30,60,74,78,90 +3 1 4.677630e+01 57,60,74,78,79,90 +3 83 3.601881e+01 57,60,74,78,90 +1 3 5.000754e+01 0,30,57,60,74,78,90 +1 8 4.888530e+01 1,30,57,60,74,78,90 +1 4 5.172672e+01 2,30,57,60,74,78,90 +1 2 5.242996e+01 4,30,57,60,74,78,90 +1 1 5.009987e+01 11,30,57,60,74,78,90 +1 7 4.846652e+01 12,30,57,60,74,78,90 +1 5 5.001102e+01 14,30,57,60,74,78,90 +1 2 5.199699e+01 30,32,57,60,74,78,90 +1 2 5.106816e+01 30,34,57,60,74,78,90 +1 2 5.100229e+01 30,35,57,60,74,78,90 +1 12 4.884998e+01 30,36,57,60,74,78,90 +1 2 5.225090e+01 30,37,57,60,74,78,90 +1 1 5.093938e+01 30,44,57,60,74,78,90 +1 2 5.624623e+01 30,54,57,60,74,78,90 +1 9 4.959263e+01 30,57,59,60,74,78,90 +1 2 5.093039e+01 30,57,60,61,74,78,90 +1 1 4.992432e+01 30,57,60,62,74,78,90 +1 5 5.131319e+01 30,57,60,68,74,78,90 +1 1 5.035831e+01 30,57,60,70,74,78,90 +1 3 4.949353e+01 30,57,60,74,76,78,90 +1 9 3.946418e+01 30,57,60,74,78 +1 99838 4.898003e+01 30,57,60,74,78,90 +1 14 4.924109e+01 30,57,60,74,78,90,91 +1 1 5.010340e+01 30,57,60,74,78,90,92 +1 2 5.172090e+01 30,57,60,74,78,90,98 +1 13 4.293612e+01 30,57,60,74,90 +1 13 4.027826e+01 30,57,60,78,90 +1 11 4.330013e+01 30,57,74,78,90 +1 16 4.235476e+01 30,60,74,78,90 +1 9 3.601881e+01 57,60,74,78,90 +2 7 5.000754e+01 0,30,57,60,74,78,90 +2 7 4.888530e+01 1,30,57,60,74,78,90 +2 11 4.846652e+01 12,30,57,60,74,78,90 +2 1 5.106816e+01 30,34,57,60,74,78,90 +2 2 5.100229e+01 30,35,57,60,74,78,90 +2 20 4.884998e+01 30,36,57,60,74,78,90 +2 2 5.225090e+01 30,37,57,60,74,78,90 +2 2 5.093938e+01 30,44,57,60,74,78,90 +2 3 5.358783e+01 30,57,58,60,74,78,90 +2 12 4.959263e+01 30,57,59,60,74,78,90 +2 2 5.093039e+01 30,57,60,61,74,78,90 +2 3 4.992432e+01 30,57,60,62,74,78,90 +2 7 5.046417e+01 30,57,60,63,74,78,90 +2 2 5.131319e+01 30,57,60,68,74,78,90 +2 2 5.103031e+01 30,57,60,71,74,78,90 +2 5 4.949353e+01 30,57,60,74,76,78,90 +2 26 3.946418e+01 30,57,60,74,78 +2 99673 4.898003e+01 30,57,60,74,78,90 +2 28 4.924109e+01 30,57,60,74,78,90,91 +2 6 5.010340e+01 30,57,60,74,78,90,92 +2 2 5.172090e+01 30,57,60,74,78,90,98 +2 31 4.293612e+01 30,57,60,74,90 +2 39 4.027826e+01 30,57,60,78,90 +2 32 4.330013e+01 30,57,74,78,90 +2 2 4.462620e+01 30,59,60,74,78,90 +2 44 4.235476e+01 30,60,74,78,90 +2 26 3.601881e+01 57,60,74,78,90 +2 3 3.140493e+01 57,74,78,90 +3 8 5.000754e+01 0,30,57,60,74,78,90 +3 15 4.888530e+01 1,30,57,60,74,78,90 +3 2 5.172672e+01 2,30,57,60,74,78,90 +3 3 5.242996e+01 4,30,57,60,74,78,90 +3 27 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.489658e+01 24,30,57,60,74,78,90 +3 3 4.211258e+01 30,34,57,60,78,90 +3 17 4.884998e+01 30,36,57,60,74,78,90 +3 5 5.092417e+01 30,40,57,60,74,78,90 +3 1 5.093938e+01 30,44,57,60,74,78,90 +3 1 5.102157e+01 30,56,57,60,74,78,90 +3 11 4.959263e+01 30,57,59,60,74,78,90 +3 3 5.093039e+01 30,57,60,61,74,78,90 +3 2 4.992432e+01 30,57,60,62,74,78,90 +3 6 5.046417e+01 30,57,60,63,74,78,90 +3 4 4.955427e+01 30,57,60,66,74,78,90 +3 2 5.049801e+01 30,57,60,69,74,78,90 +3 2 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.103031e+01 30,57,60,71,74,78,90 +3 6 4.949353e+01 30,57,60,74,76,78,90 +3 81 3.946418e+01 30,57,60,74,78 +3 99345 4.898003e+01 30,57,60,74,78,90 +3 16 4.924109e+01 30,57,60,74,78,90,91 +3 8 5.010340e+01 30,57,60,74,78,90,92 +3 71 4.293612e+01 30,57,60,74,90 +3 2 4.872315e+01 30,57,60,77,78,90 +3 100 4.027826e+01 30,57,60,78,90 +3 72 4.330013e+01 30,57,74,78,90 +3 4 4.462620e+01 30,59,60,74,78,90 +3 110 4.235476e+01 30,60,74,78,90 +3 63 3.601881e+01 57,60,74,78,90 +3 7 3.140493e+01 57,74,78,90 diff --git a/test/test1_01-11.test.expected-dat b/test/test1_01-11.test.expected-dat index 50a46de..6e1de7e 100644 --- a/test/test1_01-11.test.expected-dat +++ b/test/test1_01-11.test.expected-dat @@ -1,160 +1,154 @@ -1 -1 2 4.888530e+01 1 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.662988e+01 13 30 57 60 74 78 90 -1 5 4.501102e+01 14 30 57 60 74 78 90 -1 1 4.606816e+01 30 34 57 60 74 78 90 -1 6 4.600229e+01 30 35 57 60 74 78 90 -1 6 4.384998e+01 30 36 57 60 74 78 90 -1 4 4.593938e+01 30 44 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 2 4.492432e+01 30 57 60 62 74 78 90 -1 7 4.455427e+01 30 57 60 66 74 78 90 -1 2 4.631319e+01 30 57 60 68 74 78 90 -1 8 4.535831e+01 30 57 60 70 74 78 90 -1 2 4.603031e+01 30 57 60 71 74 78 90 -1 10 3.446418e+01 30 57 60 74 78 -1 99884 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 11 3.793612e+01 30 57 60 74 90 -1 8 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 7 3.735476e+01 30 60 74 78 90 -1 7 3.101881e+01 57 60 74 78 90 -2 -2 2 5.000754e+01 0 30 57 60 74 78 90 -2 1 4.826373e+01 3 30 57 60 74 78 90 -2 13 4.346652e+01 12 30 57 60 74 78 90 -2 1 4.501102e+01 14 30 57 60 74 78 90 -2 4 4.699699e+01 30 32 57 60 74 78 90 -2 2 4.606816e+01 30 34 57 60 74 78 90 -2 3 4.600229e+01 30 35 57 60 74 78 90 -2 20 4.384998e+01 30 36 57 60 74 78 90 -2 3 4.592417e+01 30 40 57 60 74 78 90 -2 5 4.593938e+01 30 44 57 60 74 78 90 -2 12 4.459263e+01 30 57 59 60 74 78 90 -2 5 4.492432e+01 30 57 60 62 74 78 90 -2 1 4.865774e+01 30 57 60 65 74 78 90 -2 13 4.455427e+01 30 57 60 66 74 78 90 -2 1 4.631319e+01 30 57 60 68 74 78 90 -2 3 4.549801e+01 30 57 60 69 74 78 90 -2 2 4.535831e+01 30 57 60 70 74 78 90 -2 1 4.449353e+01 30 57 60 74 76 78 90 -2 22 3.446418e+01 30 57 60 74 78 -2 99715 4.398003e+01 30 57 60 74 78 90 -2 11 4.424109e+01 30 57 60 74 78 90 91 -2 3 4.510340e+01 30 57 60 74 78 90 92 -2 27 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 19 3.735476e+01 30 60 74 78 90 -2 35 3.101881e+01 57 60 74 78 90 -3 -3 5 4.509987e+01 11 30 57 60 74 78 90 -3 28 4.346652e+01 12 30 57 60 74 78 90 -3 9 4.501102e+01 14 30 57 60 74 78 90 -3 1 4.699699e+01 30 32 57 60 74 78 90 -3 5 4.600229e+01 30 35 57 60 74 78 90 -3 23 4.384998e+01 30 36 57 60 74 78 90 -3 2 4.725090e+01 30 37 57 60 74 78 90 -3 5 4.593938e+01 30 44 57 60 74 78 90 -3 17 4.459263e+01 30 57 59 60 74 78 90 -3 10 4.492432e+01 30 57 60 62 74 78 90 -3 1 4.546417e+01 30 57 60 63 74 78 90 -3 18 4.455427e+01 30 57 60 66 74 78 90 -3 1 4.631319e+01 30 57 60 68 74 78 90 -3 6 4.549801e+01 30 57 60 69 74 78 90 -3 5 4.535831e+01 30 57 60 70 74 78 90 -3 3 4.603031e+01 30 57 60 71 74 78 90 -3 5 4.449353e+01 30 57 60 74 76 78 90 -3 60 3.446418e+01 30 57 60 74 78 -3 99409 4.398003e+01 30 57 60 74 78 90 -3 18 4.424109e+01 30 57 60 74 78 90 91 -3 10 4.510340e+01 30 57 60 74 78 90 92 -3 67 3.793612e+01 30 57 60 74 90 -3 63 3.527826e+01 30 57 60 78 90 -3 93 3.830013e+01 30 57 74 78 90 -3 50 3.735476e+01 30 60 74 78 90 -3 86 3.101881e+01 57 60 74 78 90 -1 -1 3 4.776004e+01 9 30 57 60 74 78 90 -1 4 4.509987e+01 11 30 57 60 74 78 90 -1 2 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.501102e+01 14 30 57 60 74 78 90 -1 7 4.600229e+01 30 35 57 60 74 78 90 -1 4 4.384998e+01 30 36 57 60 74 78 90 -1 3 4.725090e+01 30 37 57 60 74 78 90 -1 3 4.593938e+01 30 44 57 60 74 78 90 -1 4 4.602157e+01 30 56 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 8 4.492432e+01 30 57 60 62 74 78 90 -1 1 4.455427e+01 30 57 60 66 74 78 90 -1 3 4.535831e+01 30 57 60 70 74 78 90 -1 2 4.603031e+01 30 57 60 71 74 78 90 -1 9 4.449353e+01 30 57 60 74 76 78 90 -1 8 3.446418e+01 30 57 60 74 78 -1 99848 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 7 4.510340e+01 30 57 60 74 78 90 92 -1 2 4.672090e+01 30 57 60 74 78 90 98 -1 16 3.793612e+01 30 57 60 74 90 -1 14 3.527826e+01 30 57 60 78 90 -1 14 3.830013e+01 30 57 74 78 90 -1 14 3.735476e+01 30 60 74 78 90 -1 15 3.101881e+01 57 60 74 78 90 -2 -2 5 4.776004e+01 9 30 57 60 74 78 90 -2 5 4.509987e+01 11 30 57 60 74 78 90 -2 16 4.346652e+01 12 30 57 60 74 78 90 -2 6 4.501102e+01 14 30 57 60 74 78 90 -2 2 4.318341e+01 25 30 60 74 78 90 -2 1 4.600229e+01 30 35 57 60 74 78 90 -2 12 4.384998e+01 30 36 57 60 74 78 90 -2 5 4.602157e+01 30 56 57 60 74 78 90 -2 4 4.459263e+01 30 57 59 60 74 78 90 -2 9 4.492432e+01 30 57 60 62 74 78 90 -2 4 4.546417e+01 30 57 60 63 74 78 90 -2 2 4.455427e+01 30 57 60 66 74 78 90 -2 1 4.631319e+01 30 57 60 68 74 78 90 -2 1 4.549801e+01 30 57 60 69 74 78 90 -2 16 4.449353e+01 30 57 60 74 76 78 90 -2 30 3.446418e+01 30 57 60 74 78 -2 99654 4.398003e+01 30 57 60 74 78 90 -2 12 4.424109e+01 30 57 60 74 78 90 91 -2 8 4.510340e+01 30 57 60 74 78 90 92 -2 6 4.672090e+01 30 57 60 74 78 90 98 -2 44 3.793612e+01 30 57 60 74 90 -2 35 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 33 3.735476e+01 30 60 74 78 90 -2 44 3.101881e+01 57 60 74 78 90 -3 -3 8 4.509987e+01 11 30 57 60 74 78 90 -3 33 4.346652e+01 12 30 57 60 74 78 90 -3 8 4.501102e+01 14 30 57 60 74 78 90 -3 2 4.318341e+01 25 30 60 74 78 90 -3 2 4.699699e+01 30 32 57 60 74 78 90 -3 4 4.600229e+01 30 35 57 60 74 78 90 -3 11 4.384998e+01 30 36 57 60 74 78 90 -3 1 4.725090e+01 30 37 57 60 74 78 90 -3 4 4.602157e+01 30 56 57 60 74 78 90 -3 5 4.459263e+01 30 57 59 60 74 78 90 -3 2 4.593039e+01 30 57 60 61 74 78 90 -3 4 4.492432e+01 30 57 60 62 74 78 90 -3 12 4.546417e+01 30 57 60 63 74 78 90 -3 9 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.549801e+01 30 57 60 69 74 78 90 -3 2 4.535831e+01 30 57 60 70 74 78 90 -3 11 4.449353e+01 30 57 60 74 76 78 90 -3 85 3.446418e+01 30 57 60 74 78 -3 2 4.968682e+01 30 57 60 74 78 81 90 -3 99291 4.398003e+01 30 57 60 74 78 90 -3 12 4.424109e+01 30 57 60 74 78 90 91 -3 6 4.510340e+01 30 57 60 74 78 90 92 -3 88 3.793612e+01 30 57 60 74 90 -3 102 3.527826e+01 30 57 60 78 90 -3 3 3.981796e+01 30 57 63 74 78 90 -3 91 3.830013e+01 30 57 74 78 90 -3 89 3.735476e+01 30 60 74 78 90 -3 110 3.101881e+01 57 60 74 78 90 +1 2 4.888530e+01 1,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.662988e+01 13,30,57,60,74,78,90 +1 5 4.501102e+01 14,30,57,60,74,78,90 +1 1 4.606816e+01 30,34,57,60,74,78,90 +1 6 4.600229e+01 30,35,57,60,74,78,90 +1 6 4.384998e+01 30,36,57,60,74,78,90 +1 4 4.593938e+01 30,44,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 2 4.492432e+01 30,57,60,62,74,78,90 +1 7 4.455427e+01 30,57,60,66,74,78,90 +1 2 4.631319e+01 30,57,60,68,74,78,90 +1 8 4.535831e+01 30,57,60,70,74,78,90 +1 2 4.603031e+01 30,57,60,71,74,78,90 +1 10 3.446418e+01 30,57,60,74,78 +1 99884 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 11 3.793612e+01 30,57,60,74,90 +1 8 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 7 3.735476e+01 30,60,74,78,90 +1 7 3.101881e+01 57,60,74,78,90 +2 2 5.000754e+01 0,30,57,60,74,78,90 +2 1 4.826373e+01 3,30,57,60,74,78,90 +2 13 4.346652e+01 12,30,57,60,74,78,90 +2 1 4.501102e+01 14,30,57,60,74,78,90 +2 4 4.699699e+01 30,32,57,60,74,78,90 +2 2 4.606816e+01 30,34,57,60,74,78,90 +2 3 4.600229e+01 30,35,57,60,74,78,90 +2 20 4.384998e+01 30,36,57,60,74,78,90 +2 3 4.592417e+01 30,40,57,60,74,78,90 +2 5 4.593938e+01 30,44,57,60,74,78,90 +2 12 4.459263e+01 30,57,59,60,74,78,90 +2 5 4.492432e+01 30,57,60,62,74,78,90 +2 1 4.865774e+01 30,57,60,65,74,78,90 +2 13 4.455427e+01 30,57,60,66,74,78,90 +2 1 4.631319e+01 30,57,60,68,74,78,90 +2 3 4.549801e+01 30,57,60,69,74,78,90 +2 2 4.535831e+01 30,57,60,70,74,78,90 +2 1 4.449353e+01 30,57,60,74,76,78,90 +2 22 3.446418e+01 30,57,60,74,78 +2 99715 4.398003e+01 30,57,60,74,78,90 +2 11 4.424109e+01 30,57,60,74,78,90,91 +2 3 4.510340e+01 30,57,60,74,78,90,92 +2 27 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 19 3.735476e+01 30,60,74,78,90 +2 35 3.101881e+01 57,60,74,78,90 +3 5 4.509987e+01 11,30,57,60,74,78,90 +3 28 4.346652e+01 12,30,57,60,74,78,90 +3 9 4.501102e+01 14,30,57,60,74,78,90 +3 1 4.699699e+01 30,32,57,60,74,78,90 +3 5 4.600229e+01 30,35,57,60,74,78,90 +3 23 4.384998e+01 30,36,57,60,74,78,90 +3 2 4.725090e+01 30,37,57,60,74,78,90 +3 5 4.593938e+01 30,44,57,60,74,78,90 +3 17 4.459263e+01 30,57,59,60,74,78,90 +3 10 4.492432e+01 30,57,60,62,74,78,90 +3 1 4.546417e+01 30,57,60,63,74,78,90 +3 18 4.455427e+01 30,57,60,66,74,78,90 +3 1 4.631319e+01 30,57,60,68,74,78,90 +3 6 4.549801e+01 30,57,60,69,74,78,90 +3 5 4.535831e+01 30,57,60,70,74,78,90 +3 3 4.603031e+01 30,57,60,71,74,78,90 +3 5 4.449353e+01 30,57,60,74,76,78,90 +3 60 3.446418e+01 30,57,60,74,78 +3 99409 4.398003e+01 30,57,60,74,78,90 +3 18 4.424109e+01 30,57,60,74,78,90,91 +3 10 4.510340e+01 30,57,60,74,78,90,92 +3 67 3.793612e+01 30,57,60,74,90 +3 63 3.527826e+01 30,57,60,78,90 +3 93 3.830013e+01 30,57,74,78,90 +3 50 3.735476e+01 30,60,74,78,90 +3 86 3.101881e+01 57,60,74,78,90 +1 3 4.776004e+01 9,30,57,60,74,78,90 +1 4 4.509987e+01 11,30,57,60,74,78,90 +1 2 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.501102e+01 14,30,57,60,74,78,90 +1 7 4.600229e+01 30,35,57,60,74,78,90 +1 4 4.384998e+01 30,36,57,60,74,78,90 +1 3 4.725090e+01 30,37,57,60,74,78,90 +1 3 4.593938e+01 30,44,57,60,74,78,90 +1 4 4.602157e+01 30,56,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 8 4.492432e+01 30,57,60,62,74,78,90 +1 1 4.455427e+01 30,57,60,66,74,78,90 +1 3 4.535831e+01 30,57,60,70,74,78,90 +1 2 4.603031e+01 30,57,60,71,74,78,90 +1 9 4.449353e+01 30,57,60,74,76,78,90 +1 8 3.446418e+01 30,57,60,74,78 +1 99848 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 7 4.510340e+01 30,57,60,74,78,90,92 +1 2 4.672090e+01 30,57,60,74,78,90,98 +1 16 3.793612e+01 30,57,60,74,90 +1 14 3.527826e+01 30,57,60,78,90 +1 14 3.830013e+01 30,57,74,78,90 +1 14 3.735476e+01 30,60,74,78,90 +1 15 3.101881e+01 57,60,74,78,90 +2 5 4.776004e+01 9,30,57,60,74,78,90 +2 5 4.509987e+01 11,30,57,60,74,78,90 +2 16 4.346652e+01 12,30,57,60,74,78,90 +2 6 4.501102e+01 14,30,57,60,74,78,90 +2 2 4.318341e+01 25,30,60,74,78,90 +2 1 4.600229e+01 30,35,57,60,74,78,90 +2 12 4.384998e+01 30,36,57,60,74,78,90 +2 5 4.602157e+01 30,56,57,60,74,78,90 +2 4 4.459263e+01 30,57,59,60,74,78,90 +2 9 4.492432e+01 30,57,60,62,74,78,90 +2 4 4.546417e+01 30,57,60,63,74,78,90 +2 2 4.455427e+01 30,57,60,66,74,78,90 +2 1 4.631319e+01 30,57,60,68,74,78,90 +2 1 4.549801e+01 30,57,60,69,74,78,90 +2 16 4.449353e+01 30,57,60,74,76,78,90 +2 30 3.446418e+01 30,57,60,74,78 +2 99654 4.398003e+01 30,57,60,74,78,90 +2 12 4.424109e+01 30,57,60,74,78,90,91 +2 8 4.510340e+01 30,57,60,74,78,90,92 +2 6 4.672090e+01 30,57,60,74,78,90,98 +2 44 3.793612e+01 30,57,60,74,90 +2 35 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 33 3.735476e+01 30,60,74,78,90 +2 44 3.101881e+01 57,60,74,78,90 +3 8 4.509987e+01 11,30,57,60,74,78,90 +3 33 4.346652e+01 12,30,57,60,74,78,90 +3 8 4.501102e+01 14,30,57,60,74,78,90 +3 2 4.318341e+01 25,30,60,74,78,90 +3 2 4.699699e+01 30,32,57,60,74,78,90 +3 4 4.600229e+01 30,35,57,60,74,78,90 +3 11 4.384998e+01 30,36,57,60,74,78,90 +3 1 4.725090e+01 30,37,57,60,74,78,90 +3 4 4.602157e+01 30,56,57,60,74,78,90 +3 5 4.459263e+01 30,57,59,60,74,78,90 +3 2 4.593039e+01 30,57,60,61,74,78,90 +3 4 4.492432e+01 30,57,60,62,74,78,90 +3 12 4.546417e+01 30,57,60,63,74,78,90 +3 9 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.549801e+01 30,57,60,69,74,78,90 +3 2 4.535831e+01 30,57,60,70,74,78,90 +3 11 4.449353e+01 30,57,60,74,76,78,90 +3 85 3.446418e+01 30,57,60,74,78 +3 2 4.968682e+01 30,57,60,74,78,81,90 +3 99291 4.398003e+01 30,57,60,74,78,90 +3 12 4.424109e+01 30,57,60,74,78,90,91 +3 6 4.510340e+01 30,57,60,74,78,90,92 +3 88 3.793612e+01 30,57,60,74,90 +3 102 3.527826e+01 30,57,60,78,90 +3 3 3.981796e+01 30,57,63,74,78,90 +3 91 3.830013e+01 30,57,74,78,90 +3 89 3.735476e+01 30,60,74,78,90 +3 110 3.101881e+01 57,60,74,78,90 diff --git a/test/test1_10-00.test.expected-dat b/test/test1_10-00.test.expected-dat index b6df57c..9634ce9 100644 --- a/test/test1_10-00.test.expected-dat +++ b/test/test1_10-00.test.expected-dat @@ -1,204 +1,198 @@ -1 -1 2 5.388530e+01 1 30 57 60 74 78 90 -1 4 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.162988e+01 13 30 57 60 74 78 90 -1 5 5.001102e+01 14 30 57 60 74 78 90 -1 7 4.489658e+01 24 30 57 60 74 78 90 -1 10 4.480868e+01 25 30 57 60 74 78 90 -1 18 4.697990e+01 26 30 57 60 74 78 90 -1 12 4.721079e+01 27 30 57 60 74 78 90 -1 7 4.710177e+01 28 30 57 60 74 78 90 -1 17 4.303401e+01 29 30 57 60 74 78 90 -1 5 4.636270e+01 30 31 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 2 5.106816e+01 30 34 57 60 74 78 90 -1 7 5.100229e+01 30 35 57 60 74 78 90 -1 8 4.884998e+01 30 36 57 60 74 78 90 -1 2 5.093938e+01 30 44 57 60 74 78 90 -1 1 4.959263e+01 30 57 59 60 74 78 90 -1 2 4.992432e+01 30 57 60 62 74 78 90 -1 7 4.955427e+01 30 57 60 66 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 5 5.035831e+01 30 57 60 70 74 78 90 -1 5 5.103031e+01 30 57 60 71 74 78 90 -1 11 3.946418e+01 30 57 60 74 78 -1 99800 4.898003e+01 30 57 60 74 78 90 -1 3 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 14 4.330013e+01 30 57 74 78 90 -1 6 4.235476e+01 30 60 74 78 90 -1 8 4.101881e+01 57 60 74 78 90 -2 -2 6 5.009987e+01 11 30 57 60 74 78 90 -2 9 4.846652e+01 12 30 57 60 74 78 90 -2 6 5.001102e+01 14 30 57 60 74 78 90 -2 30 4.489658e+01 24 30 57 60 74 78 90 -2 31 4.480868e+01 25 30 57 60 74 78 90 -2 30 4.697990e+01 26 30 57 60 74 78 90 -2 30 4.721079e+01 27 30 57 60 74 78 90 -2 25 4.710177e+01 28 30 57 60 74 78 90 -2 48 4.303401e+01 29 30 57 60 74 78 90 -2 32 4.636270e+01 30 31 57 60 74 78 90 -2 24 4.199699e+01 30 32 57 60 74 78 90 -2 2 5.106816e+01 30 34 57 60 74 78 90 -2 5 5.100229e+01 30 35 57 60 74 78 90 -2 16 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.225090e+01 30 37 57 60 74 78 90 -2 2 5.092417e+01 30 40 57 60 74 78 90 -2 1 5.102157e+01 30 56 57 60 74 78 90 -2 14 4.959263e+01 30 57 59 60 74 78 90 -2 7 4.992432e+01 30 57 60 62 74 78 90 -2 3 5.046417e+01 30 57 60 63 74 78 90 -2 9 4.955427e+01 30 57 60 66 74 78 90 -2 2 5.131319e+01 30 57 60 68 74 78 90 -2 6 5.035831e+01 30 57 60 70 74 78 90 -2 3 5.103031e+01 30 57 60 71 74 78 90 -2 2 4.949353e+01 30 57 60 74 76 78 90 -2 38 3.946418e+01 30 57 60 74 78 -2 99457 4.898003e+01 30 57 60 74 78 90 -2 9 4.924109e+01 30 57 60 74 78 90 91 -2 27 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 46 4.330013e+01 30 57 74 78 90 -2 17 4.235476e+01 30 60 74 78 90 -2 31 4.101881e+01 57 60 74 78 90 -3 -3 3 4.520192e+01 0 30 57 60 74 78 -3 11 5.009987e+01 11 30 57 60 74 78 90 -3 27 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.001102e+01 14 30 57 60 74 78 90 -3 61 4.489658e+01 24 30 57 60 74 78 90 -3 73 4.480868e+01 25 30 57 60 74 78 90 -3 62 4.697990e+01 26 30 57 60 74 78 90 -3 75 4.721079e+01 27 30 57 60 74 78 90 -3 50 4.710177e+01 28 30 57 60 74 78 90 -3 102 4.303401e+01 29 30 57 60 74 78 90 -3 77 4.636270e+01 30 31 57 60 74 78 90 -3 59 4.199699e+01 30 32 57 60 74 78 90 -3 2 5.106816e+01 30 34 57 60 74 78 90 -3 3 5.100229e+01 30 35 57 60 74 78 90 -3 26 4.884998e+01 30 36 57 60 74 78 90 -3 3 5.093938e+01 30 44 57 60 74 78 90 -3 14 4.959263e+01 30 57 59 60 74 78 90 -3 2 5.093039e+01 30 57 60 61 74 78 90 -3 2 4.992432e+01 30 57 60 62 74 78 90 -3 6 5.046417e+01 30 57 60 63 74 78 90 -3 1 4.955427e+01 30 57 60 66 74 78 90 -3 3 5.049801e+01 30 57 60 69 74 78 90 -3 1 5.035831e+01 30 57 60 70 74 78 90 -3 3 5.103031e+01 30 57 60 71 74 78 90 -3 13 4.949353e+01 30 57 60 74 76 78 90 -3 95 3.946418e+01 30 57 60 74 78 -3 98854 4.898003e+01 30 57 60 74 78 90 -3 16 4.924109e+01 30 57 60 74 78 90 91 -3 4 5.010340e+01 30 57 60 74 78 90 92 -3 69 4.293612e+01 30 57 60 74 90 -3 62 4.027826e+01 30 57 60 78 90 -3 98 4.330013e+01 30 57 74 78 90 -3 39 4.235476e+01 30 60 74 78 90 -3 83 4.101881e+01 57 60 74 78 90 -1 -1 2 5.009987e+01 11 30 57 60 74 78 90 -1 7 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.162988e+01 13 30 57 60 74 78 90 -1 6 5.001102e+01 14 30 57 60 74 78 90 -1 20 4.489658e+01 24 30 57 60 74 78 90 -1 6 4.480868e+01 25 30 57 60 74 78 90 -1 4 4.697990e+01 26 30 57 60 74 78 90 -1 13 4.721079e+01 27 30 57 60 74 78 90 -1 10 4.710177e+01 28 30 57 60 74 78 90 -1 6 4.303401e+01 29 30 57 60 74 78 90 -1 16 4.636270e+01 30 31 57 60 74 78 90 -1 12 4.199699e+01 30 32 57 60 74 78 90 -1 14 4.884998e+01 30 36 57 60 74 78 90 -1 2 5.093938e+01 30 44 57 60 74 78 90 -1 1 5.102157e+01 30 56 57 60 74 78 90 -1 5 4.992432e+01 30 57 60 62 74 78 90 -1 4 4.955427e+01 30 57 60 66 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 3 5.049801e+01 30 57 60 69 74 78 90 -1 10 5.035831e+01 30 57 60 70 74 78 90 -1 2 4.949353e+01 30 57 60 74 76 78 90 -1 16 3.946418e+01 30 57 60 74 78 -1 1 5.322720e+01 30 57 60 74 78 86 90 -1 99757 4.898003e+01 30 57 60 74 78 90 -1 6 4.924109e+01 30 57 60 74 78 90 91 -1 5 5.010340e+01 30 57 60 74 78 90 92 -1 14 4.293612e+01 30 57 60 74 90 -1 10 4.027826e+01 30 57 60 78 90 -1 12 4.330013e+01 30 57 74 78 90 -1 19 4.235476e+01 30 60 74 78 90 -1 12 4.101881e+01 57 60 74 78 90 -2 -2 24 4.846652e+01 12 30 57 60 74 78 90 -2 2 5.162988e+01 13 30 57 60 74 78 90 -2 2 5.001102e+01 14 30 57 60 74 78 90 -2 60 4.489658e+01 24 30 57 60 74 78 90 -2 16 4.480868e+01 25 30 57 60 74 78 90 -2 15 4.697990e+01 26 30 57 60 74 78 90 -2 33 4.721079e+01 27 30 57 60 74 78 90 -2 30 4.710177e+01 28 30 57 60 74 78 90 -2 21 4.303401e+01 29 30 57 60 74 78 90 -2 32 4.636270e+01 30 31 57 60 74 78 90 -2 41 4.199699e+01 30 32 57 60 74 78 90 -2 2 5.106816e+01 30 34 57 60 74 78 90 -2 23 4.884998e+01 30 36 57 60 74 78 90 -2 4 5.093938e+01 30 44 57 60 74 78 90 -2 4 4.959263e+01 30 57 59 60 74 78 90 -2 6 4.992432e+01 30 57 60 62 74 78 90 -2 1 5.046417e+01 30 57 60 63 74 78 90 -2 10 4.955427e+01 30 57 60 66 74 78 90 -2 4 5.131319e+01 30 57 60 68 74 78 90 -2 3 5.049801e+01 30 57 60 69 74 78 90 -2 6 5.035831e+01 30 57 60 70 74 78 90 -2 2 5.103031e+01 30 57 60 71 74 78 90 -2 11 4.949353e+01 30 57 60 74 76 78 90 -2 50 3.946418e+01 30 57 60 74 78 -2 99377 4.898003e+01 30 57 60 74 78 90 -2 17 4.924109e+01 30 57 60 74 78 90 91 -2 5 5.010340e+01 30 57 60 74 78 90 92 -2 39 4.293612e+01 30 57 60 74 90 -2 32 4.027826e+01 30 57 60 78 90 -2 37 4.330013e+01 30 57 74 78 90 -2 49 4.235476e+01 30 60 74 78 90 -2 42 4.101881e+01 57 60 74 78 90 -3 -3 2 5.097160e+01 8 30 57 60 78 90 -3 3 5.009987e+01 11 30 57 60 74 78 90 -3 47 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.162988e+01 13 30 57 60 74 78 90 -3 2 5.001102e+01 14 30 57 60 74 78 90 -3 135 4.489658e+01 24 30 57 60 74 78 90 -3 49 4.480868e+01 25 30 57 60 74 78 90 -3 44 4.697990e+01 26 30 57 60 74 78 90 -3 68 4.721079e+01 27 30 57 60 74 78 90 -3 55 4.710177e+01 28 30 57 60 74 78 90 -3 44 4.303401e+01 29 30 57 60 74 78 90 -3 82 4.636270e+01 30 31 57 60 74 78 90 -3 86 4.199699e+01 30 32 57 60 74 78 90 -3 2 5.106816e+01 30 34 57 60 74 78 90 -3 18 4.884998e+01 30 36 57 60 74 78 90 -3 1 4.207300e+01 30 38 57 60 74 78 -3 1 5.271108e+01 30 38 57 60 74 78 90 -3 3 5.093938e+01 30 44 57 60 74 78 90 -3 6 4.959263e+01 30 57 59 60 74 78 90 -3 5 5.093039e+01 30 57 60 61 74 78 90 -3 2 4.992432e+01 30 57 60 62 74 78 90 -3 6 5.046417e+01 30 57 60 63 74 78 90 -3 17 4.955427e+01 30 57 60 66 74 78 90 -3 5 5.049801e+01 30 57 60 69 74 78 90 -3 13 4.949353e+01 30 57 60 74 76 78 90 -3 126 3.946418e+01 30 57 60 74 78 -3 4 5.301417e+01 30 57 60 74 78 87 90 -3 98669 4.898003e+01 30 57 60 74 78 90 -3 11 4.924109e+01 30 57 60 74 78 90 91 -3 4 5.010340e+01 30 57 60 74 78 90 92 -3 3 5.172090e+01 30 57 60 74 78 90 98 -3 82 4.293612e+01 30 57 60 74 90 -3 95 4.027826e+01 30 57 60 78 90 -3 84 4.330013e+01 30 57 74 78 90 -3 119 4.235476e+01 30 60 74 78 90 -3 2 4.433957e+01 57 60 74 78 87 90 -3 104 4.101881e+01 57 60 74 78 90 +1 2 5.388530e+01 1,30,57,60,74,78,90 +1 4 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.162988e+01 13,30,57,60,74,78,90 +1 5 5.001102e+01 14,30,57,60,74,78,90 +1 7 4.489658e+01 24,30,57,60,74,78,90 +1 10 4.480868e+01 25,30,57,60,74,78,90 +1 18 4.697990e+01 26,30,57,60,74,78,90 +1 12 4.721079e+01 27,30,57,60,74,78,90 +1 7 4.710177e+01 28,30,57,60,74,78,90 +1 17 4.303401e+01 29,30,57,60,74,78,90 +1 5 4.636270e+01 30,31,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 2 5.106816e+01 30,34,57,60,74,78,90 +1 7 5.100229e+01 30,35,57,60,74,78,90 +1 8 4.884998e+01 30,36,57,60,74,78,90 +1 2 5.093938e+01 30,44,57,60,74,78,90 +1 1 4.959263e+01 30,57,59,60,74,78,90 +1 2 4.992432e+01 30,57,60,62,74,78,90 +1 7 4.955427e+01 30,57,60,66,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 5 5.035831e+01 30,57,60,70,74,78,90 +1 5 5.103031e+01 30,57,60,71,74,78,90 +1 11 3.946418e+01 30,57,60,74,78 +1 99800 4.898003e+01 30,57,60,74,78,90 +1 3 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 14 4.330013e+01 30,57,74,78,90 +1 6 4.235476e+01 30,60,74,78,90 +1 8 4.101881e+01 57,60,74,78,90 +2 6 5.009987e+01 11,30,57,60,74,78,90 +2 9 4.846652e+01 12,30,57,60,74,78,90 +2 6 5.001102e+01 14,30,57,60,74,78,90 +2 30 4.489658e+01 24,30,57,60,74,78,90 +2 31 4.480868e+01 25,30,57,60,74,78,90 +2 30 4.697990e+01 26,30,57,60,74,78,90 +2 30 4.721079e+01 27,30,57,60,74,78,90 +2 25 4.710177e+01 28,30,57,60,74,78,90 +2 48 4.303401e+01 29,30,57,60,74,78,90 +2 32 4.636270e+01 30,31,57,60,74,78,90 +2 24 4.199699e+01 30,32,57,60,74,78,90 +2 2 5.106816e+01 30,34,57,60,74,78,90 +2 5 5.100229e+01 30,35,57,60,74,78,90 +2 16 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.225090e+01 30,37,57,60,74,78,90 +2 2 5.092417e+01 30,40,57,60,74,78,90 +2 1 5.102157e+01 30,56,57,60,74,78,90 +2 14 4.959263e+01 30,57,59,60,74,78,90 +2 7 4.992432e+01 30,57,60,62,74,78,90 +2 3 5.046417e+01 30,57,60,63,74,78,90 +2 9 4.955427e+01 30,57,60,66,74,78,90 +2 2 5.131319e+01 30,57,60,68,74,78,90 +2 6 5.035831e+01 30,57,60,70,74,78,90 +2 3 5.103031e+01 30,57,60,71,74,78,90 +2 2 4.949353e+01 30,57,60,74,76,78,90 +2 38 3.946418e+01 30,57,60,74,78 +2 99457 4.898003e+01 30,57,60,74,78,90 +2 9 4.924109e+01 30,57,60,74,78,90,91 +2 27 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 46 4.330013e+01 30,57,74,78,90 +2 17 4.235476e+01 30,60,74,78,90 +2 31 4.101881e+01 57,60,74,78,90 +3 3 4.520192e+01 0,30,57,60,74,78 +3 11 5.009987e+01 11,30,57,60,74,78,90 +3 27 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.001102e+01 14,30,57,60,74,78,90 +3 61 4.489658e+01 24,30,57,60,74,78,90 +3 73 4.480868e+01 25,30,57,60,74,78,90 +3 62 4.697990e+01 26,30,57,60,74,78,90 +3 75 4.721079e+01 27,30,57,60,74,78,90 +3 50 4.710177e+01 28,30,57,60,74,78,90 +3 102 4.303401e+01 29,30,57,60,74,78,90 +3 77 4.636270e+01 30,31,57,60,74,78,90 +3 59 4.199699e+01 30,32,57,60,74,78,90 +3 2 5.106816e+01 30,34,57,60,74,78,90 +3 3 5.100229e+01 30,35,57,60,74,78,90 +3 26 4.884998e+01 30,36,57,60,74,78,90 +3 3 5.093938e+01 30,44,57,60,74,78,90 +3 14 4.959263e+01 30,57,59,60,74,78,90 +3 2 5.093039e+01 30,57,60,61,74,78,90 +3 2 4.992432e+01 30,57,60,62,74,78,90 +3 6 5.046417e+01 30,57,60,63,74,78,90 +3 1 4.955427e+01 30,57,60,66,74,78,90 +3 3 5.049801e+01 30,57,60,69,74,78,90 +3 1 5.035831e+01 30,57,60,70,74,78,90 +3 3 5.103031e+01 30,57,60,71,74,78,90 +3 13 4.949353e+01 30,57,60,74,76,78,90 +3 95 3.946418e+01 30,57,60,74,78 +3 98854 4.898003e+01 30,57,60,74,78,90 +3 16 4.924109e+01 30,57,60,74,78,90,91 +3 4 5.010340e+01 30,57,60,74,78,90,92 +3 69 4.293612e+01 30,57,60,74,90 +3 62 4.027826e+01 30,57,60,78,90 +3 98 4.330013e+01 30,57,74,78,90 +3 39 4.235476e+01 30,60,74,78,90 +3 83 4.101881e+01 57,60,74,78,90 +1 2 5.009987e+01 11,30,57,60,74,78,90 +1 7 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.162988e+01 13,30,57,60,74,78,90 +1 6 5.001102e+01 14,30,57,60,74,78,90 +1 20 4.489658e+01 24,30,57,60,74,78,90 +1 6 4.480868e+01 25,30,57,60,74,78,90 +1 4 4.697990e+01 26,30,57,60,74,78,90 +1 13 4.721079e+01 27,30,57,60,74,78,90 +1 10 4.710177e+01 28,30,57,60,74,78,90 +1 6 4.303401e+01 29,30,57,60,74,78,90 +1 16 4.636270e+01 30,31,57,60,74,78,90 +1 12 4.199699e+01 30,32,57,60,74,78,90 +1 14 4.884998e+01 30,36,57,60,74,78,90 +1 2 5.093938e+01 30,44,57,60,74,78,90 +1 1 5.102157e+01 30,56,57,60,74,78,90 +1 5 4.992432e+01 30,57,60,62,74,78,90 +1 4 4.955427e+01 30,57,60,66,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 3 5.049801e+01 30,57,60,69,74,78,90 +1 10 5.035831e+01 30,57,60,70,74,78,90 +1 2 4.949353e+01 30,57,60,74,76,78,90 +1 16 3.946418e+01 30,57,60,74,78 +1 1 5.322720e+01 30,57,60,74,78,86,90 +1 99757 4.898003e+01 30,57,60,74,78,90 +1 6 4.924109e+01 30,57,60,74,78,90,91 +1 5 5.010340e+01 30,57,60,74,78,90,92 +1 14 4.293612e+01 30,57,60,74,90 +1 10 4.027826e+01 30,57,60,78,90 +1 12 4.330013e+01 30,57,74,78,90 +1 19 4.235476e+01 30,60,74,78,90 +1 12 4.101881e+01 57,60,74,78,90 +2 24 4.846652e+01 12,30,57,60,74,78,90 +2 2 5.162988e+01 13,30,57,60,74,78,90 +2 2 5.001102e+01 14,30,57,60,74,78,90 +2 60 4.489658e+01 24,30,57,60,74,78,90 +2 16 4.480868e+01 25,30,57,60,74,78,90 +2 15 4.697990e+01 26,30,57,60,74,78,90 +2 33 4.721079e+01 27,30,57,60,74,78,90 +2 30 4.710177e+01 28,30,57,60,74,78,90 +2 21 4.303401e+01 29,30,57,60,74,78,90 +2 32 4.636270e+01 30,31,57,60,74,78,90 +2 41 4.199699e+01 30,32,57,60,74,78,90 +2 2 5.106816e+01 30,34,57,60,74,78,90 +2 23 4.884998e+01 30,36,57,60,74,78,90 +2 4 5.093938e+01 30,44,57,60,74,78,90 +2 4 4.959263e+01 30,57,59,60,74,78,90 +2 6 4.992432e+01 30,57,60,62,74,78,90 +2 1 5.046417e+01 30,57,60,63,74,78,90 +2 10 4.955427e+01 30,57,60,66,74,78,90 +2 4 5.131319e+01 30,57,60,68,74,78,90 +2 3 5.049801e+01 30,57,60,69,74,78,90 +2 6 5.035831e+01 30,57,60,70,74,78,90 +2 2 5.103031e+01 30,57,60,71,74,78,90 +2 11 4.949353e+01 30,57,60,74,76,78,90 +2 50 3.946418e+01 30,57,60,74,78 +2 99377 4.898003e+01 30,57,60,74,78,90 +2 17 4.924109e+01 30,57,60,74,78,90,91 +2 5 5.010340e+01 30,57,60,74,78,90,92 +2 39 4.293612e+01 30,57,60,74,90 +2 32 4.027826e+01 30,57,60,78,90 +2 37 4.330013e+01 30,57,74,78,90 +2 49 4.235476e+01 30,60,74,78,90 +2 42 4.101881e+01 57,60,74,78,90 +3 2 5.097160e+01 8,30,57,60,78,90 +3 3 5.009987e+01 11,30,57,60,74,78,90 +3 47 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.162988e+01 13,30,57,60,74,78,90 +3 2 5.001102e+01 14,30,57,60,74,78,90 +3 135 4.489658e+01 24,30,57,60,74,78,90 +3 49 4.480868e+01 25,30,57,60,74,78,90 +3 44 4.697990e+01 26,30,57,60,74,78,90 +3 68 4.721079e+01 27,30,57,60,74,78,90 +3 55 4.710177e+01 28,30,57,60,74,78,90 +3 44 4.303401e+01 29,30,57,60,74,78,90 +3 82 4.636270e+01 30,31,57,60,74,78,90 +3 86 4.199699e+01 30,32,57,60,74,78,90 +3 2 5.106816e+01 30,34,57,60,74,78,90 +3 18 4.884998e+01 30,36,57,60,74,78,90 +3 1 4.207300e+01 30,38,57,60,74,78 +3 1 5.271108e+01 30,38,57,60,74,78,90 +3 3 5.093938e+01 30,44,57,60,74,78,90 +3 6 4.959263e+01 30,57,59,60,74,78,90 +3 5 5.093039e+01 30,57,60,61,74,78,90 +3 2 4.992432e+01 30,57,60,62,74,78,90 +3 6 5.046417e+01 30,57,60,63,74,78,90 +3 17 4.955427e+01 30,57,60,66,74,78,90 +3 5 5.049801e+01 30,57,60,69,74,78,90 +3 13 4.949353e+01 30,57,60,74,76,78,90 +3 126 3.946418e+01 30,57,60,74,78 +3 4 5.301417e+01 30,57,60,74,78,87,90 +3 98669 4.898003e+01 30,57,60,74,78,90 +3 11 4.924109e+01 30,57,60,74,78,90,91 +3 4 5.010340e+01 30,57,60,74,78,90,92 +3 3 5.172090e+01 30,57,60,74,78,90,98 +3 82 4.293612e+01 30,57,60,74,90 +3 95 4.027826e+01 30,57,60,78,90 +3 84 4.330013e+01 30,57,74,78,90 +3 119 4.235476e+01 30,60,74,78,90 +3 2 4.433957e+01 57,60,74,78,87,90 +3 104 4.101881e+01 57,60,74,78,90 diff --git a/test/test1_10-01.test.expected-dat b/test/test1_10-01.test.expected-dat index 1b4ab93..bed38d7 100644 --- a/test/test1_10-01.test.expected-dat +++ b/test/test1_10-01.test.expected-dat @@ -1,189 +1,183 @@ -1 -1 2 4.888530e+01 1 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.662988e+01 13 30 57 60 74 78 90 -1 5 4.501102e+01 14 30 57 60 74 78 90 -1 1 4.489658e+01 24 30 57 60 74 78 90 -1 2 4.480868e+01 25 30 57 60 74 78 90 -1 2 4.710177e+01 28 30 57 60 74 78 90 -1 12 4.303401e+01 29 30 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 1 4.606816e+01 30 34 57 60 74 78 90 -1 8 4.600229e+01 30 35 57 60 74 78 90 -1 9 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 1 4.492432e+01 30 57 60 62 74 78 90 -1 5 4.455427e+01 30 57 60 66 74 78 90 -1 2 4.631319e+01 30 57 60 68 74 78 90 -1 10 4.535831e+01 30 57 60 70 74 78 90 -1 1 4.603031e+01 30 57 60 71 74 78 90 -1 10 3.446418e+01 30 57 60 74 78 -1 99860 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 11 3.793612e+01 30 57 60 74 90 -1 8 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 7 3.735476e+01 30 60 74 78 90 -1 7 3.601881e+01 57 60 74 78 90 -2 -2 2 5.000754e+01 0 30 57 60 74 78 90 -2 7 4.509987e+01 11 30 57 60 74 78 90 -2 15 4.346652e+01 12 30 57 60 74 78 90 -2 2 4.662988e+01 13 30 57 60 74 78 90 -2 5 4.501102e+01 14 30 57 60 74 78 90 -2 3 4.489658e+01 24 30 57 60 74 78 90 -2 6 4.480868e+01 25 30 57 60 74 78 90 -2 3 4.721079e+01 27 30 57 60 74 78 90 -2 32 4.303401e+01 29 30 57 60 74 78 90 -2 4 4.636270e+01 30 31 57 60 74 78 90 -2 13 4.199699e+01 30 32 57 60 74 78 90 -2 3 4.606816e+01 30 34 57 60 74 78 90 -2 3 4.600229e+01 30 35 57 60 74 78 90 -2 18 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.592417e+01 30 40 57 60 74 78 90 -2 2 4.593938e+01 30 44 57 60 74 78 90 -2 14 4.459263e+01 30 57 59 60 74 78 90 -2 5 4.492432e+01 30 57 60 62 74 78 90 -2 2 4.865774e+01 30 57 60 65 74 78 90 -2 11 4.455427e+01 30 57 60 66 74 78 90 -2 2 4.631319e+01 30 57 60 68 74 78 90 -2 2 4.549801e+01 30 57 60 69 74 78 90 -2 2 4.535831e+01 30 57 60 70 74 78 90 -2 1 4.449353e+01 30 57 60 74 76 78 90 -2 29 3.446418e+01 30 57 60 74 78 -2 99642 4.398003e+01 30 57 60 74 78 90 -2 11 4.424109e+01 30 57 60 74 78 90 91 -2 3 4.510340e+01 30 57 60 74 78 90 92 -2 27 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 19 3.735476e+01 30 60 74 78 90 -2 35 3.601881e+01 57 60 74 78 90 -3 -3 14 4.509987e+01 11 30 57 60 74 78 90 -3 38 4.346652e+01 12 30 57 60 74 78 90 -3 4 4.501102e+01 14 30 57 60 74 78 90 -3 6 4.489658e+01 24 30 57 60 74 78 90 -3 4 4.480868e+01 25 30 57 60 74 78 90 -3 4 4.710177e+01 28 30 57 60 74 78 90 -3 57 4.303401e+01 29 30 57 60 74 78 90 -3 35 4.199699e+01 30 32 57 60 74 78 90 -3 7 4.606816e+01 30 34 57 60 74 78 90 -3 3 4.600229e+01 30 35 57 60 74 78 90 -3 22 4.384998e+01 30 36 57 60 74 78 90 -3 4 4.602157e+01 30 56 57 60 74 78 90 -3 6 4.459263e+01 30 57 59 60 74 78 90 -3 10 4.492432e+01 30 57 60 62 74 78 90 -3 2 4.546417e+01 30 57 60 63 74 78 90 -3 12 4.455427e+01 30 57 60 66 74 78 90 -3 5 4.631319e+01 30 57 60 68 74 78 90 -3 5 4.535831e+01 30 57 60 70 74 78 90 -3 6 4.603031e+01 30 57 60 71 74 78 90 -3 15 4.449353e+01 30 57 60 74 76 78 90 -3 70 3.446418e+01 30 57 60 74 78 -3 1 4.857980e+01 30 57 60 74 78 82 90 -3 99294 4.398003e+01 30 57 60 74 78 90 -3 17 4.424109e+01 30 57 60 74 78 90 91 -3 3 4.510340e+01 30 57 60 74 78 90 92 -3 65 3.793612e+01 30 57 60 74 90 -3 63 3.527826e+01 30 57 60 78 90 -3 92 3.830013e+01 30 57 74 78 90 -3 47 3.735476e+01 30 60 74 78 90 -3 89 3.601881e+01 57 60 74 78 90 -1 -1 2 4.776004e+01 9 30 57 60 74 78 90 -1 1 4.509987e+01 11 30 57 60 74 78 90 -1 7 4.346652e+01 12 30 57 60 74 78 90 -1 8 4.501102e+01 14 30 57 60 74 78 90 -1 12 4.489658e+01 24 30 57 60 74 78 90 -1 1 4.721079e+01 27 30 57 60 74 78 90 -1 6 4.303401e+01 29 30 57 60 74 78 90 -1 1 4.636270e+01 30 31 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 1 4.600229e+01 30 35 57 60 74 78 90 -1 7 4.384998e+01 30 36 57 60 74 78 90 -1 5 4.771108e+01 30 38 57 60 74 78 90 -1 2 4.592417e+01 30 40 57 60 74 78 90 -1 2 4.602157e+01 30 56 57 60 74 78 90 -1 8 4.459263e+01 30 57 59 60 74 78 90 -1 3 4.593039e+01 30 57 60 61 74 78 90 -1 6 4.492432e+01 30 57 60 62 74 78 90 -1 2 4.825409e+01 30 57 60 64 74 78 90 -1 3 4.549801e+01 30 57 60 69 74 78 90 -1 3 4.535831e+01 30 57 60 70 74 78 90 -1 6 4.603031e+01 30 57 60 71 74 78 90 -1 2 4.449353e+01 30 57 60 74 76 78 90 -1 13 3.446418e+01 30 57 60 74 78 -1 99813 4.398003e+01 30 57 60 74 78 90 -1 7 4.424109e+01 30 57 60 74 78 90 91 -1 1 4.510340e+01 30 57 60 74 78 90 92 -1 2 4.672090e+01 30 57 60 74 78 90 98 -1 16 3.793612e+01 30 57 60 74 90 -1 12 3.527826e+01 30 57 60 78 90 -1 12 3.830013e+01 30 57 74 78 90 -1 18 3.735476e+01 30 60 74 78 90 -1 12 3.601881e+01 57 60 74 78 90 -2 -2 22 4.346652e+01 12 30 57 60 74 78 90 -2 6 4.501102e+01 14 30 57 60 74 78 90 -2 6 4.489658e+01 24 30 57 60 74 78 90 -2 2 4.480868e+01 25 30 57 60 74 78 90 -2 2 4.710177e+01 28 30 57 60 74 78 90 -2 22 4.303401e+01 29 30 57 60 74 78 90 -2 25 4.199699e+01 30 32 57 60 74 78 90 -2 17 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.771108e+01 30 38 57 60 74 78 90 -2 2 4.592417e+01 30 40 57 60 74 78 90 -2 3 4.593938e+01 30 44 57 60 74 78 90 -2 7 4.459263e+01 30 57 59 60 74 78 90 -2 1 4.593039e+01 30 57 60 61 74 78 90 -2 1 4.492432e+01 30 57 60 62 74 78 90 -2 1 4.546417e+01 30 57 60 63 74 78 90 -2 7 4.455427e+01 30 57 60 66 74 78 90 -2 10 4.603031e+01 30 57 60 71 74 78 90 -2 12 4.449353e+01 30 57 60 74 76 78 90 -2 47 3.446418e+01 30 57 60 74 78 -2 99586 4.398003e+01 30 57 60 74 78 90 -2 2 4.424109e+01 30 57 60 74 78 90 91 -2 10 4.510340e+01 30 57 60 74 78 90 92 -2 2 4.672090e+01 30 57 60 74 78 90 98 -2 44 3.793612e+01 30 57 60 74 90 -2 37 3.527826e+01 30 57 60 78 90 -2 39 3.830013e+01 30 57 74 78 90 -2 44 3.735476e+01 30 60 74 78 90 -2 42 3.601881e+01 57 60 74 78 90 -3 -3 48 4.346652e+01 12 30 57 60 74 78 90 -3 6 4.501102e+01 14 30 57 60 74 78 90 -3 3 4.709925e+01 18 30 57 60 74 78 90 -3 11 4.489658e+01 24 30 57 60 74 78 90 -3 9 4.480868e+01 25 30 57 60 74 78 90 -3 30 4.303401e+01 29 30 57 60 74 78 90 -3 50 4.199699e+01 30 32 57 60 74 78 90 -3 4 4.606816e+01 30 34 57 60 74 78 90 -3 3 4.600229e+01 30 35 57 60 74 78 90 -3 23 4.384998e+01 30 36 57 60 74 78 90 -3 3 4.725090e+01 30 37 57 60 74 78 90 -3 1 4.602157e+01 30 56 57 60 74 78 90 -3 12 4.459263e+01 30 57 59 60 74 78 90 -3 4 4.593039e+01 30 57 60 61 74 78 90 -3 3 4.492432e+01 30 57 60 62 74 78 90 -3 6 4.546417e+01 30 57 60 63 74 78 90 -3 2 4.865774e+01 30 57 60 65 74 78 90 -3 9 4.455427e+01 30 57 60 66 74 78 90 -3 4 4.549801e+01 30 57 60 69 74 78 90 -3 1 4.535831e+01 30 57 60 70 74 78 90 -3 1 4.603031e+01 30 57 60 71 74 78 90 -3 9 4.449353e+01 30 57 60 74 76 78 90 -3 122 3.446418e+01 30 57 60 74 78 -3 1 4.857980e+01 30 57 60 74 78 82 90 -3 99113 4.398003e+01 30 57 60 74 78 90 -3 9 4.510340e+01 30 57 60 74 78 90 92 -3 4 4.672090e+01 30 57 60 74 78 90 98 -3 92 3.793612e+01 30 57 60 74 90 -3 110 3.527826e+01 30 57 60 78 90 -3 92 3.830013e+01 30 57 74 78 90 -3 108 3.735476e+01 30 60 74 78 90 -3 107 3.601881e+01 57 60 74 78 90 +1 2 4.888530e+01 1,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.662988e+01 13,30,57,60,74,78,90 +1 5 4.501102e+01 14,30,57,60,74,78,90 +1 1 4.489658e+01 24,30,57,60,74,78,90 +1 2 4.480868e+01 25,30,57,60,74,78,90 +1 2 4.710177e+01 28,30,57,60,74,78,90 +1 12 4.303401e+01 29,30,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 1 4.606816e+01 30,34,57,60,74,78,90 +1 8 4.600229e+01 30,35,57,60,74,78,90 +1 9 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 1 4.492432e+01 30,57,60,62,74,78,90 +1 5 4.455427e+01 30,57,60,66,74,78,90 +1 2 4.631319e+01 30,57,60,68,74,78,90 +1 10 4.535831e+01 30,57,60,70,74,78,90 +1 1 4.603031e+01 30,57,60,71,74,78,90 +1 10 3.446418e+01 30,57,60,74,78 +1 99860 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 11 3.793612e+01 30,57,60,74,90 +1 8 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 7 3.735476e+01 30,60,74,78,90 +1 7 3.601881e+01 57,60,74,78,90 +2 2 5.000754e+01 0,30,57,60,74,78,90 +2 7 4.509987e+01 11,30,57,60,74,78,90 +2 15 4.346652e+01 12,30,57,60,74,78,90 +2 2 4.662988e+01 13,30,57,60,74,78,90 +2 5 4.501102e+01 14,30,57,60,74,78,90 +2 3 4.489658e+01 24,30,57,60,74,78,90 +2 6 4.480868e+01 25,30,57,60,74,78,90 +2 3 4.721079e+01 27,30,57,60,74,78,90 +2 32 4.303401e+01 29,30,57,60,74,78,90 +2 4 4.636270e+01 30,31,57,60,74,78,90 +2 13 4.199699e+01 30,32,57,60,74,78,90 +2 3 4.606816e+01 30,34,57,60,74,78,90 +2 3 4.600229e+01 30,35,57,60,74,78,90 +2 18 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.592417e+01 30,40,57,60,74,78,90 +2 2 4.593938e+01 30,44,57,60,74,78,90 +2 14 4.459263e+01 30,57,59,60,74,78,90 +2 5 4.492432e+01 30,57,60,62,74,78,90 +2 2 4.865774e+01 30,57,60,65,74,78,90 +2 11 4.455427e+01 30,57,60,66,74,78,90 +2 2 4.631319e+01 30,57,60,68,74,78,90 +2 2 4.549801e+01 30,57,60,69,74,78,90 +2 2 4.535831e+01 30,57,60,70,74,78,90 +2 1 4.449353e+01 30,57,60,74,76,78,90 +2 29 3.446418e+01 30,57,60,74,78 +2 99642 4.398003e+01 30,57,60,74,78,90 +2 11 4.424109e+01 30,57,60,74,78,90,91 +2 3 4.510340e+01 30,57,60,74,78,90,92 +2 27 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 19 3.735476e+01 30,60,74,78,90 +2 35 3.601881e+01 57,60,74,78,90 +3 14 4.509987e+01 11,30,57,60,74,78,90 +3 38 4.346652e+01 12,30,57,60,74,78,90 +3 4 4.501102e+01 14,30,57,60,74,78,90 +3 6 4.489658e+01 24,30,57,60,74,78,90 +3 4 4.480868e+01 25,30,57,60,74,78,90 +3 4 4.710177e+01 28,30,57,60,74,78,90 +3 57 4.303401e+01 29,30,57,60,74,78,90 +3 35 4.199699e+01 30,32,57,60,74,78,90 +3 7 4.606816e+01 30,34,57,60,74,78,90 +3 3 4.600229e+01 30,35,57,60,74,78,90 +3 22 4.384998e+01 30,36,57,60,74,78,90 +3 4 4.602157e+01 30,56,57,60,74,78,90 +3 6 4.459263e+01 30,57,59,60,74,78,90 +3 10 4.492432e+01 30,57,60,62,74,78,90 +3 2 4.546417e+01 30,57,60,63,74,78,90 +3 12 4.455427e+01 30,57,60,66,74,78,90 +3 5 4.631319e+01 30,57,60,68,74,78,90 +3 5 4.535831e+01 30,57,60,70,74,78,90 +3 6 4.603031e+01 30,57,60,71,74,78,90 +3 15 4.449353e+01 30,57,60,74,76,78,90 +3 70 3.446418e+01 30,57,60,74,78 +3 1 4.857980e+01 30,57,60,74,78,82,90 +3 99294 4.398003e+01 30,57,60,74,78,90 +3 17 4.424109e+01 30,57,60,74,78,90,91 +3 3 4.510340e+01 30,57,60,74,78,90,92 +3 65 3.793612e+01 30,57,60,74,90 +3 63 3.527826e+01 30,57,60,78,90 +3 92 3.830013e+01 30,57,74,78,90 +3 47 3.735476e+01 30,60,74,78,90 +3 89 3.601881e+01 57,60,74,78,90 +1 2 4.776004e+01 9,30,57,60,74,78,90 +1 1 4.509987e+01 11,30,57,60,74,78,90 +1 7 4.346652e+01 12,30,57,60,74,78,90 +1 8 4.501102e+01 14,30,57,60,74,78,90 +1 12 4.489658e+01 24,30,57,60,74,78,90 +1 1 4.721079e+01 27,30,57,60,74,78,90 +1 6 4.303401e+01 29,30,57,60,74,78,90 +1 1 4.636270e+01 30,31,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 1 4.600229e+01 30,35,57,60,74,78,90 +1 7 4.384998e+01 30,36,57,60,74,78,90 +1 5 4.771108e+01 30,38,57,60,74,78,90 +1 2 4.592417e+01 30,40,57,60,74,78,90 +1 2 4.602157e+01 30,56,57,60,74,78,90 +1 8 4.459263e+01 30,57,59,60,74,78,90 +1 3 4.593039e+01 30,57,60,61,74,78,90 +1 6 4.492432e+01 30,57,60,62,74,78,90 +1 2 4.825409e+01 30,57,60,64,74,78,90 +1 3 4.549801e+01 30,57,60,69,74,78,90 +1 3 4.535831e+01 30,57,60,70,74,78,90 +1 6 4.603031e+01 30,57,60,71,74,78,90 +1 2 4.449353e+01 30,57,60,74,76,78,90 +1 13 3.446418e+01 30,57,60,74,78 +1 99813 4.398003e+01 30,57,60,74,78,90 +1 7 4.424109e+01 30,57,60,74,78,90,91 +1 1 4.510340e+01 30,57,60,74,78,90,92 +1 2 4.672090e+01 30,57,60,74,78,90,98 +1 16 3.793612e+01 30,57,60,74,90 +1 12 3.527826e+01 30,57,60,78,90 +1 12 3.830013e+01 30,57,74,78,90 +1 18 3.735476e+01 30,60,74,78,90 +1 12 3.601881e+01 57,60,74,78,90 +2 22 4.346652e+01 12,30,57,60,74,78,90 +2 6 4.501102e+01 14,30,57,60,74,78,90 +2 6 4.489658e+01 24,30,57,60,74,78,90 +2 2 4.480868e+01 25,30,57,60,74,78,90 +2 2 4.710177e+01 28,30,57,60,74,78,90 +2 22 4.303401e+01 29,30,57,60,74,78,90 +2 25 4.199699e+01 30,32,57,60,74,78,90 +2 17 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.771108e+01 30,38,57,60,74,78,90 +2 2 4.592417e+01 30,40,57,60,74,78,90 +2 3 4.593938e+01 30,44,57,60,74,78,90 +2 7 4.459263e+01 30,57,59,60,74,78,90 +2 1 4.593039e+01 30,57,60,61,74,78,90 +2 1 4.492432e+01 30,57,60,62,74,78,90 +2 1 4.546417e+01 30,57,60,63,74,78,90 +2 7 4.455427e+01 30,57,60,66,74,78,90 +2 10 4.603031e+01 30,57,60,71,74,78,90 +2 12 4.449353e+01 30,57,60,74,76,78,90 +2 47 3.446418e+01 30,57,60,74,78 +2 99586 4.398003e+01 30,57,60,74,78,90 +2 2 4.424109e+01 30,57,60,74,78,90,91 +2 10 4.510340e+01 30,57,60,74,78,90,92 +2 2 4.672090e+01 30,57,60,74,78,90,98 +2 44 3.793612e+01 30,57,60,74,90 +2 37 3.527826e+01 30,57,60,78,90 +2 39 3.830013e+01 30,57,74,78,90 +2 44 3.735476e+01 30,60,74,78,90 +2 42 3.601881e+01 57,60,74,78,90 +3 48 4.346652e+01 12,30,57,60,74,78,90 +3 6 4.501102e+01 14,30,57,60,74,78,90 +3 3 4.709925e+01 18,30,57,60,74,78,90 +3 11 4.489658e+01 24,30,57,60,74,78,90 +3 9 4.480868e+01 25,30,57,60,74,78,90 +3 30 4.303401e+01 29,30,57,60,74,78,90 +3 50 4.199699e+01 30,32,57,60,74,78,90 +3 4 4.606816e+01 30,34,57,60,74,78,90 +3 3 4.600229e+01 30,35,57,60,74,78,90 +3 23 4.384998e+01 30,36,57,60,74,78,90 +3 3 4.725090e+01 30,37,57,60,74,78,90 +3 1 4.602157e+01 30,56,57,60,74,78,90 +3 12 4.459263e+01 30,57,59,60,74,78,90 +3 4 4.593039e+01 30,57,60,61,74,78,90 +3 3 4.492432e+01 30,57,60,62,74,78,90 +3 6 4.546417e+01 30,57,60,63,74,78,90 +3 2 4.865774e+01 30,57,60,65,74,78,90 +3 9 4.455427e+01 30,57,60,66,74,78,90 +3 4 4.549801e+01 30,57,60,69,74,78,90 +3 1 4.535831e+01 30,57,60,70,74,78,90 +3 1 4.603031e+01 30,57,60,71,74,78,90 +3 9 4.449353e+01 30,57,60,74,76,78,90 +3 122 3.446418e+01 30,57,60,74,78 +3 1 4.857980e+01 30,57,60,74,78,82,90 +3 99113 4.398003e+01 30,57,60,74,78,90 +3 9 4.510340e+01 30,57,60,74,78,90,92 +3 4 4.672090e+01 30,57,60,74,78,90,98 +3 92 3.793612e+01 30,57,60,74,90 +3 110 3.527826e+01 30,57,60,78,90 +3 92 3.830013e+01 30,57,74,78,90 +3 108 3.735476e+01 30,60,74,78,90 +3 107 3.601881e+01 57,60,74,78,90 diff --git a/test/test1_10-10.test.expected-dat b/test/test1_10-10.test.expected-dat index 23448a6..23bf80c 100644 --- a/test/test1_10-10.test.expected-dat +++ b/test/test1_10-10.test.expected-dat @@ -1,198 +1,192 @@ -1 -1 8 4.888530e+01 1 30 57 60 74 78 90 -1 5 4.846652e+01 12 30 57 60 74 78 90 -1 1 5.162988e+01 13 30 57 60 74 78 90 -1 4 5.001102e+01 14 30 57 60 74 78 90 -1 2 4.989658e+01 24 30 57 60 74 78 90 -1 2 4.980868e+01 25 30 57 60 74 78 90 -1 1 5.210177e+01 28 30 57 60 74 78 90 -1 13 4.803401e+01 29 30 57 60 74 78 90 -1 8 4.699699e+01 30 32 57 60 74 78 90 -1 1 5.106816e+01 30 34 57 60 74 78 90 -1 9 5.100229e+01 30 35 57 60 74 78 90 -1 6 4.884998e+01 30 36 57 60 74 78 90 -1 1 5.093938e+01 30 44 57 60 74 78 90 -1 3 4.959263e+01 30 57 59 60 74 78 90 -1 1 4.992432e+01 30 57 60 62 74 78 90 -1 9 4.955427e+01 30 57 60 66 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 4 5.035831e+01 30 57 60 70 74 78 90 -1 3 5.103031e+01 30 57 60 71 74 78 90 -1 9 3.946418e+01 30 57 60 74 78 -1 99855 4.898003e+01 30 57 60 74 78 90 -1 4 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 13 4.330013e+01 30 57 74 78 90 -1 7 4.235476e+01 30 60 74 78 90 -1 7 4.101881e+01 57 60 74 78 90 -2 -2 4 5.000754e+01 0 30 57 60 74 78 90 -2 14 4.888530e+01 1 30 57 60 74 78 90 -2 5 5.009987e+01 11 30 57 60 74 78 90 -2 18 4.846652e+01 12 30 57 60 74 78 90 -2 8 5.001102e+01 14 30 57 60 74 78 90 -2 3 5.381227e+01 16 30 57 60 74 78 90 -2 3 4.989658e+01 24 30 57 60 74 78 90 -2 7 4.980868e+01 25 30 57 60 74 78 90 -2 25 4.803401e+01 29 30 57 60 74 78 90 -2 1 5.136270e+01 30 31 57 60 74 78 90 -2 19 4.699699e+01 30 32 57 60 74 78 90 -2 2 5.106816e+01 30 34 57 60 74 78 90 -2 2 5.100229e+01 30 35 57 60 74 78 90 -2 13 4.884998e+01 30 36 57 60 74 78 90 -2 2 5.225090e+01 30 37 57 60 74 78 90 -2 3 5.093938e+01 30 44 57 60 74 78 90 -2 2 5.102157e+01 30 56 57 60 74 78 90 -2 14 4.959263e+01 30 57 59 60 74 78 90 -2 6 4.992432e+01 30 57 60 62 74 78 90 -2 1 5.046417e+01 30 57 60 63 74 78 90 -2 11 4.955427e+01 30 57 60 66 74 78 90 -2 2 5.049801e+01 30 57 60 69 74 78 90 -2 2 5.035831e+01 30 57 60 70 74 78 90 -2 5 5.103031e+01 30 57 60 71 74 78 90 -2 37 3.946418e+01 30 57 60 74 78 -2 99621 4.898003e+01 30 57 60 74 78 90 -2 7 4.924109e+01 30 57 60 74 78 90 91 -2 3 5.010340e+01 30 57 60 74 78 90 92 -2 3 5.331382e+01 30 57 60 74 78 90 97 -2 31 4.293612e+01 30 57 60 74 90 -2 32 4.027826e+01 30 57 60 78 90 -2 40 4.330013e+01 30 57 74 78 90 -2 19 4.235476e+01 30 60 74 78 90 -2 35 4.101881e+01 57 60 74 78 90 -3 -3 11 5.000754e+01 0 30 57 60 74 78 90 -3 23 4.888530e+01 1 30 57 60 74 78 90 -3 3 5.009987e+01 11 30 57 60 74 78 90 -3 24 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.162988e+01 13 30 57 60 74 78 90 -3 10 5.001102e+01 14 30 57 60 74 78 90 -3 3 4.989658e+01 24 30 57 60 74 78 90 -3 11 4.980868e+01 25 30 57 60 74 78 90 -3 46 4.803401e+01 29 30 57 60 74 78 90 -3 2 5.136270e+01 30 31 57 60 74 78 90 -3 41 4.699699e+01 30 32 57 60 74 78 90 -3 21 4.884998e+01 30 36 57 60 74 78 90 -3 1 5.092417e+01 30 40 57 60 74 78 90 -3 3 5.093938e+01 30 44 57 60 74 78 90 -3 6 5.102157e+01 30 56 57 60 74 78 90 -3 15 4.959263e+01 30 57 59 60 74 78 90 -3 9 4.992432e+01 30 57 60 62 74 78 90 -3 22 4.955427e+01 30 57 60 66 74 78 90 -3 4 5.049801e+01 30 57 60 69 74 78 90 -3 1 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.103031e+01 30 57 60 71 74 78 90 -3 86 3.946418e+01 30 57 60 74 78 -3 1 5.461185e+01 30 57 60 74 78 85 90 -3 3 5.366933e+01 30 57 60 74 78 89 90 -3 99276 4.898003e+01 30 57 60 74 78 90 -3 12 4.924109e+01 30 57 60 74 78 90 91 -3 17 5.010340e+01 30 57 60 74 78 90 92 -3 71 4.293612e+01 30 57 60 74 90 -3 69 4.027826e+01 30 57 60 78 90 -3 77 4.330013e+01 30 57 74 78 90 -3 47 4.235476e+01 30 60 74 78 90 -3 82 4.101881e+01 57 60 74 78 90 -1 -1 3 5.000754e+01 0 30 57 60 74 78 90 -1 10 4.888530e+01 1 30 57 60 74 78 90 -1 5 5.009987e+01 11 30 57 60 74 78 90 -1 3 4.846652e+01 12 30 57 60 74 78 90 -1 12 5.001102e+01 14 30 57 60 74 78 90 -1 6 4.989658e+01 24 30 57 60 74 78 90 -1 3 4.980868e+01 25 30 57 60 74 78 90 -1 5 4.803401e+01 29 30 57 60 74 78 90 -1 2 5.136270e+01 30 31 57 60 74 78 90 -1 14 4.699699e+01 30 32 57 60 74 78 90 -1 4 5.106816e+01 30 34 57 60 74 78 90 -1 9 4.884998e+01 30 36 57 60 74 78 90 -1 3 5.092417e+01 30 40 57 60 74 78 90 -1 3 4.959263e+01 30 57 59 60 74 78 90 -1 1 5.093039e+01 30 57 60 61 74 78 90 -1 10 4.992432e+01 30 57 60 62 74 78 90 -1 2 4.955427e+01 30 57 60 66 74 78 90 -1 4 5.049801e+01 30 57 60 69 74 78 90 -1 1 5.035831e+01 30 57 60 70 74 78 90 -1 13 3.946418e+01 30 57 60 74 78 -1 1 5.357980e+01 30 57 60 74 78 82 90 -1 99813 4.898003e+01 30 57 60 74 78 90 -1 5 4.924109e+01 30 57 60 74 78 90 91 -1 3 5.010340e+01 30 57 60 74 78 90 92 -1 12 4.293612e+01 30 57 60 74 90 -1 13 4.027826e+01 30 57 60 78 90 -1 12 4.330013e+01 30 57 74 78 90 -1 14 4.235476e+01 30 60 74 78 90 -1 14 4.101881e+01 57 60 74 78 90 -2 -2 5 5.000754e+01 0 30 57 60 74 78 90 -2 2 4.886844e+01 1 30 36 57 60 74 78 90 -2 15 4.888530e+01 1 30 57 60 74 78 90 -2 1 5.361877e+01 5 30 36 57 60 74 78 90 -2 3 5.276004e+01 9 30 57 60 74 78 90 -2 3 5.009987e+01 11 30 57 60 74 78 90 -2 7 4.846652e+01 12 30 57 60 74 78 90 -2 9 5.001102e+01 14 30 57 60 74 78 90 -2 13 4.989658e+01 24 30 57 60 74 78 90 -2 2 4.980868e+01 25 30 57 60 74 78 90 -2 15 4.803401e+01 29 30 57 60 74 78 90 -2 33 4.699699e+01 30 32 57 60 74 78 90 -2 3 5.106816e+01 30 34 57 60 74 78 90 -2 16 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.093039e+01 30 57 60 61 74 78 90 -2 11 4.992432e+01 30 57 60 62 74 78 90 -2 2 5.046417e+01 30 57 60 63 74 78 90 -2 6 4.955427e+01 30 57 60 66 74 78 90 -2 3 5.131319e+01 30 57 60 68 74 78 90 -2 3 5.049801e+01 30 57 60 69 74 78 90 -2 7 5.035831e+01 30 57 60 70 74 78 90 -2 1 5.103031e+01 30 57 60 71 74 78 90 -2 46 3.946418e+01 30 57 60 74 78 -2 99584 4.898003e+01 30 57 60 74 78 90 -2 8 4.924109e+01 30 57 60 74 78 90 91 -2 5 5.010340e+01 30 57 60 74 78 90 92 -2 3 5.172090e+01 30 57 60 74 78 90 98 -2 36 4.293612e+01 30 57 60 74 90 -2 37 4.027826e+01 30 57 60 78 90 -2 42 4.330013e+01 30 57 74 78 90 -2 34 4.235476e+01 30 60 74 78 90 -2 44 4.101881e+01 57 60 74 78 90 -3 -3 11 5.000754e+01 0 30 57 60 74 78 90 -3 2 4.886844e+01 1 30 36 57 60 74 78 90 -3 30 4.888530e+01 1 30 57 60 74 78 90 -3 3 5.009987e+01 11 30 57 60 74 78 90 -3 19 4.846652e+01 12 30 57 60 74 78 90 -3 5 5.001102e+01 14 30 57 60 74 78 90 -3 2 5.209925e+01 18 30 57 60 74 78 90 -3 8 4.989658e+01 24 30 57 60 74 78 90 -3 9 4.980868e+01 25 30 57 60 74 78 90 -3 1 4.535462e+01 26 30 60 74 78 90 -3 2 5.221079e+01 27 30 57 60 74 78 90 -3 30 4.803401e+01 29 30 57 60 74 78 90 -3 77 4.699699e+01 30 32 57 60 74 78 90 -3 2 4.072266e+01 30 32 57 74 78 90 -3 5 5.106816e+01 30 34 57 60 74 78 90 -3 23 4.884998e+01 30 36 57 60 74 78 90 -3 2 5.092417e+01 30 40 57 60 74 78 90 -3 2 5.093938e+01 30 44 57 60 74 78 90 -3 3 5.102157e+01 30 56 57 60 74 78 90 -3 4 4.959263e+01 30 57 59 60 74 78 90 -3 5 5.093039e+01 30 57 60 61 74 78 90 -3 10 4.992432e+01 30 57 60 62 74 78 90 -3 8 5.046417e+01 30 57 60 63 74 78 90 -3 17 4.955427e+01 30 57 60 66 74 78 90 -3 2 5.049801e+01 30 57 60 69 74 78 90 -3 2 5.035831e+01 30 57 60 70 74 78 90 -3 3 5.103031e+01 30 57 60 71 74 78 90 -3 114 3.946418e+01 30 57 60 74 78 -3 99111 4.898003e+01 30 57 60 74 78 90 -3 11 4.924109e+01 30 57 60 74 78 90 91 -3 2 5.010340e+01 30 57 60 74 78 90 92 -3 1 5.172090e+01 30 57 60 74 78 90 98 -3 76 4.293612e+01 30 57 60 74 90 -3 107 4.027826e+01 30 57 60 78 90 -3 90 4.330013e+01 30 57 74 78 90 -3 92 4.235476e+01 30 60 74 78 90 -3 109 4.101881e+01 57 60 74 78 90 +1 8 4.888530e+01 1,30,57,60,74,78,90 +1 5 4.846652e+01 12,30,57,60,74,78,90 +1 1 5.162988e+01 13,30,57,60,74,78,90 +1 4 5.001102e+01 14,30,57,60,74,78,90 +1 2 4.989658e+01 24,30,57,60,74,78,90 +1 2 4.980868e+01 25,30,57,60,74,78,90 +1 1 5.210177e+01 28,30,57,60,74,78,90 +1 13 4.803401e+01 29,30,57,60,74,78,90 +1 8 4.699699e+01 30,32,57,60,74,78,90 +1 1 5.106816e+01 30,34,57,60,74,78,90 +1 9 5.100229e+01 30,35,57,60,74,78,90 +1 6 4.884998e+01 30,36,57,60,74,78,90 +1 1 5.093938e+01 30,44,57,60,74,78,90 +1 3 4.959263e+01 30,57,59,60,74,78,90 +1 1 4.992432e+01 30,57,60,62,74,78,90 +1 9 4.955427e+01 30,57,60,66,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 4 5.035831e+01 30,57,60,70,74,78,90 +1 3 5.103031e+01 30,57,60,71,74,78,90 +1 9 3.946418e+01 30,57,60,74,78 +1 99855 4.898003e+01 30,57,60,74,78,90 +1 4 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 13 4.330013e+01 30,57,74,78,90 +1 7 4.235476e+01 30,60,74,78,90 +1 7 4.101881e+01 57,60,74,78,90 +2 4 5.000754e+01 0,30,57,60,74,78,90 +2 14 4.888530e+01 1,30,57,60,74,78,90 +2 5 5.009987e+01 11,30,57,60,74,78,90 +2 18 4.846652e+01 12,30,57,60,74,78,90 +2 8 5.001102e+01 14,30,57,60,74,78,90 +2 3 5.381227e+01 16,30,57,60,74,78,90 +2 3 4.989658e+01 24,30,57,60,74,78,90 +2 7 4.980868e+01 25,30,57,60,74,78,90 +2 25 4.803401e+01 29,30,57,60,74,78,90 +2 1 5.136270e+01 30,31,57,60,74,78,90 +2 19 4.699699e+01 30,32,57,60,74,78,90 +2 2 5.106816e+01 30,34,57,60,74,78,90 +2 2 5.100229e+01 30,35,57,60,74,78,90 +2 13 4.884998e+01 30,36,57,60,74,78,90 +2 2 5.225090e+01 30,37,57,60,74,78,90 +2 3 5.093938e+01 30,44,57,60,74,78,90 +2 2 5.102157e+01 30,56,57,60,74,78,90 +2 14 4.959263e+01 30,57,59,60,74,78,90 +2 6 4.992432e+01 30,57,60,62,74,78,90 +2 1 5.046417e+01 30,57,60,63,74,78,90 +2 11 4.955427e+01 30,57,60,66,74,78,90 +2 2 5.049801e+01 30,57,60,69,74,78,90 +2 2 5.035831e+01 30,57,60,70,74,78,90 +2 5 5.103031e+01 30,57,60,71,74,78,90 +2 37 3.946418e+01 30,57,60,74,78 +2 99621 4.898003e+01 30,57,60,74,78,90 +2 7 4.924109e+01 30,57,60,74,78,90,91 +2 3 5.010340e+01 30,57,60,74,78,90,92 +2 3 5.331382e+01 30,57,60,74,78,90,97 +2 31 4.293612e+01 30,57,60,74,90 +2 32 4.027826e+01 30,57,60,78,90 +2 40 4.330013e+01 30,57,74,78,90 +2 19 4.235476e+01 30,60,74,78,90 +2 35 4.101881e+01 57,60,74,78,90 +3 11 5.000754e+01 0,30,57,60,74,78,90 +3 23 4.888530e+01 1,30,57,60,74,78,90 +3 3 5.009987e+01 11,30,57,60,74,78,90 +3 24 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.162988e+01 13,30,57,60,74,78,90 +3 10 5.001102e+01 14,30,57,60,74,78,90 +3 3 4.989658e+01 24,30,57,60,74,78,90 +3 11 4.980868e+01 25,30,57,60,74,78,90 +3 46 4.803401e+01 29,30,57,60,74,78,90 +3 2 5.136270e+01 30,31,57,60,74,78,90 +3 41 4.699699e+01 30,32,57,60,74,78,90 +3 21 4.884998e+01 30,36,57,60,74,78,90 +3 1 5.092417e+01 30,40,57,60,74,78,90 +3 3 5.093938e+01 30,44,57,60,74,78,90 +3 6 5.102157e+01 30,56,57,60,74,78,90 +3 15 4.959263e+01 30,57,59,60,74,78,90 +3 9 4.992432e+01 30,57,60,62,74,78,90 +3 22 4.955427e+01 30,57,60,66,74,78,90 +3 4 5.049801e+01 30,57,60,69,74,78,90 +3 1 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.103031e+01 30,57,60,71,74,78,90 +3 86 3.946418e+01 30,57,60,74,78 +3 1 5.461185e+01 30,57,60,74,78,85,90 +3 3 5.366933e+01 30,57,60,74,78,89,90 +3 99276 4.898003e+01 30,57,60,74,78,90 +3 12 4.924109e+01 30,57,60,74,78,90,91 +3 17 5.010340e+01 30,57,60,74,78,90,92 +3 71 4.293612e+01 30,57,60,74,90 +3 69 4.027826e+01 30,57,60,78,90 +3 77 4.330013e+01 30,57,74,78,90 +3 47 4.235476e+01 30,60,74,78,90 +3 82 4.101881e+01 57,60,74,78,90 +1 3 5.000754e+01 0,30,57,60,74,78,90 +1 10 4.888530e+01 1,30,57,60,74,78,90 +1 5 5.009987e+01 11,30,57,60,74,78,90 +1 3 4.846652e+01 12,30,57,60,74,78,90 +1 12 5.001102e+01 14,30,57,60,74,78,90 +1 6 4.989658e+01 24,30,57,60,74,78,90 +1 3 4.980868e+01 25,30,57,60,74,78,90 +1 5 4.803401e+01 29,30,57,60,74,78,90 +1 2 5.136270e+01 30,31,57,60,74,78,90 +1 14 4.699699e+01 30,32,57,60,74,78,90 +1 4 5.106816e+01 30,34,57,60,74,78,90 +1 9 4.884998e+01 30,36,57,60,74,78,90 +1 3 5.092417e+01 30,40,57,60,74,78,90 +1 3 4.959263e+01 30,57,59,60,74,78,90 +1 1 5.093039e+01 30,57,60,61,74,78,90 +1 10 4.992432e+01 30,57,60,62,74,78,90 +1 2 4.955427e+01 30,57,60,66,74,78,90 +1 4 5.049801e+01 30,57,60,69,74,78,90 +1 1 5.035831e+01 30,57,60,70,74,78,90 +1 13 3.946418e+01 30,57,60,74,78 +1 1 5.357980e+01 30,57,60,74,78,82,90 +1 99813 4.898003e+01 30,57,60,74,78,90 +1 5 4.924109e+01 30,57,60,74,78,90,91 +1 3 5.010340e+01 30,57,60,74,78,90,92 +1 12 4.293612e+01 30,57,60,74,90 +1 13 4.027826e+01 30,57,60,78,90 +1 12 4.330013e+01 30,57,74,78,90 +1 14 4.235476e+01 30,60,74,78,90 +1 14 4.101881e+01 57,60,74,78,90 +2 5 5.000754e+01 0,30,57,60,74,78,90 +2 2 4.886844e+01 1,30,36,57,60,74,78,90 +2 15 4.888530e+01 1,30,57,60,74,78,90 +2 1 5.361877e+01 5,30,36,57,60,74,78,90 +2 3 5.276004e+01 9,30,57,60,74,78,90 +2 3 5.009987e+01 11,30,57,60,74,78,90 +2 7 4.846652e+01 12,30,57,60,74,78,90 +2 9 5.001102e+01 14,30,57,60,74,78,90 +2 13 4.989658e+01 24,30,57,60,74,78,90 +2 2 4.980868e+01 25,30,57,60,74,78,90 +2 15 4.803401e+01 29,30,57,60,74,78,90 +2 33 4.699699e+01 30,32,57,60,74,78,90 +2 3 5.106816e+01 30,34,57,60,74,78,90 +2 16 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.093039e+01 30,57,60,61,74,78,90 +2 11 4.992432e+01 30,57,60,62,74,78,90 +2 2 5.046417e+01 30,57,60,63,74,78,90 +2 6 4.955427e+01 30,57,60,66,74,78,90 +2 3 5.131319e+01 30,57,60,68,74,78,90 +2 3 5.049801e+01 30,57,60,69,74,78,90 +2 7 5.035831e+01 30,57,60,70,74,78,90 +2 1 5.103031e+01 30,57,60,71,74,78,90 +2 46 3.946418e+01 30,57,60,74,78 +2 99584 4.898003e+01 30,57,60,74,78,90 +2 8 4.924109e+01 30,57,60,74,78,90,91 +2 5 5.010340e+01 30,57,60,74,78,90,92 +2 3 5.172090e+01 30,57,60,74,78,90,98 +2 36 4.293612e+01 30,57,60,74,90 +2 37 4.027826e+01 30,57,60,78,90 +2 42 4.330013e+01 30,57,74,78,90 +2 34 4.235476e+01 30,60,74,78,90 +2 44 4.101881e+01 57,60,74,78,90 +3 11 5.000754e+01 0,30,57,60,74,78,90 +3 2 4.886844e+01 1,30,36,57,60,74,78,90 +3 30 4.888530e+01 1,30,57,60,74,78,90 +3 3 5.009987e+01 11,30,57,60,74,78,90 +3 19 4.846652e+01 12,30,57,60,74,78,90 +3 5 5.001102e+01 14,30,57,60,74,78,90 +3 2 5.209925e+01 18,30,57,60,74,78,90 +3 8 4.989658e+01 24,30,57,60,74,78,90 +3 9 4.980868e+01 25,30,57,60,74,78,90 +3 1 4.535462e+01 26,30,60,74,78,90 +3 2 5.221079e+01 27,30,57,60,74,78,90 +3 30 4.803401e+01 29,30,57,60,74,78,90 +3 77 4.699699e+01 30,32,57,60,74,78,90 +3 2 4.072266e+01 30,32,57,74,78,90 +3 5 5.106816e+01 30,34,57,60,74,78,90 +3 23 4.884998e+01 30,36,57,60,74,78,90 +3 2 5.092417e+01 30,40,57,60,74,78,90 +3 2 5.093938e+01 30,44,57,60,74,78,90 +3 3 5.102157e+01 30,56,57,60,74,78,90 +3 4 4.959263e+01 30,57,59,60,74,78,90 +3 5 5.093039e+01 30,57,60,61,74,78,90 +3 10 4.992432e+01 30,57,60,62,74,78,90 +3 8 5.046417e+01 30,57,60,63,74,78,90 +3 17 4.955427e+01 30,57,60,66,74,78,90 +3 2 5.049801e+01 30,57,60,69,74,78,90 +3 2 5.035831e+01 30,57,60,70,74,78,90 +3 3 5.103031e+01 30,57,60,71,74,78,90 +3 114 3.946418e+01 30,57,60,74,78 +3 99111 4.898003e+01 30,57,60,74,78,90 +3 11 4.924109e+01 30,57,60,74,78,90,91 +3 2 5.010340e+01 30,57,60,74,78,90,92 +3 1 5.172090e+01 30,57,60,74,78,90,98 +3 76 4.293612e+01 30,57,60,74,90 +3 107 4.027826e+01 30,57,60,78,90 +3 90 4.330013e+01 30,57,74,78,90 +3 92 4.235476e+01 30,60,74,78,90 +3 109 4.101881e+01 57,60,74,78,90 diff --git a/test/test1_10-11.test.expected-dat b/test/test1_10-11.test.expected-dat index 1b4ab93..bed38d7 100644 --- a/test/test1_10-11.test.expected-dat +++ b/test/test1_10-11.test.expected-dat @@ -1,189 +1,183 @@ -1 -1 2 4.888530e+01 1 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.662988e+01 13 30 57 60 74 78 90 -1 5 4.501102e+01 14 30 57 60 74 78 90 -1 1 4.489658e+01 24 30 57 60 74 78 90 -1 2 4.480868e+01 25 30 57 60 74 78 90 -1 2 4.710177e+01 28 30 57 60 74 78 90 -1 12 4.303401e+01 29 30 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 1 4.606816e+01 30 34 57 60 74 78 90 -1 8 4.600229e+01 30 35 57 60 74 78 90 -1 9 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 1 4.492432e+01 30 57 60 62 74 78 90 -1 5 4.455427e+01 30 57 60 66 74 78 90 -1 2 4.631319e+01 30 57 60 68 74 78 90 -1 10 4.535831e+01 30 57 60 70 74 78 90 -1 1 4.603031e+01 30 57 60 71 74 78 90 -1 10 3.446418e+01 30 57 60 74 78 -1 99860 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 11 3.793612e+01 30 57 60 74 90 -1 8 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 7 3.735476e+01 30 60 74 78 90 -1 7 3.601881e+01 57 60 74 78 90 -2 -2 2 5.000754e+01 0 30 57 60 74 78 90 -2 7 4.509987e+01 11 30 57 60 74 78 90 -2 15 4.346652e+01 12 30 57 60 74 78 90 -2 2 4.662988e+01 13 30 57 60 74 78 90 -2 5 4.501102e+01 14 30 57 60 74 78 90 -2 3 4.489658e+01 24 30 57 60 74 78 90 -2 6 4.480868e+01 25 30 57 60 74 78 90 -2 3 4.721079e+01 27 30 57 60 74 78 90 -2 32 4.303401e+01 29 30 57 60 74 78 90 -2 4 4.636270e+01 30 31 57 60 74 78 90 -2 13 4.199699e+01 30 32 57 60 74 78 90 -2 3 4.606816e+01 30 34 57 60 74 78 90 -2 3 4.600229e+01 30 35 57 60 74 78 90 -2 18 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.592417e+01 30 40 57 60 74 78 90 -2 2 4.593938e+01 30 44 57 60 74 78 90 -2 14 4.459263e+01 30 57 59 60 74 78 90 -2 5 4.492432e+01 30 57 60 62 74 78 90 -2 2 4.865774e+01 30 57 60 65 74 78 90 -2 11 4.455427e+01 30 57 60 66 74 78 90 -2 2 4.631319e+01 30 57 60 68 74 78 90 -2 2 4.549801e+01 30 57 60 69 74 78 90 -2 2 4.535831e+01 30 57 60 70 74 78 90 -2 1 4.449353e+01 30 57 60 74 76 78 90 -2 29 3.446418e+01 30 57 60 74 78 -2 99642 4.398003e+01 30 57 60 74 78 90 -2 11 4.424109e+01 30 57 60 74 78 90 91 -2 3 4.510340e+01 30 57 60 74 78 90 92 -2 27 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 19 3.735476e+01 30 60 74 78 90 -2 35 3.601881e+01 57 60 74 78 90 -3 -3 14 4.509987e+01 11 30 57 60 74 78 90 -3 38 4.346652e+01 12 30 57 60 74 78 90 -3 4 4.501102e+01 14 30 57 60 74 78 90 -3 6 4.489658e+01 24 30 57 60 74 78 90 -3 4 4.480868e+01 25 30 57 60 74 78 90 -3 4 4.710177e+01 28 30 57 60 74 78 90 -3 57 4.303401e+01 29 30 57 60 74 78 90 -3 35 4.199699e+01 30 32 57 60 74 78 90 -3 7 4.606816e+01 30 34 57 60 74 78 90 -3 3 4.600229e+01 30 35 57 60 74 78 90 -3 22 4.384998e+01 30 36 57 60 74 78 90 -3 4 4.602157e+01 30 56 57 60 74 78 90 -3 6 4.459263e+01 30 57 59 60 74 78 90 -3 10 4.492432e+01 30 57 60 62 74 78 90 -3 2 4.546417e+01 30 57 60 63 74 78 90 -3 12 4.455427e+01 30 57 60 66 74 78 90 -3 5 4.631319e+01 30 57 60 68 74 78 90 -3 5 4.535831e+01 30 57 60 70 74 78 90 -3 6 4.603031e+01 30 57 60 71 74 78 90 -3 15 4.449353e+01 30 57 60 74 76 78 90 -3 70 3.446418e+01 30 57 60 74 78 -3 1 4.857980e+01 30 57 60 74 78 82 90 -3 99294 4.398003e+01 30 57 60 74 78 90 -3 17 4.424109e+01 30 57 60 74 78 90 91 -3 3 4.510340e+01 30 57 60 74 78 90 92 -3 65 3.793612e+01 30 57 60 74 90 -3 63 3.527826e+01 30 57 60 78 90 -3 92 3.830013e+01 30 57 74 78 90 -3 47 3.735476e+01 30 60 74 78 90 -3 89 3.601881e+01 57 60 74 78 90 -1 -1 2 4.776004e+01 9 30 57 60 74 78 90 -1 1 4.509987e+01 11 30 57 60 74 78 90 -1 7 4.346652e+01 12 30 57 60 74 78 90 -1 8 4.501102e+01 14 30 57 60 74 78 90 -1 12 4.489658e+01 24 30 57 60 74 78 90 -1 1 4.721079e+01 27 30 57 60 74 78 90 -1 6 4.303401e+01 29 30 57 60 74 78 90 -1 1 4.636270e+01 30 31 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 1 4.600229e+01 30 35 57 60 74 78 90 -1 7 4.384998e+01 30 36 57 60 74 78 90 -1 5 4.771108e+01 30 38 57 60 74 78 90 -1 2 4.592417e+01 30 40 57 60 74 78 90 -1 2 4.602157e+01 30 56 57 60 74 78 90 -1 8 4.459263e+01 30 57 59 60 74 78 90 -1 3 4.593039e+01 30 57 60 61 74 78 90 -1 6 4.492432e+01 30 57 60 62 74 78 90 -1 2 4.825409e+01 30 57 60 64 74 78 90 -1 3 4.549801e+01 30 57 60 69 74 78 90 -1 3 4.535831e+01 30 57 60 70 74 78 90 -1 6 4.603031e+01 30 57 60 71 74 78 90 -1 2 4.449353e+01 30 57 60 74 76 78 90 -1 13 3.446418e+01 30 57 60 74 78 -1 99813 4.398003e+01 30 57 60 74 78 90 -1 7 4.424109e+01 30 57 60 74 78 90 91 -1 1 4.510340e+01 30 57 60 74 78 90 92 -1 2 4.672090e+01 30 57 60 74 78 90 98 -1 16 3.793612e+01 30 57 60 74 90 -1 12 3.527826e+01 30 57 60 78 90 -1 12 3.830013e+01 30 57 74 78 90 -1 18 3.735476e+01 30 60 74 78 90 -1 12 3.601881e+01 57 60 74 78 90 -2 -2 22 4.346652e+01 12 30 57 60 74 78 90 -2 6 4.501102e+01 14 30 57 60 74 78 90 -2 6 4.489658e+01 24 30 57 60 74 78 90 -2 2 4.480868e+01 25 30 57 60 74 78 90 -2 2 4.710177e+01 28 30 57 60 74 78 90 -2 22 4.303401e+01 29 30 57 60 74 78 90 -2 25 4.199699e+01 30 32 57 60 74 78 90 -2 17 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.771108e+01 30 38 57 60 74 78 90 -2 2 4.592417e+01 30 40 57 60 74 78 90 -2 3 4.593938e+01 30 44 57 60 74 78 90 -2 7 4.459263e+01 30 57 59 60 74 78 90 -2 1 4.593039e+01 30 57 60 61 74 78 90 -2 1 4.492432e+01 30 57 60 62 74 78 90 -2 1 4.546417e+01 30 57 60 63 74 78 90 -2 7 4.455427e+01 30 57 60 66 74 78 90 -2 10 4.603031e+01 30 57 60 71 74 78 90 -2 12 4.449353e+01 30 57 60 74 76 78 90 -2 47 3.446418e+01 30 57 60 74 78 -2 99586 4.398003e+01 30 57 60 74 78 90 -2 2 4.424109e+01 30 57 60 74 78 90 91 -2 10 4.510340e+01 30 57 60 74 78 90 92 -2 2 4.672090e+01 30 57 60 74 78 90 98 -2 44 3.793612e+01 30 57 60 74 90 -2 37 3.527826e+01 30 57 60 78 90 -2 39 3.830013e+01 30 57 74 78 90 -2 44 3.735476e+01 30 60 74 78 90 -2 42 3.601881e+01 57 60 74 78 90 -3 -3 48 4.346652e+01 12 30 57 60 74 78 90 -3 6 4.501102e+01 14 30 57 60 74 78 90 -3 3 4.709925e+01 18 30 57 60 74 78 90 -3 11 4.489658e+01 24 30 57 60 74 78 90 -3 9 4.480868e+01 25 30 57 60 74 78 90 -3 30 4.303401e+01 29 30 57 60 74 78 90 -3 50 4.199699e+01 30 32 57 60 74 78 90 -3 4 4.606816e+01 30 34 57 60 74 78 90 -3 3 4.600229e+01 30 35 57 60 74 78 90 -3 23 4.384998e+01 30 36 57 60 74 78 90 -3 3 4.725090e+01 30 37 57 60 74 78 90 -3 1 4.602157e+01 30 56 57 60 74 78 90 -3 12 4.459263e+01 30 57 59 60 74 78 90 -3 4 4.593039e+01 30 57 60 61 74 78 90 -3 3 4.492432e+01 30 57 60 62 74 78 90 -3 6 4.546417e+01 30 57 60 63 74 78 90 -3 2 4.865774e+01 30 57 60 65 74 78 90 -3 9 4.455427e+01 30 57 60 66 74 78 90 -3 4 4.549801e+01 30 57 60 69 74 78 90 -3 1 4.535831e+01 30 57 60 70 74 78 90 -3 1 4.603031e+01 30 57 60 71 74 78 90 -3 9 4.449353e+01 30 57 60 74 76 78 90 -3 122 3.446418e+01 30 57 60 74 78 -3 1 4.857980e+01 30 57 60 74 78 82 90 -3 99113 4.398003e+01 30 57 60 74 78 90 -3 9 4.510340e+01 30 57 60 74 78 90 92 -3 4 4.672090e+01 30 57 60 74 78 90 98 -3 92 3.793612e+01 30 57 60 74 90 -3 110 3.527826e+01 30 57 60 78 90 -3 92 3.830013e+01 30 57 74 78 90 -3 108 3.735476e+01 30 60 74 78 90 -3 107 3.601881e+01 57 60 74 78 90 +1 2 4.888530e+01 1,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.662988e+01 13,30,57,60,74,78,90 +1 5 4.501102e+01 14,30,57,60,74,78,90 +1 1 4.489658e+01 24,30,57,60,74,78,90 +1 2 4.480868e+01 25,30,57,60,74,78,90 +1 2 4.710177e+01 28,30,57,60,74,78,90 +1 12 4.303401e+01 29,30,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 1 4.606816e+01 30,34,57,60,74,78,90 +1 8 4.600229e+01 30,35,57,60,74,78,90 +1 9 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 1 4.492432e+01 30,57,60,62,74,78,90 +1 5 4.455427e+01 30,57,60,66,74,78,90 +1 2 4.631319e+01 30,57,60,68,74,78,90 +1 10 4.535831e+01 30,57,60,70,74,78,90 +1 1 4.603031e+01 30,57,60,71,74,78,90 +1 10 3.446418e+01 30,57,60,74,78 +1 99860 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 11 3.793612e+01 30,57,60,74,90 +1 8 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 7 3.735476e+01 30,60,74,78,90 +1 7 3.601881e+01 57,60,74,78,90 +2 2 5.000754e+01 0,30,57,60,74,78,90 +2 7 4.509987e+01 11,30,57,60,74,78,90 +2 15 4.346652e+01 12,30,57,60,74,78,90 +2 2 4.662988e+01 13,30,57,60,74,78,90 +2 5 4.501102e+01 14,30,57,60,74,78,90 +2 3 4.489658e+01 24,30,57,60,74,78,90 +2 6 4.480868e+01 25,30,57,60,74,78,90 +2 3 4.721079e+01 27,30,57,60,74,78,90 +2 32 4.303401e+01 29,30,57,60,74,78,90 +2 4 4.636270e+01 30,31,57,60,74,78,90 +2 13 4.199699e+01 30,32,57,60,74,78,90 +2 3 4.606816e+01 30,34,57,60,74,78,90 +2 3 4.600229e+01 30,35,57,60,74,78,90 +2 18 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.592417e+01 30,40,57,60,74,78,90 +2 2 4.593938e+01 30,44,57,60,74,78,90 +2 14 4.459263e+01 30,57,59,60,74,78,90 +2 5 4.492432e+01 30,57,60,62,74,78,90 +2 2 4.865774e+01 30,57,60,65,74,78,90 +2 11 4.455427e+01 30,57,60,66,74,78,90 +2 2 4.631319e+01 30,57,60,68,74,78,90 +2 2 4.549801e+01 30,57,60,69,74,78,90 +2 2 4.535831e+01 30,57,60,70,74,78,90 +2 1 4.449353e+01 30,57,60,74,76,78,90 +2 29 3.446418e+01 30,57,60,74,78 +2 99642 4.398003e+01 30,57,60,74,78,90 +2 11 4.424109e+01 30,57,60,74,78,90,91 +2 3 4.510340e+01 30,57,60,74,78,90,92 +2 27 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 19 3.735476e+01 30,60,74,78,90 +2 35 3.601881e+01 57,60,74,78,90 +3 14 4.509987e+01 11,30,57,60,74,78,90 +3 38 4.346652e+01 12,30,57,60,74,78,90 +3 4 4.501102e+01 14,30,57,60,74,78,90 +3 6 4.489658e+01 24,30,57,60,74,78,90 +3 4 4.480868e+01 25,30,57,60,74,78,90 +3 4 4.710177e+01 28,30,57,60,74,78,90 +3 57 4.303401e+01 29,30,57,60,74,78,90 +3 35 4.199699e+01 30,32,57,60,74,78,90 +3 7 4.606816e+01 30,34,57,60,74,78,90 +3 3 4.600229e+01 30,35,57,60,74,78,90 +3 22 4.384998e+01 30,36,57,60,74,78,90 +3 4 4.602157e+01 30,56,57,60,74,78,90 +3 6 4.459263e+01 30,57,59,60,74,78,90 +3 10 4.492432e+01 30,57,60,62,74,78,90 +3 2 4.546417e+01 30,57,60,63,74,78,90 +3 12 4.455427e+01 30,57,60,66,74,78,90 +3 5 4.631319e+01 30,57,60,68,74,78,90 +3 5 4.535831e+01 30,57,60,70,74,78,90 +3 6 4.603031e+01 30,57,60,71,74,78,90 +3 15 4.449353e+01 30,57,60,74,76,78,90 +3 70 3.446418e+01 30,57,60,74,78 +3 1 4.857980e+01 30,57,60,74,78,82,90 +3 99294 4.398003e+01 30,57,60,74,78,90 +3 17 4.424109e+01 30,57,60,74,78,90,91 +3 3 4.510340e+01 30,57,60,74,78,90,92 +3 65 3.793612e+01 30,57,60,74,90 +3 63 3.527826e+01 30,57,60,78,90 +3 92 3.830013e+01 30,57,74,78,90 +3 47 3.735476e+01 30,60,74,78,90 +3 89 3.601881e+01 57,60,74,78,90 +1 2 4.776004e+01 9,30,57,60,74,78,90 +1 1 4.509987e+01 11,30,57,60,74,78,90 +1 7 4.346652e+01 12,30,57,60,74,78,90 +1 8 4.501102e+01 14,30,57,60,74,78,90 +1 12 4.489658e+01 24,30,57,60,74,78,90 +1 1 4.721079e+01 27,30,57,60,74,78,90 +1 6 4.303401e+01 29,30,57,60,74,78,90 +1 1 4.636270e+01 30,31,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 1 4.600229e+01 30,35,57,60,74,78,90 +1 7 4.384998e+01 30,36,57,60,74,78,90 +1 5 4.771108e+01 30,38,57,60,74,78,90 +1 2 4.592417e+01 30,40,57,60,74,78,90 +1 2 4.602157e+01 30,56,57,60,74,78,90 +1 8 4.459263e+01 30,57,59,60,74,78,90 +1 3 4.593039e+01 30,57,60,61,74,78,90 +1 6 4.492432e+01 30,57,60,62,74,78,90 +1 2 4.825409e+01 30,57,60,64,74,78,90 +1 3 4.549801e+01 30,57,60,69,74,78,90 +1 3 4.535831e+01 30,57,60,70,74,78,90 +1 6 4.603031e+01 30,57,60,71,74,78,90 +1 2 4.449353e+01 30,57,60,74,76,78,90 +1 13 3.446418e+01 30,57,60,74,78 +1 99813 4.398003e+01 30,57,60,74,78,90 +1 7 4.424109e+01 30,57,60,74,78,90,91 +1 1 4.510340e+01 30,57,60,74,78,90,92 +1 2 4.672090e+01 30,57,60,74,78,90,98 +1 16 3.793612e+01 30,57,60,74,90 +1 12 3.527826e+01 30,57,60,78,90 +1 12 3.830013e+01 30,57,74,78,90 +1 18 3.735476e+01 30,60,74,78,90 +1 12 3.601881e+01 57,60,74,78,90 +2 22 4.346652e+01 12,30,57,60,74,78,90 +2 6 4.501102e+01 14,30,57,60,74,78,90 +2 6 4.489658e+01 24,30,57,60,74,78,90 +2 2 4.480868e+01 25,30,57,60,74,78,90 +2 2 4.710177e+01 28,30,57,60,74,78,90 +2 22 4.303401e+01 29,30,57,60,74,78,90 +2 25 4.199699e+01 30,32,57,60,74,78,90 +2 17 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.771108e+01 30,38,57,60,74,78,90 +2 2 4.592417e+01 30,40,57,60,74,78,90 +2 3 4.593938e+01 30,44,57,60,74,78,90 +2 7 4.459263e+01 30,57,59,60,74,78,90 +2 1 4.593039e+01 30,57,60,61,74,78,90 +2 1 4.492432e+01 30,57,60,62,74,78,90 +2 1 4.546417e+01 30,57,60,63,74,78,90 +2 7 4.455427e+01 30,57,60,66,74,78,90 +2 10 4.603031e+01 30,57,60,71,74,78,90 +2 12 4.449353e+01 30,57,60,74,76,78,90 +2 47 3.446418e+01 30,57,60,74,78 +2 99586 4.398003e+01 30,57,60,74,78,90 +2 2 4.424109e+01 30,57,60,74,78,90,91 +2 10 4.510340e+01 30,57,60,74,78,90,92 +2 2 4.672090e+01 30,57,60,74,78,90,98 +2 44 3.793612e+01 30,57,60,74,90 +2 37 3.527826e+01 30,57,60,78,90 +2 39 3.830013e+01 30,57,74,78,90 +2 44 3.735476e+01 30,60,74,78,90 +2 42 3.601881e+01 57,60,74,78,90 +3 48 4.346652e+01 12,30,57,60,74,78,90 +3 6 4.501102e+01 14,30,57,60,74,78,90 +3 3 4.709925e+01 18,30,57,60,74,78,90 +3 11 4.489658e+01 24,30,57,60,74,78,90 +3 9 4.480868e+01 25,30,57,60,74,78,90 +3 30 4.303401e+01 29,30,57,60,74,78,90 +3 50 4.199699e+01 30,32,57,60,74,78,90 +3 4 4.606816e+01 30,34,57,60,74,78,90 +3 3 4.600229e+01 30,35,57,60,74,78,90 +3 23 4.384998e+01 30,36,57,60,74,78,90 +3 3 4.725090e+01 30,37,57,60,74,78,90 +3 1 4.602157e+01 30,56,57,60,74,78,90 +3 12 4.459263e+01 30,57,59,60,74,78,90 +3 4 4.593039e+01 30,57,60,61,74,78,90 +3 3 4.492432e+01 30,57,60,62,74,78,90 +3 6 4.546417e+01 30,57,60,63,74,78,90 +3 2 4.865774e+01 30,57,60,65,74,78,90 +3 9 4.455427e+01 30,57,60,66,74,78,90 +3 4 4.549801e+01 30,57,60,69,74,78,90 +3 1 4.535831e+01 30,57,60,70,74,78,90 +3 1 4.603031e+01 30,57,60,71,74,78,90 +3 9 4.449353e+01 30,57,60,74,76,78,90 +3 122 3.446418e+01 30,57,60,74,78 +3 1 4.857980e+01 30,57,60,74,78,82,90 +3 99113 4.398003e+01 30,57,60,74,78,90 +3 9 4.510340e+01 30,57,60,74,78,90,92 +3 4 4.672090e+01 30,57,60,74,78,90,98 +3 92 3.793612e+01 30,57,60,74,90 +3 110 3.527826e+01 30,57,60,78,90 +3 92 3.830013e+01 30,57,74,78,90 +3 108 3.735476e+01 30,60,74,78,90 +3 107 3.601881e+01 57,60,74,78,90 diff --git a/test/test1_11-00.test.expected-dat b/test/test1_11-00.test.expected-dat index ee88d0f..f837b74 100644 --- a/test/test1_11-00.test.expected-dat +++ b/test/test1_11-00.test.expected-dat @@ -1,205 +1,199 @@ -1 -1 2 5.388530e+01 1 30 57 60 74 78 90 -1 4 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.162988e+01 13 30 57 60 74 78 90 -1 5 5.001102e+01 14 30 57 60 74 78 90 -1 7 4.489658e+01 24 30 57 60 74 78 90 -1 10 4.480868e+01 25 30 57 60 74 78 90 -1 18 4.697990e+01 26 30 57 60 74 78 90 -1 12 4.721079e+01 27 30 57 60 74 78 90 -1 7 4.710177e+01 28 30 57 60 74 78 90 -1 17 4.303401e+01 29 30 57 60 74 78 90 -1 5 4.636270e+01 30 31 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 2 5.106816e+01 30 34 57 60 74 78 90 -1 7 5.100229e+01 30 35 57 60 74 78 90 -1 8 4.884998e+01 30 36 57 60 74 78 90 -1 2 5.093938e+01 30 44 57 60 74 78 90 -1 1 4.959263e+01 30 57 59 60 74 78 90 -1 2 4.992432e+01 30 57 60 62 74 78 90 -1 7 4.955427e+01 30 57 60 66 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 5 5.035831e+01 30 57 60 70 74 78 90 -1 5 5.103031e+01 30 57 60 71 74 78 90 -1 11 3.946418e+01 30 57 60 74 78 -1 99800 4.898003e+01 30 57 60 74 78 90 -1 3 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 14 4.330013e+01 30 57 74 78 90 -1 6 4.235476e+01 30 60 74 78 90 -1 8 3.101881e+01 57 60 74 78 90 -2 -2 6 5.009987e+01 11 30 57 60 74 78 90 -2 9 4.846652e+01 12 30 57 60 74 78 90 -2 6 5.001102e+01 14 30 57 60 74 78 90 -2 30 4.489658e+01 24 30 57 60 74 78 90 -2 31 4.480868e+01 25 30 57 60 74 78 90 -2 30 4.697990e+01 26 30 57 60 74 78 90 -2 30 4.721079e+01 27 30 57 60 74 78 90 -2 25 4.710177e+01 28 30 57 60 74 78 90 -2 48 4.303401e+01 29 30 57 60 74 78 90 -2 33 4.636270e+01 30 31 57 60 74 78 90 -2 23 4.199699e+01 30 32 57 60 74 78 90 -2 3 5.106816e+01 30 34 57 60 74 78 90 -2 4 5.100229e+01 30 35 57 60 74 78 90 -2 16 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.225090e+01 30 37 57 60 74 78 90 -2 2 5.092417e+01 30 40 57 60 74 78 90 -2 2 5.102157e+01 30 56 57 60 74 78 90 -2 13 4.959263e+01 30 57 59 60 74 78 90 -2 7 4.992432e+01 30 57 60 62 74 78 90 -2 3 5.046417e+01 30 57 60 63 74 78 90 -2 9 4.955427e+01 30 57 60 66 74 78 90 -2 2 5.131319e+01 30 57 60 68 74 78 90 -2 6 5.035831e+01 30 57 60 70 74 78 90 -2 3 5.103031e+01 30 57 60 71 74 78 90 -2 3 4.949353e+01 30 57 60 74 76 78 90 -2 37 3.946418e+01 30 57 60 74 78 -2 99457 4.898003e+01 30 57 60 74 78 90 -2 9 4.924109e+01 30 57 60 74 78 90 91 -2 27 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 46 4.330013e+01 30 57 74 78 90 -2 17 4.235476e+01 30 60 74 78 90 -2 31 3.101881e+01 57 60 74 78 90 -3 -3 3 4.520192e+01 0 30 57 60 74 78 -3 11 5.009987e+01 11 30 57 60 74 78 90 -3 27 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.001102e+01 14 30 57 60 74 78 90 -3 61 4.489658e+01 24 30 57 60 74 78 90 -3 73 4.480868e+01 25 30 57 60 74 78 90 -3 62 4.697990e+01 26 30 57 60 74 78 90 -3 75 4.721079e+01 27 30 57 60 74 78 90 -3 50 4.710177e+01 28 30 57 60 74 78 90 -3 103 4.303401e+01 29 30 57 60 74 78 90 -3 78 4.636270e+01 30 31 57 60 74 78 90 -3 58 4.199699e+01 30 32 57 60 74 78 90 -3 3 5.106816e+01 30 34 57 60 74 78 90 -3 27 4.884998e+01 30 36 57 60 74 78 90 -3 1 5.093938e+01 30 44 57 60 74 78 90 -3 16 4.959263e+01 30 57 59 60 74 78 90 -3 1 5.093039e+01 30 57 60 61 74 78 90 -3 3 4.992432e+01 30 57 60 62 74 78 90 -3 6 5.046417e+01 30 57 60 63 74 78 90 -3 1 4.955427e+01 30 57 60 66 74 78 90 -3 3 5.049801e+01 30 57 60 69 74 78 90 -3 1 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.103031e+01 30 57 60 71 74 78 90 -3 14 4.949353e+01 30 57 60 74 76 78 90 -3 94 3.946418e+01 30 57 60 74 78 -3 98854 4.898003e+01 30 57 60 74 78 90 -3 17 4.924109e+01 30 57 60 74 78 90 91 -3 4 5.010340e+01 30 57 60 74 78 90 92 -3 69 4.293612e+01 30 57 60 74 90 -3 62 4.027826e+01 30 57 60 78 90 -3 98 4.330013e+01 30 57 74 78 90 -3 39 4.235476e+01 30 60 74 78 90 -3 83 3.101881e+01 57 60 74 78 90 -1 -1 2 5.326373e+01 3 30 57 60 74 78 90 -1 1 5.009987e+01 11 30 57 60 74 78 90 -1 6 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.001102e+01 14 30 57 60 74 78 90 -1 4 5.209925e+01 18 30 57 60 74 78 90 -1 22 4.489658e+01 24 30 57 60 74 78 90 -1 8 4.480868e+01 25 30 57 60 74 78 90 -1 4 4.697990e+01 26 30 57 60 74 78 90 -1 12 4.721079e+01 27 30 57 60 74 78 90 -1 9 4.710177e+01 28 30 57 60 74 78 90 -1 4 4.303401e+01 29 30 57 60 74 78 90 -1 14 4.636270e+01 30 31 57 60 74 78 90 -1 15 4.199699e+01 30 32 57 60 74 78 90 -1 1 5.106816e+01 30 34 57 60 74 78 90 -1 2 5.100229e+01 30 35 57 60 74 78 90 -1 14 4.884998e+01 30 36 57 60 74 78 90 -1 3 4.959263e+01 30 57 59 60 74 78 90 -1 3 5.093039e+01 30 57 60 61 74 78 90 -1 16 4.992432e+01 30 57 60 62 74 78 90 -1 1 5.046417e+01 30 57 60 63 74 78 90 -1 3 5.365774e+01 30 57 60 65 74 78 90 -1 6 5.049801e+01 30 57 60 69 74 78 90 -1 4 4.949353e+01 30 57 60 74 76 78 90 -1 16 3.946418e+01 30 57 60 74 78 -1 99755 4.898003e+01 30 57 60 74 78 90 -1 8 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 1 5.331382e+01 30 57 60 74 78 90 97 -1 14 4.293612e+01 30 57 60 74 90 -1 10 4.027826e+01 30 57 60 78 90 -1 13 4.330013e+01 30 57 74 78 90 -1 16 4.235476e+01 30 60 74 78 90 -1 9 3.101881e+01 57 60 74 78 90 -2 -2 9 4.846652e+01 12 30 57 60 74 78 90 -2 1 5.001102e+01 14 30 57 60 74 78 90 -2 1 5.209925e+01 18 30 57 60 74 78 90 -2 57 4.489658e+01 24 30 57 60 74 78 90 -2 22 4.480868e+01 25 30 57 60 74 78 90 -2 12 4.697990e+01 26 30 57 60 74 78 90 -2 25 4.721079e+01 27 30 57 60 74 78 90 -2 25 4.710177e+01 28 30 57 60 74 78 90 -2 19 4.303401e+01 29 30 57 60 74 78 90 -2 26 4.636270e+01 30 31 57 60 74 78 90 -2 39 4.199699e+01 30 32 57 60 74 78 90 -2 12 5.100229e+01 30 35 57 60 74 78 90 -2 22 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.092417e+01 30 40 57 60 74 78 90 -2 2 5.550344e+01 30 42 57 60 74 78 90 -2 6 4.959263e+01 30 57 59 60 74 78 90 -2 19 4.992432e+01 30 57 60 62 74 78 90 -2 1 5.046417e+01 30 57 60 63 74 78 90 -2 2 4.955427e+01 30 57 60 66 74 78 90 -2 4 5.131319e+01 30 57 60 68 74 78 90 -2 4 5.049801e+01 30 57 60 69 74 78 90 -2 1 5.035831e+01 30 57 60 70 74 78 90 -2 7 4.949353e+01 30 57 60 74 76 78 90 -2 45 3.946418e+01 30 57 60 74 78 -2 99429 4.898003e+01 30 57 60 74 78 90 -2 20 4.924109e+01 30 57 60 74 78 90 91 -2 2 5.010340e+01 30 57 60 74 78 90 92 -2 2 5.172090e+01 30 57 60 74 78 90 98 -2 37 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 41 4.330013e+01 30 57 74 78 90 -2 47 4.235476e+01 30 60 74 78 90 -2 29 3.101881e+01 57 60 74 78 90 -3 -3 4 5.009987e+01 11 30 57 60 74 78 90 -3 21 4.846652e+01 12 30 57 60 74 78 90 -3 3 5.162988e+01 13 30 57 60 74 78 90 -3 6 5.001102e+01 14 30 57 60 74 78 90 -3 6 5.209925e+01 18 30 57 60 74 78 90 -3 3 5.408172e+01 22 30 57 60 74 78 90 -3 129 4.489658e+01 24 30 57 60 74 78 90 -3 63 4.480868e+01 25 30 57 60 74 78 90 -3 30 4.697990e+01 26 30 57 60 74 78 90 -3 46 4.721079e+01 27 30 57 60 74 78 90 -3 45 4.710177e+01 28 30 57 60 74 78 90 -3 39 4.303401e+01 29 30 57 60 74 78 90 -3 54 4.636270e+01 30 31 57 60 74 78 90 -3 96 4.199699e+01 30 32 57 60 74 78 90 -3 4 5.106816e+01 30 34 57 60 74 78 90 -3 3 5.100229e+01 30 35 57 60 74 78 90 -3 22 4.884998e+01 30 36 57 60 74 78 90 -3 2 5.271108e+01 30 38 57 60 74 78 90 -3 7 5.102157e+01 30 56 57 60 74 78 90 -3 8 4.959263e+01 30 57 59 60 74 78 90 -3 2 5.093039e+01 30 57 60 61 74 78 90 -3 12 4.992432e+01 30 57 60 62 74 78 90 -3 4 5.046417e+01 30 57 60 63 74 78 90 -3 5 4.955427e+01 30 57 60 66 74 78 90 -3 6 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.313605e+01 30 57 60 73 74 78 90 -3 3 4.949353e+01 30 57 60 74 76 78 90 -3 119 3.946418e+01 30 57 60 74 78 -3 2 5.301417e+01 30 57 60 74 78 87 90 -3 98782 4.898003e+01 30 57 60 74 78 90 -3 19 4.924109e+01 30 57 60 74 78 90 91 -3 78 4.293612e+01 30 57 60 74 90 -3 89 4.027826e+01 30 57 60 78 90 -3 90 4.330013e+01 30 57 74 78 90 -3 118 4.235476e+01 30 60 74 78 90 -3 78 3.101881e+01 57 60 74 78 90 +1 2 5.388530e+01 1,30,57,60,74,78,90 +1 4 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.162988e+01 13,30,57,60,74,78,90 +1 5 5.001102e+01 14,30,57,60,74,78,90 +1 7 4.489658e+01 24,30,57,60,74,78,90 +1 10 4.480868e+01 25,30,57,60,74,78,90 +1 18 4.697990e+01 26,30,57,60,74,78,90 +1 12 4.721079e+01 27,30,57,60,74,78,90 +1 7 4.710177e+01 28,30,57,60,74,78,90 +1 17 4.303401e+01 29,30,57,60,74,78,90 +1 5 4.636270e+01 30,31,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 2 5.106816e+01 30,34,57,60,74,78,90 +1 7 5.100229e+01 30,35,57,60,74,78,90 +1 8 4.884998e+01 30,36,57,60,74,78,90 +1 2 5.093938e+01 30,44,57,60,74,78,90 +1 1 4.959263e+01 30,57,59,60,74,78,90 +1 2 4.992432e+01 30,57,60,62,74,78,90 +1 7 4.955427e+01 30,57,60,66,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 5 5.035831e+01 30,57,60,70,74,78,90 +1 5 5.103031e+01 30,57,60,71,74,78,90 +1 11 3.946418e+01 30,57,60,74,78 +1 99800 4.898003e+01 30,57,60,74,78,90 +1 3 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 14 4.330013e+01 30,57,74,78,90 +1 6 4.235476e+01 30,60,74,78,90 +1 8 3.101881e+01 57,60,74,78,90 +2 6 5.009987e+01 11,30,57,60,74,78,90 +2 9 4.846652e+01 12,30,57,60,74,78,90 +2 6 5.001102e+01 14,30,57,60,74,78,90 +2 30 4.489658e+01 24,30,57,60,74,78,90 +2 31 4.480868e+01 25,30,57,60,74,78,90 +2 30 4.697990e+01 26,30,57,60,74,78,90 +2 30 4.721079e+01 27,30,57,60,74,78,90 +2 25 4.710177e+01 28,30,57,60,74,78,90 +2 48 4.303401e+01 29,30,57,60,74,78,90 +2 33 4.636270e+01 30,31,57,60,74,78,90 +2 23 4.199699e+01 30,32,57,60,74,78,90 +2 3 5.106816e+01 30,34,57,60,74,78,90 +2 4 5.100229e+01 30,35,57,60,74,78,90 +2 16 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.225090e+01 30,37,57,60,74,78,90 +2 2 5.092417e+01 30,40,57,60,74,78,90 +2 2 5.102157e+01 30,56,57,60,74,78,90 +2 13 4.959263e+01 30,57,59,60,74,78,90 +2 7 4.992432e+01 30,57,60,62,74,78,90 +2 3 5.046417e+01 30,57,60,63,74,78,90 +2 9 4.955427e+01 30,57,60,66,74,78,90 +2 2 5.131319e+01 30,57,60,68,74,78,90 +2 6 5.035831e+01 30,57,60,70,74,78,90 +2 3 5.103031e+01 30,57,60,71,74,78,90 +2 3 4.949353e+01 30,57,60,74,76,78,90 +2 37 3.946418e+01 30,57,60,74,78 +2 99457 4.898003e+01 30,57,60,74,78,90 +2 9 4.924109e+01 30,57,60,74,78,90,91 +2 27 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 46 4.330013e+01 30,57,74,78,90 +2 17 4.235476e+01 30,60,74,78,90 +2 31 3.101881e+01 57,60,74,78,90 +3 3 4.520192e+01 0,30,57,60,74,78 +3 11 5.009987e+01 11,30,57,60,74,78,90 +3 27 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.001102e+01 14,30,57,60,74,78,90 +3 61 4.489658e+01 24,30,57,60,74,78,90 +3 73 4.480868e+01 25,30,57,60,74,78,90 +3 62 4.697990e+01 26,30,57,60,74,78,90 +3 75 4.721079e+01 27,30,57,60,74,78,90 +3 50 4.710177e+01 28,30,57,60,74,78,90 +3 103 4.303401e+01 29,30,57,60,74,78,90 +3 78 4.636270e+01 30,31,57,60,74,78,90 +3 58 4.199699e+01 30,32,57,60,74,78,90 +3 3 5.106816e+01 30,34,57,60,74,78,90 +3 27 4.884998e+01 30,36,57,60,74,78,90 +3 1 5.093938e+01 30,44,57,60,74,78,90 +3 16 4.959263e+01 30,57,59,60,74,78,90 +3 1 5.093039e+01 30,57,60,61,74,78,90 +3 3 4.992432e+01 30,57,60,62,74,78,90 +3 6 5.046417e+01 30,57,60,63,74,78,90 +3 1 4.955427e+01 30,57,60,66,74,78,90 +3 3 5.049801e+01 30,57,60,69,74,78,90 +3 1 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.103031e+01 30,57,60,71,74,78,90 +3 14 4.949353e+01 30,57,60,74,76,78,90 +3 94 3.946418e+01 30,57,60,74,78 +3 98854 4.898003e+01 30,57,60,74,78,90 +3 17 4.924109e+01 30,57,60,74,78,90,91 +3 4 5.010340e+01 30,57,60,74,78,90,92 +3 69 4.293612e+01 30,57,60,74,90 +3 62 4.027826e+01 30,57,60,78,90 +3 98 4.330013e+01 30,57,74,78,90 +3 39 4.235476e+01 30,60,74,78,90 +3 83 3.101881e+01 57,60,74,78,90 +1 2 5.326373e+01 3,30,57,60,74,78,90 +1 1 5.009987e+01 11,30,57,60,74,78,90 +1 6 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.001102e+01 14,30,57,60,74,78,90 +1 4 5.209925e+01 18,30,57,60,74,78,90 +1 22 4.489658e+01 24,30,57,60,74,78,90 +1 8 4.480868e+01 25,30,57,60,74,78,90 +1 4 4.697990e+01 26,30,57,60,74,78,90 +1 12 4.721079e+01 27,30,57,60,74,78,90 +1 9 4.710177e+01 28,30,57,60,74,78,90 +1 4 4.303401e+01 29,30,57,60,74,78,90 +1 14 4.636270e+01 30,31,57,60,74,78,90 +1 15 4.199699e+01 30,32,57,60,74,78,90 +1 1 5.106816e+01 30,34,57,60,74,78,90 +1 2 5.100229e+01 30,35,57,60,74,78,90 +1 14 4.884998e+01 30,36,57,60,74,78,90 +1 3 4.959263e+01 30,57,59,60,74,78,90 +1 3 5.093039e+01 30,57,60,61,74,78,90 +1 16 4.992432e+01 30,57,60,62,74,78,90 +1 1 5.046417e+01 30,57,60,63,74,78,90 +1 3 5.365774e+01 30,57,60,65,74,78,90 +1 6 5.049801e+01 30,57,60,69,74,78,90 +1 4 4.949353e+01 30,57,60,74,76,78,90 +1 16 3.946418e+01 30,57,60,74,78 +1 99755 4.898003e+01 30,57,60,74,78,90 +1 8 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 1 5.331382e+01 30,57,60,74,78,90,97 +1 14 4.293612e+01 30,57,60,74,90 +1 10 4.027826e+01 30,57,60,78,90 +1 13 4.330013e+01 30,57,74,78,90 +1 16 4.235476e+01 30,60,74,78,90 +1 9 3.101881e+01 57,60,74,78,90 +2 9 4.846652e+01 12,30,57,60,74,78,90 +2 1 5.001102e+01 14,30,57,60,74,78,90 +2 1 5.209925e+01 18,30,57,60,74,78,90 +2 57 4.489658e+01 24,30,57,60,74,78,90 +2 22 4.480868e+01 25,30,57,60,74,78,90 +2 12 4.697990e+01 26,30,57,60,74,78,90 +2 25 4.721079e+01 27,30,57,60,74,78,90 +2 25 4.710177e+01 28,30,57,60,74,78,90 +2 19 4.303401e+01 29,30,57,60,74,78,90 +2 26 4.636270e+01 30,31,57,60,74,78,90 +2 39 4.199699e+01 30,32,57,60,74,78,90 +2 12 5.100229e+01 30,35,57,60,74,78,90 +2 22 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.092417e+01 30,40,57,60,74,78,90 +2 2 5.550344e+01 30,42,57,60,74,78,90 +2 6 4.959263e+01 30,57,59,60,74,78,90 +2 19 4.992432e+01 30,57,60,62,74,78,90 +2 1 5.046417e+01 30,57,60,63,74,78,90 +2 2 4.955427e+01 30,57,60,66,74,78,90 +2 4 5.131319e+01 30,57,60,68,74,78,90 +2 4 5.049801e+01 30,57,60,69,74,78,90 +2 1 5.035831e+01 30,57,60,70,74,78,90 +2 7 4.949353e+01 30,57,60,74,76,78,90 +2 45 3.946418e+01 30,57,60,74,78 +2 99429 4.898003e+01 30,57,60,74,78,90 +2 20 4.924109e+01 30,57,60,74,78,90,91 +2 2 5.010340e+01 30,57,60,74,78,90,92 +2 2 5.172090e+01 30,57,60,74,78,90,98 +2 37 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 41 4.330013e+01 30,57,74,78,90 +2 47 4.235476e+01 30,60,74,78,90 +2 29 3.101881e+01 57,60,74,78,90 +3 4 5.009987e+01 11,30,57,60,74,78,90 +3 21 4.846652e+01 12,30,57,60,74,78,90 +3 3 5.162988e+01 13,30,57,60,74,78,90 +3 6 5.001102e+01 14,30,57,60,74,78,90 +3 6 5.209925e+01 18,30,57,60,74,78,90 +3 3 5.408172e+01 22,30,57,60,74,78,90 +3 129 4.489658e+01 24,30,57,60,74,78,90 +3 63 4.480868e+01 25,30,57,60,74,78,90 +3 30 4.697990e+01 26,30,57,60,74,78,90 +3 46 4.721079e+01 27,30,57,60,74,78,90 +3 45 4.710177e+01 28,30,57,60,74,78,90 +3 39 4.303401e+01 29,30,57,60,74,78,90 +3 54 4.636270e+01 30,31,57,60,74,78,90 +3 96 4.199699e+01 30,32,57,60,74,78,90 +3 4 5.106816e+01 30,34,57,60,74,78,90 +3 3 5.100229e+01 30,35,57,60,74,78,90 +3 22 4.884998e+01 30,36,57,60,74,78,90 +3 2 5.271108e+01 30,38,57,60,74,78,90 +3 7 5.102157e+01 30,56,57,60,74,78,90 +3 8 4.959263e+01 30,57,59,60,74,78,90 +3 2 5.093039e+01 30,57,60,61,74,78,90 +3 12 4.992432e+01 30,57,60,62,74,78,90 +3 4 5.046417e+01 30,57,60,63,74,78,90 +3 5 4.955427e+01 30,57,60,66,74,78,90 +3 6 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.313605e+01 30,57,60,73,74,78,90 +3 3 4.949353e+01 30,57,60,74,76,78,90 +3 119 3.946418e+01 30,57,60,74,78 +3 2 5.301417e+01 30,57,60,74,78,87,90 +3 98782 4.898003e+01 30,57,60,74,78,90 +3 19 4.924109e+01 30,57,60,74,78,90,91 +3 78 4.293612e+01 30,57,60,74,90 +3 89 4.027826e+01 30,57,60,78,90 +3 90 4.330013e+01 30,57,74,78,90 +3 118 4.235476e+01 30,60,74,78,90 +3 78 3.101881e+01 57,60,74,78,90 diff --git a/test/test1_11-01.test.expected-dat b/test/test1_11-01.test.expected-dat index 1e76363..f74751e 100644 --- a/test/test1_11-01.test.expected-dat +++ b/test/test1_11-01.test.expected-dat @@ -1,190 +1,184 @@ -1 -1 2 4.888530e+01 1 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.662988e+01 13 30 57 60 74 78 90 -1 5 4.501102e+01 14 30 57 60 74 78 90 -1 1 4.489658e+01 24 30 57 60 74 78 90 -1 2 4.480868e+01 25 30 57 60 74 78 90 -1 2 4.710177e+01 28 30 57 60 74 78 90 -1 12 4.303401e+01 29 30 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 1 4.606816e+01 30 34 57 60 74 78 90 -1 8 4.600229e+01 30 35 57 60 74 78 90 -1 9 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 1 4.492432e+01 30 57 60 62 74 78 90 -1 5 4.455427e+01 30 57 60 66 74 78 90 -1 2 4.631319e+01 30 57 60 68 74 78 90 -1 10 4.535831e+01 30 57 60 70 74 78 90 -1 1 4.603031e+01 30 57 60 71 74 78 90 -1 10 3.446418e+01 30 57 60 74 78 -1 99860 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 11 3.793612e+01 30 57 60 74 90 -1 8 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 7 3.735476e+01 30 60 74 78 90 -1 7 3.101881e+01 57 60 74 78 90 -2 -2 2 5.000754e+01 0 30 57 60 74 78 90 -2 7 4.509987e+01 11 30 57 60 74 78 90 -2 15 4.346652e+01 12 30 57 60 74 78 90 -2 2 4.662988e+01 13 30 57 60 74 78 90 -2 5 4.501102e+01 14 30 57 60 74 78 90 -2 3 4.489658e+01 24 30 57 60 74 78 90 -2 6 4.480868e+01 25 30 57 60 74 78 90 -2 3 4.721079e+01 27 30 57 60 74 78 90 -2 32 4.303401e+01 29 30 57 60 74 78 90 -2 4 4.636270e+01 30 31 57 60 74 78 90 -2 13 4.199699e+01 30 32 57 60 74 78 90 -2 3 4.606816e+01 30 34 57 60 74 78 90 -2 3 4.600229e+01 30 35 57 60 74 78 90 -2 18 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.592417e+01 30 40 57 60 74 78 90 -2 2 4.593938e+01 30 44 57 60 74 78 90 -2 14 4.459263e+01 30 57 59 60 74 78 90 -2 5 4.492432e+01 30 57 60 62 74 78 90 -2 2 4.865774e+01 30 57 60 65 74 78 90 -2 11 4.455427e+01 30 57 60 66 74 78 90 -2 2 4.631319e+01 30 57 60 68 74 78 90 -2 2 4.549801e+01 30 57 60 69 74 78 90 -2 2 4.535831e+01 30 57 60 70 74 78 90 -2 1 4.449353e+01 30 57 60 74 76 78 90 -2 29 3.446418e+01 30 57 60 74 78 -2 99642 4.398003e+01 30 57 60 74 78 90 -2 11 4.424109e+01 30 57 60 74 78 90 91 -2 3 4.510340e+01 30 57 60 74 78 90 92 -2 27 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 19 3.735476e+01 30 60 74 78 90 -2 35 3.101881e+01 57 60 74 78 90 -3 -3 4 4.826373e+01 3 30 57 60 74 78 90 -3 4 4.776004e+01 9 30 57 60 74 78 90 -3 8 4.509987e+01 11 30 57 60 74 78 90 -3 36 4.346652e+01 12 30 57 60 74 78 90 -3 6 4.501102e+01 14 30 57 60 74 78 90 -3 2 4.780335e+01 19 30 57 60 74 78 90 -3 4 4.489658e+01 24 30 57 60 74 78 90 -3 3 4.480868e+01 25 30 57 60 74 78 90 -3 56 4.303401e+01 29 30 57 60 74 78 90 -3 43 4.199699e+01 30 32 57 60 74 78 90 -3 3 4.606816e+01 30 34 57 60 74 78 90 -3 22 4.384998e+01 30 36 57 60 74 78 90 -3 3 4.593938e+01 30 44 57 60 74 78 90 -3 12 4.459263e+01 30 57 59 60 74 78 90 -3 1 4.593039e+01 30 57 60 61 74 78 90 -3 2 4.492432e+01 30 57 60 62 74 78 90 -3 1 4.546417e+01 30 57 60 63 74 78 90 -3 1 4.865774e+01 30 57 60 65 74 78 90 -3 17 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.631319e+01 30 57 60 68 74 78 90 -3 3 4.535831e+01 30 57 60 70 74 78 90 -3 4 4.603031e+01 30 57 60 71 74 78 90 -3 2 4.449353e+01 30 57 60 74 76 78 90 -3 82 3.446418e+01 30 57 60 74 78 -3 99314 4.398003e+01 30 57 60 74 78 90 -3 10 4.424109e+01 30 57 60 74 78 90 91 -3 66 3.793612e+01 30 57 60 74 90 -3 63 3.527826e+01 30 57 60 78 90 -3 92 3.830013e+01 30 57 74 78 90 -3 44 3.735476e+01 30 60 74 78 90 -3 89 3.101881e+01 57 60 74 78 90 -1 -1 3 4.509987e+01 11 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 4 4.662988e+01 13 30 57 60 74 78 90 -1 6 4.501102e+01 14 30 57 60 74 78 90 -1 1 5.047597e+01 21 30 57 60 74 78 90 -1 6 4.489658e+01 24 30 57 60 74 78 90 -1 4 4.710177e+01 28 30 57 60 74 78 90 -1 5 4.303401e+01 29 30 57 60 74 78 90 -1 9 4.199699e+01 30 32 57 60 74 78 90 -1 3 4.606816e+01 30 34 57 60 74 78 90 -1 13 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.592417e+01 30 40 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 2 4.459263e+01 30 57 59 60 74 78 90 -1 7 4.492432e+01 30 57 60 62 74 78 90 -1 4 4.546417e+01 30 57 60 63 74 78 90 -1 1 4.455427e+01 30 57 60 66 74 78 90 -1 1 4.631319e+01 30 57 60 68 74 78 90 -1 2 4.549801e+01 30 57 60 69 74 78 90 -1 3 4.603031e+01 30 57 60 71 74 78 90 -1 3 4.449353e+01 30 57 60 74 76 78 90 -1 19 3.446418e+01 30 57 60 74 78 -1 1 4.822720e+01 30 57 60 74 78 86 90 -1 99825 4.398003e+01 30 57 60 74 78 90 -1 2 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 14 3.793612e+01 30 57 60 74 90 -1 10 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 17 3.735476e+01 30 60 74 78 90 -1 12 3.101881e+01 57 60 74 78 90 -2 -2 3 4.509987e+01 11 30 57 60 74 78 90 -2 17 4.346652e+01 12 30 57 60 74 78 90 -2 6 4.501102e+01 14 30 57 60 74 78 90 -2 1 4.709925e+01 18 30 57 60 74 78 90 -2 8 4.489658e+01 24 30 57 60 74 78 90 -2 7 4.480868e+01 25 30 57 60 74 78 90 -2 12 4.303401e+01 29 30 57 60 74 78 90 -2 34 4.199699e+01 30 32 57 60 74 78 90 -2 1 4.606816e+01 30 34 57 60 74 78 90 -2 16 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.665818e+01 30 44 57 60 74 76 78 90 -2 3 4.593938e+01 30 44 57 60 74 78 90 -2 3 4.459263e+01 30 57 59 60 74 78 90 -2 7 4.492432e+01 30 57 60 62 74 78 90 -2 1 4.546417e+01 30 57 60 63 74 78 90 -2 2 4.455427e+01 30 57 60 66 74 78 90 -2 4 4.549801e+01 30 57 60 69 74 78 90 -2 3 4.535831e+01 30 57 60 70 74 78 90 -2 3 4.603031e+01 30 57 60 71 74 78 90 -2 4 4.449353e+01 30 57 60 74 76 78 90 -2 56 3.446418e+01 30 57 60 74 78 -2 99604 4.398003e+01 30 57 60 74 78 90 -2 9 4.424109e+01 30 57 60 74 78 90 91 -2 2 4.672090e+01 30 57 60 74 78 90 98 -2 38 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 41 3.830013e+01 30 57 74 78 90 -2 44 3.735476e+01 30 60 74 78 90 -2 39 3.101881e+01 57 60 74 78 90 -3 -3 3 3.646552e+01 0 57 60 74 78 90 -3 7 4.509987e+01 11 30 57 60 74 78 90 -3 41 4.346652e+01 12 30 57 60 74 78 90 -3 15 4.501102e+01 14 30 57 60 74 78 90 -3 1 4.943149e+01 17 30 57 60 74 78 90 -3 2 4.489658e+01 24 30 57 60 74 78 90 -3 7 4.480868e+01 25 30 57 60 74 78 90 -3 20 4.303401e+01 29 30 57 60 74 78 90 -3 65 4.199699e+01 30 32 57 60 74 78 90 -3 3 4.600229e+01 30 35 57 60 74 78 90 -3 19 4.384998e+01 30 36 57 60 74 78 90 -3 5 4.593938e+01 30 44 57 60 74 78 90 -3 2 4.602157e+01 30 56 57 60 74 78 90 -3 14 4.459263e+01 30 57 59 60 74 78 90 -3 3 4.593039e+01 30 57 60 61 74 78 90 -3 10 4.492432e+01 30 57 60 62 74 78 90 -3 4 4.546417e+01 30 57 60 63 74 78 90 -3 3 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.549801e+01 30 57 60 69 74 78 90 -3 4 4.535831e+01 30 57 60 70 74 78 90 -3 2 4.603031e+01 30 57 60 71 74 78 90 -3 1 4.449353e+01 30 57 60 74 76 78 90 -3 135 3.446418e+01 30 57 60 74 78 -3 99142 4.398003e+01 30 57 60 74 78 90 -3 14 4.424109e+01 30 57 60 74 78 90 91 -3 80 3.793612e+01 30 57 60 74 90 -3 95 3.527826e+01 30 57 60 78 90 -3 93 3.830013e+01 30 57 74 78 90 -3 1 2.828830e+01 30 60 74 78 -3 106 3.735476e+01 30 60 74 78 90 -3 1 3.624070e+01 57 60 74 78 83 90 -3 99 3.101881e+01 57 60 74 78 90 +1 2 4.888530e+01 1,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.662988e+01 13,30,57,60,74,78,90 +1 5 4.501102e+01 14,30,57,60,74,78,90 +1 1 4.489658e+01 24,30,57,60,74,78,90 +1 2 4.480868e+01 25,30,57,60,74,78,90 +1 2 4.710177e+01 28,30,57,60,74,78,90 +1 12 4.303401e+01 29,30,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 1 4.606816e+01 30,34,57,60,74,78,90 +1 8 4.600229e+01 30,35,57,60,74,78,90 +1 9 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 1 4.492432e+01 30,57,60,62,74,78,90 +1 5 4.455427e+01 30,57,60,66,74,78,90 +1 2 4.631319e+01 30,57,60,68,74,78,90 +1 10 4.535831e+01 30,57,60,70,74,78,90 +1 1 4.603031e+01 30,57,60,71,74,78,90 +1 10 3.446418e+01 30,57,60,74,78 +1 99860 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 11 3.793612e+01 30,57,60,74,90 +1 8 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 7 3.735476e+01 30,60,74,78,90 +1 7 3.101881e+01 57,60,74,78,90 +2 2 5.000754e+01 0,30,57,60,74,78,90 +2 7 4.509987e+01 11,30,57,60,74,78,90 +2 15 4.346652e+01 12,30,57,60,74,78,90 +2 2 4.662988e+01 13,30,57,60,74,78,90 +2 5 4.501102e+01 14,30,57,60,74,78,90 +2 3 4.489658e+01 24,30,57,60,74,78,90 +2 6 4.480868e+01 25,30,57,60,74,78,90 +2 3 4.721079e+01 27,30,57,60,74,78,90 +2 32 4.303401e+01 29,30,57,60,74,78,90 +2 4 4.636270e+01 30,31,57,60,74,78,90 +2 13 4.199699e+01 30,32,57,60,74,78,90 +2 3 4.606816e+01 30,34,57,60,74,78,90 +2 3 4.600229e+01 30,35,57,60,74,78,90 +2 18 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.592417e+01 30,40,57,60,74,78,90 +2 2 4.593938e+01 30,44,57,60,74,78,90 +2 14 4.459263e+01 30,57,59,60,74,78,90 +2 5 4.492432e+01 30,57,60,62,74,78,90 +2 2 4.865774e+01 30,57,60,65,74,78,90 +2 11 4.455427e+01 30,57,60,66,74,78,90 +2 2 4.631319e+01 30,57,60,68,74,78,90 +2 2 4.549801e+01 30,57,60,69,74,78,90 +2 2 4.535831e+01 30,57,60,70,74,78,90 +2 1 4.449353e+01 30,57,60,74,76,78,90 +2 29 3.446418e+01 30,57,60,74,78 +2 99642 4.398003e+01 30,57,60,74,78,90 +2 11 4.424109e+01 30,57,60,74,78,90,91 +2 3 4.510340e+01 30,57,60,74,78,90,92 +2 27 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 19 3.735476e+01 30,60,74,78,90 +2 35 3.101881e+01 57,60,74,78,90 +3 4 4.826373e+01 3,30,57,60,74,78,90 +3 4 4.776004e+01 9,30,57,60,74,78,90 +3 8 4.509987e+01 11,30,57,60,74,78,90 +3 36 4.346652e+01 12,30,57,60,74,78,90 +3 6 4.501102e+01 14,30,57,60,74,78,90 +3 2 4.780335e+01 19,30,57,60,74,78,90 +3 4 4.489658e+01 24,30,57,60,74,78,90 +3 3 4.480868e+01 25,30,57,60,74,78,90 +3 56 4.303401e+01 29,30,57,60,74,78,90 +3 43 4.199699e+01 30,32,57,60,74,78,90 +3 3 4.606816e+01 30,34,57,60,74,78,90 +3 22 4.384998e+01 30,36,57,60,74,78,90 +3 3 4.593938e+01 30,44,57,60,74,78,90 +3 12 4.459263e+01 30,57,59,60,74,78,90 +3 1 4.593039e+01 30,57,60,61,74,78,90 +3 2 4.492432e+01 30,57,60,62,74,78,90 +3 1 4.546417e+01 30,57,60,63,74,78,90 +3 1 4.865774e+01 30,57,60,65,74,78,90 +3 17 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.631319e+01 30,57,60,68,74,78,90 +3 3 4.535831e+01 30,57,60,70,74,78,90 +3 4 4.603031e+01 30,57,60,71,74,78,90 +3 2 4.449353e+01 30,57,60,74,76,78,90 +3 82 3.446418e+01 30,57,60,74,78 +3 99314 4.398003e+01 30,57,60,74,78,90 +3 10 4.424109e+01 30,57,60,74,78,90,91 +3 66 3.793612e+01 30,57,60,74,90 +3 63 3.527826e+01 30,57,60,78,90 +3 92 3.830013e+01 30,57,74,78,90 +3 44 3.735476e+01 30,60,74,78,90 +3 89 3.101881e+01 57,60,74,78,90 +1 3 4.509987e+01 11,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 4 4.662988e+01 13,30,57,60,74,78,90 +1 6 4.501102e+01 14,30,57,60,74,78,90 +1 1 5.047597e+01 21,30,57,60,74,78,90 +1 6 4.489658e+01 24,30,57,60,74,78,90 +1 4 4.710177e+01 28,30,57,60,74,78,90 +1 5 4.303401e+01 29,30,57,60,74,78,90 +1 9 4.199699e+01 30,32,57,60,74,78,90 +1 3 4.606816e+01 30,34,57,60,74,78,90 +1 13 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.592417e+01 30,40,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 2 4.459263e+01 30,57,59,60,74,78,90 +1 7 4.492432e+01 30,57,60,62,74,78,90 +1 4 4.546417e+01 30,57,60,63,74,78,90 +1 1 4.455427e+01 30,57,60,66,74,78,90 +1 1 4.631319e+01 30,57,60,68,74,78,90 +1 2 4.549801e+01 30,57,60,69,74,78,90 +1 3 4.603031e+01 30,57,60,71,74,78,90 +1 3 4.449353e+01 30,57,60,74,76,78,90 +1 19 3.446418e+01 30,57,60,74,78 +1 1 4.822720e+01 30,57,60,74,78,86,90 +1 99825 4.398003e+01 30,57,60,74,78,90 +1 2 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 14 3.793612e+01 30,57,60,74,90 +1 10 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 17 3.735476e+01 30,60,74,78,90 +1 12 3.101881e+01 57,60,74,78,90 +2 3 4.509987e+01 11,30,57,60,74,78,90 +2 17 4.346652e+01 12,30,57,60,74,78,90 +2 6 4.501102e+01 14,30,57,60,74,78,90 +2 1 4.709925e+01 18,30,57,60,74,78,90 +2 8 4.489658e+01 24,30,57,60,74,78,90 +2 7 4.480868e+01 25,30,57,60,74,78,90 +2 12 4.303401e+01 29,30,57,60,74,78,90 +2 34 4.199699e+01 30,32,57,60,74,78,90 +2 1 4.606816e+01 30,34,57,60,74,78,90 +2 16 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.665818e+01 30,44,57,60,74,76,78,90 +2 3 4.593938e+01 30,44,57,60,74,78,90 +2 3 4.459263e+01 30,57,59,60,74,78,90 +2 7 4.492432e+01 30,57,60,62,74,78,90 +2 1 4.546417e+01 30,57,60,63,74,78,90 +2 2 4.455427e+01 30,57,60,66,74,78,90 +2 4 4.549801e+01 30,57,60,69,74,78,90 +2 3 4.535831e+01 30,57,60,70,74,78,90 +2 3 4.603031e+01 30,57,60,71,74,78,90 +2 4 4.449353e+01 30,57,60,74,76,78,90 +2 56 3.446418e+01 30,57,60,74,78 +2 99604 4.398003e+01 30,57,60,74,78,90 +2 9 4.424109e+01 30,57,60,74,78,90,91 +2 2 4.672090e+01 30,57,60,74,78,90,98 +2 38 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 41 3.830013e+01 30,57,74,78,90 +2 44 3.735476e+01 30,60,74,78,90 +2 39 3.101881e+01 57,60,74,78,90 +3 3 3.646552e+01 0,57,60,74,78,90 +3 7 4.509987e+01 11,30,57,60,74,78,90 +3 41 4.346652e+01 12,30,57,60,74,78,90 +3 15 4.501102e+01 14,30,57,60,74,78,90 +3 1 4.943149e+01 17,30,57,60,74,78,90 +3 2 4.489658e+01 24,30,57,60,74,78,90 +3 7 4.480868e+01 25,30,57,60,74,78,90 +3 20 4.303401e+01 29,30,57,60,74,78,90 +3 65 4.199699e+01 30,32,57,60,74,78,90 +3 3 4.600229e+01 30,35,57,60,74,78,90 +3 19 4.384998e+01 30,36,57,60,74,78,90 +3 5 4.593938e+01 30,44,57,60,74,78,90 +3 2 4.602157e+01 30,56,57,60,74,78,90 +3 14 4.459263e+01 30,57,59,60,74,78,90 +3 3 4.593039e+01 30,57,60,61,74,78,90 +3 10 4.492432e+01 30,57,60,62,74,78,90 +3 4 4.546417e+01 30,57,60,63,74,78,90 +3 3 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.549801e+01 30,57,60,69,74,78,90 +3 4 4.535831e+01 30,57,60,70,74,78,90 +3 2 4.603031e+01 30,57,60,71,74,78,90 +3 1 4.449353e+01 30,57,60,74,76,78,90 +3 135 3.446418e+01 30,57,60,74,78 +3 99142 4.398003e+01 30,57,60,74,78,90 +3 14 4.424109e+01 30,57,60,74,78,90,91 +3 80 3.793612e+01 30,57,60,74,90 +3 95 3.527826e+01 30,57,60,78,90 +3 93 3.830013e+01 30,57,74,78,90 +3 1 2.828830e+01 30,60,74,78 +3 106 3.735476e+01 30,60,74,78,90 +3 1 3.624070e+01 57,60,74,78,83,90 +3 99 3.101881e+01 57,60,74,78,90 diff --git a/test/test1_11-10.test.expected-dat b/test/test1_11-10.test.expected-dat index e1e940c..cb82299 100644 --- a/test/test1_11-10.test.expected-dat +++ b/test/test1_11-10.test.expected-dat @@ -1,194 +1,188 @@ -1 -1 8 4.888530e+01 1 30 57 60 74 78 90 -1 5 4.846652e+01 12 30 57 60 74 78 90 -1 1 5.162988e+01 13 30 57 60 74 78 90 -1 4 5.001102e+01 14 30 57 60 74 78 90 -1 2 4.989658e+01 24 30 57 60 74 78 90 -1 2 4.980868e+01 25 30 57 60 74 78 90 -1 1 5.210177e+01 28 30 57 60 74 78 90 -1 13 4.803401e+01 29 30 57 60 74 78 90 -1 8 4.699699e+01 30 32 57 60 74 78 90 -1 1 5.106816e+01 30 34 57 60 74 78 90 -1 9 5.100229e+01 30 35 57 60 74 78 90 -1 6 4.884998e+01 30 36 57 60 74 78 90 -1 1 5.093938e+01 30 44 57 60 74 78 90 -1 3 4.959263e+01 30 57 59 60 74 78 90 -1 1 4.992432e+01 30 57 60 62 74 78 90 -1 9 4.955427e+01 30 57 60 66 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 4 5.035831e+01 30 57 60 70 74 78 90 -1 3 5.103031e+01 30 57 60 71 74 78 90 -1 9 3.946418e+01 30 57 60 74 78 -1 99855 4.898003e+01 30 57 60 74 78 90 -1 4 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 13 4.330013e+01 30 57 74 78 90 -1 7 4.235476e+01 30 60 74 78 90 -1 7 3.601881e+01 57 60 74 78 90 -2 -2 4 5.000754e+01 0 30 57 60 74 78 90 -2 14 4.888530e+01 1 30 57 60 74 78 90 -2 5 5.009987e+01 11 30 57 60 74 78 90 -2 18 4.846652e+01 12 30 57 60 74 78 90 -2 8 5.001102e+01 14 30 57 60 74 78 90 -2 3 5.381227e+01 16 30 57 60 74 78 90 -2 3 4.989658e+01 24 30 57 60 74 78 90 -2 7 4.980868e+01 25 30 57 60 74 78 90 -2 25 4.803401e+01 29 30 57 60 74 78 90 -2 1 5.136270e+01 30 31 57 60 74 78 90 -2 19 4.699699e+01 30 32 57 60 74 78 90 -2 2 5.106816e+01 30 34 57 60 74 78 90 -2 2 5.100229e+01 30 35 57 60 74 78 90 -2 13 4.884998e+01 30 36 57 60 74 78 90 -2 2 5.225090e+01 30 37 57 60 74 78 90 -2 3 5.093938e+01 30 44 57 60 74 78 90 -2 2 5.102157e+01 30 56 57 60 74 78 90 -2 14 4.959263e+01 30 57 59 60 74 78 90 -2 6 4.992432e+01 30 57 60 62 74 78 90 -2 1 5.046417e+01 30 57 60 63 74 78 90 -2 11 4.955427e+01 30 57 60 66 74 78 90 -2 2 5.049801e+01 30 57 60 69 74 78 90 -2 2 5.035831e+01 30 57 60 70 74 78 90 -2 5 5.103031e+01 30 57 60 71 74 78 90 -2 37 3.946418e+01 30 57 60 74 78 -2 99621 4.898003e+01 30 57 60 74 78 90 -2 7 4.924109e+01 30 57 60 74 78 90 91 -2 3 5.010340e+01 30 57 60 74 78 90 92 -2 2 5.331382e+01 30 57 60 74 78 90 97 -2 31 4.293612e+01 30 57 60 74 90 -2 32 4.027826e+01 30 57 60 78 90 -2 41 4.330013e+01 30 57 74 78 90 -2 19 4.235476e+01 30 60 74 78 90 -2 35 3.601881e+01 57 60 74 78 90 -3 -3 5 5.000754e+01 0 30 57 60 74 78 90 -3 27 4.888530e+01 1 30 57 60 74 78 90 -3 1 5.009987e+01 11 30 57 60 74 78 90 -3 29 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.162988e+01 13 30 57 60 74 78 90 -3 7 5.001102e+01 14 30 57 60 74 78 90 -3 1 4.989658e+01 24 30 57 60 74 78 90 -3 4 4.980868e+01 25 30 57 60 74 78 90 -3 3 5.221079e+01 27 30 57 60 74 78 90 -3 4 5.210177e+01 28 30 57 60 74 78 90 -3 44 4.803401e+01 29 30 57 60 74 78 90 -3 4 5.136270e+01 30 31 57 60 74 78 90 -3 45 4.699699e+01 30 32 57 60 74 78 90 -3 4 5.100229e+01 30 35 57 60 74 78 90 -3 10 4.884998e+01 30 36 57 60 74 78 90 -3 2 5.271108e+01 30 38 57 60 74 78 90 -3 6 5.093938e+01 30 44 57 60 74 78 90 -3 1 5.102157e+01 30 56 57 60 74 78 90 -3 19 4.959263e+01 30 57 59 60 74 78 90 -3 2 5.093039e+01 30 57 60 61 74 78 90 -3 3 4.992432e+01 30 57 60 62 74 78 90 -3 15 4.955427e+01 30 57 60 66 74 78 90 -3 7 5.049801e+01 30 57 60 69 74 78 90 -3 3 5.035831e+01 30 57 60 70 74 78 90 -3 3 5.103031e+01 30 57 60 71 74 78 90 -3 4 4.949353e+01 30 57 60 74 76 78 90 -3 89 3.946418e+01 30 57 60 74 78 -3 5 5.301417e+01 30 57 60 74 78 87 90 -3 99279 4.898003e+01 30 57 60 74 78 90 -3 6 4.924109e+01 30 57 60 74 78 90 91 -3 8 5.010340e+01 30 57 60 74 78 90 92 -3 81 4.293612e+01 30 57 60 74 90 -3 62 4.027826e+01 30 57 60 78 90 -3 84 4.330013e+01 30 57 74 78 90 -3 50 4.235476e+01 30 60 74 78 90 -3 82 3.601881e+01 57 60 74 78 90 -1 -1 6 5.000754e+01 0 30 57 60 74 78 90 -1 12 4.888530e+01 1 30 57 60 74 78 90 -1 1 5.009987e+01 11 30 57 60 74 78 90 -1 6 4.846652e+01 12 30 57 60 74 78 90 -1 5 5.001102e+01 14 30 57 60 74 78 90 -1 6 4.989658e+01 24 30 57 60 74 78 90 -1 3 5.210177e+01 28 30 57 60 74 78 90 -1 3 4.803401e+01 29 30 57 60 74 78 90 -1 1 5.136270e+01 30 31 57 60 74 78 90 -1 13 4.699699e+01 30 32 57 60 74 78 90 -1 2 5.106816e+01 30 34 57 60 74 78 90 -1 2 5.100229e+01 30 35 57 60 74 78 90 -1 9 4.884998e+01 30 36 57 60 74 78 90 -1 1 5.102157e+01 30 56 57 60 74 78 90 -1 1 4.959263e+01 30 57 59 60 74 78 90 -1 5 4.992432e+01 30 57 60 62 74 78 90 -1 1 5.046417e+01 30 57 60 63 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 2 5.035831e+01 30 57 60 70 74 78 90 -1 1 5.103031e+01 30 57 60 71 74 78 90 -1 2 4.949353e+01 30 57 60 74 76 78 90 -1 12 3.946418e+01 30 57 60 74 78 -1 99820 4.898003e+01 30 57 60 74 78 90 -1 9 4.924109e+01 30 57 60 74 78 90 91 -1 9 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 13 4.027826e+01 30 57 60 78 90 -1 12 4.330013e+01 30 57 74 78 90 -1 14 4.235476e+01 30 60 74 78 90 -1 15 3.601881e+01 57 60 74 78 90 -2 -2 8 5.000754e+01 0 30 57 60 74 78 90 -2 17 4.888530e+01 1 30 57 60 74 78 90 -2 2 5.276004e+01 9 30 57 60 74 78 90 -2 2 5.009987e+01 11 30 57 60 74 78 90 -2 22 4.846652e+01 12 30 57 60 74 78 90 -2 10 5.001102e+01 14 30 57 60 74 78 90 -2 6 4.989658e+01 24 30 57 60 74 78 90 -2 10 4.803401e+01 29 30 57 60 74 78 90 -2 31 4.699699e+01 30 32 57 60 74 78 90 -2 4 5.100229e+01 30 35 57 60 74 78 90 -2 19 4.884998e+01 30 36 57 60 74 78 90 -2 2 5.093938e+01 30 44 57 60 74 78 90 -2 3 5.102157e+01 30 56 57 60 74 78 90 -2 3 4.959263e+01 30 57 59 60 74 78 90 -2 5 4.992432e+01 30 57 60 62 74 78 90 -2 2 4.955427e+01 30 57 60 66 74 78 90 -2 5 5.131319e+01 30 57 60 68 74 78 90 -2 5 5.035831e+01 30 57 60 70 74 78 90 -2 1 5.103031e+01 30 57 60 71 74 78 90 -2 6 4.949353e+01 30 57 60 74 76 78 90 -2 46 3.946418e+01 30 57 60 74 78 -2 1 5.322720e+01 30 57 60 74 78 86 90 -2 99567 4.898003e+01 30 57 60 74 78 90 -2 16 4.924109e+01 30 57 60 74 78 90 91 -2 14 5.010340e+01 30 57 60 74 78 90 92 -2 31 4.293612e+01 30 57 60 74 90 -2 37 4.027826e+01 30 57 60 78 90 -2 41 4.330013e+01 30 57 74 78 90 -2 37 4.235476e+01 30 60 74 78 90 -2 47 3.601881e+01 57 60 74 78 90 -3 -3 11 5.000754e+01 0 30 57 60 74 78 90 -3 26 4.888530e+01 1 30 57 60 74 78 90 -3 4 5.009987e+01 11 30 57 60 74 78 90 -3 31 4.846652e+01 12 30 57 60 74 78 90 -3 5 5.162988e+01 13 30 57 60 74 78 90 -3 13 5.001102e+01 14 30 57 60 74 78 90 -3 6 4.989658e+01 24 30 57 60 74 78 90 -3 1 5.006636e+01 24 30 57 60 74 78 90 91 -3 9 4.980868e+01 25 30 57 60 74 78 90 -3 14 4.803401e+01 29 30 57 60 74 78 90 -3 66 4.699699e+01 30 32 57 60 74 78 90 -3 1 5.106816e+01 30 34 57 60 74 78 90 -3 27 4.884998e+01 30 36 57 60 74 78 90 -3 1 5.093938e+01 30 44 57 60 74 78 90 -3 6 5.102157e+01 30 56 57 60 74 78 90 -3 6 4.959263e+01 30 57 59 60 74 78 90 -3 5 5.093039e+01 30 57 60 61 74 78 90 -3 6 4.992432e+01 30 57 60 62 74 78 90 -3 4 5.049801e+01 30 57 60 69 74 78 90 -3 4 5.103031e+01 30 57 60 71 74 78 90 -3 3 4.949353e+01 30 57 60 74 76 78 90 -3 128 3.946418e+01 30 57 60 74 78 -3 99112 4.898003e+01 30 57 60 74 78 90 -3 25 4.924109e+01 30 57 60 74 78 90 91 -3 12 5.010340e+01 30 57 60 74 78 90 92 -3 63 4.293612e+01 30 57 60 74 90 -3 105 4.027826e+01 30 57 60 78 90 -3 93 4.330013e+01 30 57 74 78 90 -3 95 4.235476e+01 30 60 74 78 90 -3 118 3.601881e+01 57 60 74 78 90 +1 8 4.888530e+01 1,30,57,60,74,78,90 +1 5 4.846652e+01 12,30,57,60,74,78,90 +1 1 5.162988e+01 13,30,57,60,74,78,90 +1 4 5.001102e+01 14,30,57,60,74,78,90 +1 2 4.989658e+01 24,30,57,60,74,78,90 +1 2 4.980868e+01 25,30,57,60,74,78,90 +1 1 5.210177e+01 28,30,57,60,74,78,90 +1 13 4.803401e+01 29,30,57,60,74,78,90 +1 8 4.699699e+01 30,32,57,60,74,78,90 +1 1 5.106816e+01 30,34,57,60,74,78,90 +1 9 5.100229e+01 30,35,57,60,74,78,90 +1 6 4.884998e+01 30,36,57,60,74,78,90 +1 1 5.093938e+01 30,44,57,60,74,78,90 +1 3 4.959263e+01 30,57,59,60,74,78,90 +1 1 4.992432e+01 30,57,60,62,74,78,90 +1 9 4.955427e+01 30,57,60,66,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 4 5.035831e+01 30,57,60,70,74,78,90 +1 3 5.103031e+01 30,57,60,71,74,78,90 +1 9 3.946418e+01 30,57,60,74,78 +1 99855 4.898003e+01 30,57,60,74,78,90 +1 4 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 13 4.330013e+01 30,57,74,78,90 +1 7 4.235476e+01 30,60,74,78,90 +1 7 3.601881e+01 57,60,74,78,90 +2 4 5.000754e+01 0,30,57,60,74,78,90 +2 14 4.888530e+01 1,30,57,60,74,78,90 +2 5 5.009987e+01 11,30,57,60,74,78,90 +2 18 4.846652e+01 12,30,57,60,74,78,90 +2 8 5.001102e+01 14,30,57,60,74,78,90 +2 3 5.381227e+01 16,30,57,60,74,78,90 +2 3 4.989658e+01 24,30,57,60,74,78,90 +2 7 4.980868e+01 25,30,57,60,74,78,90 +2 25 4.803401e+01 29,30,57,60,74,78,90 +2 1 5.136270e+01 30,31,57,60,74,78,90 +2 19 4.699699e+01 30,32,57,60,74,78,90 +2 2 5.106816e+01 30,34,57,60,74,78,90 +2 2 5.100229e+01 30,35,57,60,74,78,90 +2 13 4.884998e+01 30,36,57,60,74,78,90 +2 2 5.225090e+01 30,37,57,60,74,78,90 +2 3 5.093938e+01 30,44,57,60,74,78,90 +2 2 5.102157e+01 30,56,57,60,74,78,90 +2 14 4.959263e+01 30,57,59,60,74,78,90 +2 6 4.992432e+01 30,57,60,62,74,78,90 +2 1 5.046417e+01 30,57,60,63,74,78,90 +2 11 4.955427e+01 30,57,60,66,74,78,90 +2 2 5.049801e+01 30,57,60,69,74,78,90 +2 2 5.035831e+01 30,57,60,70,74,78,90 +2 5 5.103031e+01 30,57,60,71,74,78,90 +2 37 3.946418e+01 30,57,60,74,78 +2 99621 4.898003e+01 30,57,60,74,78,90 +2 7 4.924109e+01 30,57,60,74,78,90,91 +2 3 5.010340e+01 30,57,60,74,78,90,92 +2 2 5.331382e+01 30,57,60,74,78,90,97 +2 31 4.293612e+01 30,57,60,74,90 +2 32 4.027826e+01 30,57,60,78,90 +2 41 4.330013e+01 30,57,74,78,90 +2 19 4.235476e+01 30,60,74,78,90 +2 35 3.601881e+01 57,60,74,78,90 +3 5 5.000754e+01 0,30,57,60,74,78,90 +3 27 4.888530e+01 1,30,57,60,74,78,90 +3 1 5.009987e+01 11,30,57,60,74,78,90 +3 29 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.162988e+01 13,30,57,60,74,78,90 +3 7 5.001102e+01 14,30,57,60,74,78,90 +3 1 4.989658e+01 24,30,57,60,74,78,90 +3 4 4.980868e+01 25,30,57,60,74,78,90 +3 3 5.221079e+01 27,30,57,60,74,78,90 +3 4 5.210177e+01 28,30,57,60,74,78,90 +3 44 4.803401e+01 29,30,57,60,74,78,90 +3 4 5.136270e+01 30,31,57,60,74,78,90 +3 45 4.699699e+01 30,32,57,60,74,78,90 +3 4 5.100229e+01 30,35,57,60,74,78,90 +3 10 4.884998e+01 30,36,57,60,74,78,90 +3 2 5.271108e+01 30,38,57,60,74,78,90 +3 6 5.093938e+01 30,44,57,60,74,78,90 +3 1 5.102157e+01 30,56,57,60,74,78,90 +3 19 4.959263e+01 30,57,59,60,74,78,90 +3 2 5.093039e+01 30,57,60,61,74,78,90 +3 3 4.992432e+01 30,57,60,62,74,78,90 +3 15 4.955427e+01 30,57,60,66,74,78,90 +3 7 5.049801e+01 30,57,60,69,74,78,90 +3 3 5.035831e+01 30,57,60,70,74,78,90 +3 3 5.103031e+01 30,57,60,71,74,78,90 +3 4 4.949353e+01 30,57,60,74,76,78,90 +3 89 3.946418e+01 30,57,60,74,78 +3 5 5.301417e+01 30,57,60,74,78,87,90 +3 99279 4.898003e+01 30,57,60,74,78,90 +3 6 4.924109e+01 30,57,60,74,78,90,91 +3 8 5.010340e+01 30,57,60,74,78,90,92 +3 81 4.293612e+01 30,57,60,74,90 +3 62 4.027826e+01 30,57,60,78,90 +3 84 4.330013e+01 30,57,74,78,90 +3 50 4.235476e+01 30,60,74,78,90 +3 82 3.601881e+01 57,60,74,78,90 +1 6 5.000754e+01 0,30,57,60,74,78,90 +1 12 4.888530e+01 1,30,57,60,74,78,90 +1 1 5.009987e+01 11,30,57,60,74,78,90 +1 6 4.846652e+01 12,30,57,60,74,78,90 +1 5 5.001102e+01 14,30,57,60,74,78,90 +1 6 4.989658e+01 24,30,57,60,74,78,90 +1 3 5.210177e+01 28,30,57,60,74,78,90 +1 3 4.803401e+01 29,30,57,60,74,78,90 +1 1 5.136270e+01 30,31,57,60,74,78,90 +1 13 4.699699e+01 30,32,57,60,74,78,90 +1 2 5.106816e+01 30,34,57,60,74,78,90 +1 2 5.100229e+01 30,35,57,60,74,78,90 +1 9 4.884998e+01 30,36,57,60,74,78,90 +1 1 5.102157e+01 30,56,57,60,74,78,90 +1 1 4.959263e+01 30,57,59,60,74,78,90 +1 5 4.992432e+01 30,57,60,62,74,78,90 +1 1 5.046417e+01 30,57,60,63,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 2 5.035831e+01 30,57,60,70,74,78,90 +1 1 5.103031e+01 30,57,60,71,74,78,90 +1 2 4.949353e+01 30,57,60,74,76,78,90 +1 12 3.946418e+01 30,57,60,74,78 +1 99820 4.898003e+01 30,57,60,74,78,90 +1 9 4.924109e+01 30,57,60,74,78,90,91 +1 9 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 13 4.027826e+01 30,57,60,78,90 +1 12 4.330013e+01 30,57,74,78,90 +1 14 4.235476e+01 30,60,74,78,90 +1 15 3.601881e+01 57,60,74,78,90 +2 8 5.000754e+01 0,30,57,60,74,78,90 +2 17 4.888530e+01 1,30,57,60,74,78,90 +2 2 5.276004e+01 9,30,57,60,74,78,90 +2 2 5.009987e+01 11,30,57,60,74,78,90 +2 22 4.846652e+01 12,30,57,60,74,78,90 +2 10 5.001102e+01 14,30,57,60,74,78,90 +2 6 4.989658e+01 24,30,57,60,74,78,90 +2 10 4.803401e+01 29,30,57,60,74,78,90 +2 31 4.699699e+01 30,32,57,60,74,78,90 +2 4 5.100229e+01 30,35,57,60,74,78,90 +2 19 4.884998e+01 30,36,57,60,74,78,90 +2 2 5.093938e+01 30,44,57,60,74,78,90 +2 3 5.102157e+01 30,56,57,60,74,78,90 +2 3 4.959263e+01 30,57,59,60,74,78,90 +2 5 4.992432e+01 30,57,60,62,74,78,90 +2 2 4.955427e+01 30,57,60,66,74,78,90 +2 5 5.131319e+01 30,57,60,68,74,78,90 +2 5 5.035831e+01 30,57,60,70,74,78,90 +2 1 5.103031e+01 30,57,60,71,74,78,90 +2 6 4.949353e+01 30,57,60,74,76,78,90 +2 46 3.946418e+01 30,57,60,74,78 +2 1 5.322720e+01 30,57,60,74,78,86,90 +2 99567 4.898003e+01 30,57,60,74,78,90 +2 16 4.924109e+01 30,57,60,74,78,90,91 +2 14 5.010340e+01 30,57,60,74,78,90,92 +2 31 4.293612e+01 30,57,60,74,90 +2 37 4.027826e+01 30,57,60,78,90 +2 41 4.330013e+01 30,57,74,78,90 +2 37 4.235476e+01 30,60,74,78,90 +2 47 3.601881e+01 57,60,74,78,90 +3 11 5.000754e+01 0,30,57,60,74,78,90 +3 26 4.888530e+01 1,30,57,60,74,78,90 +3 4 5.009987e+01 11,30,57,60,74,78,90 +3 31 4.846652e+01 12,30,57,60,74,78,90 +3 5 5.162988e+01 13,30,57,60,74,78,90 +3 13 5.001102e+01 14,30,57,60,74,78,90 +3 6 4.989658e+01 24,30,57,60,74,78,90 +3 1 5.006636e+01 24,30,57,60,74,78,90,91 +3 9 4.980868e+01 25,30,57,60,74,78,90 +3 14 4.803401e+01 29,30,57,60,74,78,90 +3 66 4.699699e+01 30,32,57,60,74,78,90 +3 1 5.106816e+01 30,34,57,60,74,78,90 +3 27 4.884998e+01 30,36,57,60,74,78,90 +3 1 5.093938e+01 30,44,57,60,74,78,90 +3 6 5.102157e+01 30,56,57,60,74,78,90 +3 6 4.959263e+01 30,57,59,60,74,78,90 +3 5 5.093039e+01 30,57,60,61,74,78,90 +3 6 4.992432e+01 30,57,60,62,74,78,90 +3 4 5.049801e+01 30,57,60,69,74,78,90 +3 4 5.103031e+01 30,57,60,71,74,78,90 +3 3 4.949353e+01 30,57,60,74,76,78,90 +3 128 3.946418e+01 30,57,60,74,78 +3 99112 4.898003e+01 30,57,60,74,78,90 +3 25 4.924109e+01 30,57,60,74,78,90,91 +3 12 5.010340e+01 30,57,60,74,78,90,92 +3 63 4.293612e+01 30,57,60,74,90 +3 105 4.027826e+01 30,57,60,78,90 +3 93 4.330013e+01 30,57,74,78,90 +3 95 4.235476e+01 30,60,74,78,90 +3 118 3.601881e+01 57,60,74,78,90 diff --git a/test/test1_11-11.test.expected-dat b/test/test1_11-11.test.expected-dat index 1e76363..f74751e 100644 --- a/test/test1_11-11.test.expected-dat +++ b/test/test1_11-11.test.expected-dat @@ -1,190 +1,184 @@ -1 -1 2 4.888530e+01 1 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 2 4.662988e+01 13 30 57 60 74 78 90 -1 5 4.501102e+01 14 30 57 60 74 78 90 -1 1 4.489658e+01 24 30 57 60 74 78 90 -1 2 4.480868e+01 25 30 57 60 74 78 90 -1 2 4.710177e+01 28 30 57 60 74 78 90 -1 12 4.303401e+01 29 30 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 1 4.606816e+01 30 34 57 60 74 78 90 -1 8 4.600229e+01 30 35 57 60 74 78 90 -1 9 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 3 4.459263e+01 30 57 59 60 74 78 90 -1 1 4.492432e+01 30 57 60 62 74 78 90 -1 5 4.455427e+01 30 57 60 66 74 78 90 -1 2 4.631319e+01 30 57 60 68 74 78 90 -1 10 4.535831e+01 30 57 60 70 74 78 90 -1 1 4.603031e+01 30 57 60 71 74 78 90 -1 10 3.446418e+01 30 57 60 74 78 -1 99860 4.398003e+01 30 57 60 74 78 90 -1 4 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 11 3.793612e+01 30 57 60 74 90 -1 8 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 7 3.735476e+01 30 60 74 78 90 -1 7 3.101881e+01 57 60 74 78 90 -2 -2 2 5.000754e+01 0 30 57 60 74 78 90 -2 7 4.509987e+01 11 30 57 60 74 78 90 -2 15 4.346652e+01 12 30 57 60 74 78 90 -2 2 4.662988e+01 13 30 57 60 74 78 90 -2 5 4.501102e+01 14 30 57 60 74 78 90 -2 3 4.489658e+01 24 30 57 60 74 78 90 -2 6 4.480868e+01 25 30 57 60 74 78 90 -2 3 4.721079e+01 27 30 57 60 74 78 90 -2 32 4.303401e+01 29 30 57 60 74 78 90 -2 4 4.636270e+01 30 31 57 60 74 78 90 -2 13 4.199699e+01 30 32 57 60 74 78 90 -2 3 4.606816e+01 30 34 57 60 74 78 90 -2 3 4.600229e+01 30 35 57 60 74 78 90 -2 18 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.592417e+01 30 40 57 60 74 78 90 -2 2 4.593938e+01 30 44 57 60 74 78 90 -2 14 4.459263e+01 30 57 59 60 74 78 90 -2 5 4.492432e+01 30 57 60 62 74 78 90 -2 2 4.865774e+01 30 57 60 65 74 78 90 -2 11 4.455427e+01 30 57 60 66 74 78 90 -2 2 4.631319e+01 30 57 60 68 74 78 90 -2 2 4.549801e+01 30 57 60 69 74 78 90 -2 2 4.535831e+01 30 57 60 70 74 78 90 -2 1 4.449353e+01 30 57 60 74 76 78 90 -2 29 3.446418e+01 30 57 60 74 78 -2 99642 4.398003e+01 30 57 60 74 78 90 -2 11 4.424109e+01 30 57 60 74 78 90 91 -2 3 4.510340e+01 30 57 60 74 78 90 92 -2 27 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 45 3.830013e+01 30 57 74 78 90 -2 19 3.735476e+01 30 60 74 78 90 -2 35 3.101881e+01 57 60 74 78 90 -3 -3 4 4.826373e+01 3 30 57 60 74 78 90 -3 4 4.776004e+01 9 30 57 60 74 78 90 -3 8 4.509987e+01 11 30 57 60 74 78 90 -3 36 4.346652e+01 12 30 57 60 74 78 90 -3 6 4.501102e+01 14 30 57 60 74 78 90 -3 2 4.780335e+01 19 30 57 60 74 78 90 -3 4 4.489658e+01 24 30 57 60 74 78 90 -3 3 4.480868e+01 25 30 57 60 74 78 90 -3 56 4.303401e+01 29 30 57 60 74 78 90 -3 43 4.199699e+01 30 32 57 60 74 78 90 -3 3 4.606816e+01 30 34 57 60 74 78 90 -3 22 4.384998e+01 30 36 57 60 74 78 90 -3 3 4.593938e+01 30 44 57 60 74 78 90 -3 12 4.459263e+01 30 57 59 60 74 78 90 -3 1 4.593039e+01 30 57 60 61 74 78 90 -3 2 4.492432e+01 30 57 60 62 74 78 90 -3 1 4.546417e+01 30 57 60 63 74 78 90 -3 1 4.865774e+01 30 57 60 65 74 78 90 -3 17 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.631319e+01 30 57 60 68 74 78 90 -3 3 4.535831e+01 30 57 60 70 74 78 90 -3 4 4.603031e+01 30 57 60 71 74 78 90 -3 2 4.449353e+01 30 57 60 74 76 78 90 -3 82 3.446418e+01 30 57 60 74 78 -3 99314 4.398003e+01 30 57 60 74 78 90 -3 10 4.424109e+01 30 57 60 74 78 90 91 -3 66 3.793612e+01 30 57 60 74 90 -3 63 3.527826e+01 30 57 60 78 90 -3 92 3.830013e+01 30 57 74 78 90 -3 44 3.735476e+01 30 60 74 78 90 -3 89 3.101881e+01 57 60 74 78 90 -1 -1 3 4.509987e+01 11 30 57 60 74 78 90 -1 4 4.346652e+01 12 30 57 60 74 78 90 -1 4 4.662988e+01 13 30 57 60 74 78 90 -1 6 4.501102e+01 14 30 57 60 74 78 90 -1 1 5.047597e+01 21 30 57 60 74 78 90 -1 6 4.489658e+01 24 30 57 60 74 78 90 -1 4 4.710177e+01 28 30 57 60 74 78 90 -1 5 4.303401e+01 29 30 57 60 74 78 90 -1 9 4.199699e+01 30 32 57 60 74 78 90 -1 3 4.606816e+01 30 34 57 60 74 78 90 -1 13 4.384998e+01 30 36 57 60 74 78 90 -1 2 4.592417e+01 30 40 57 60 74 78 90 -1 2 4.593938e+01 30 44 57 60 74 78 90 -1 2 4.459263e+01 30 57 59 60 74 78 90 -1 7 4.492432e+01 30 57 60 62 74 78 90 -1 4 4.546417e+01 30 57 60 63 74 78 90 -1 1 4.455427e+01 30 57 60 66 74 78 90 -1 1 4.631319e+01 30 57 60 68 74 78 90 -1 2 4.549801e+01 30 57 60 69 74 78 90 -1 3 4.603031e+01 30 57 60 71 74 78 90 -1 3 4.449353e+01 30 57 60 74 76 78 90 -1 19 3.446418e+01 30 57 60 74 78 -1 1 4.822720e+01 30 57 60 74 78 86 90 -1 99825 4.398003e+01 30 57 60 74 78 90 -1 2 4.424109e+01 30 57 60 74 78 90 91 -1 2 4.510340e+01 30 57 60 74 78 90 92 -1 14 3.793612e+01 30 57 60 74 90 -1 10 3.527826e+01 30 57 60 78 90 -1 13 3.830013e+01 30 57 74 78 90 -1 17 3.735476e+01 30 60 74 78 90 -1 12 3.101881e+01 57 60 74 78 90 -2 -2 3 4.509987e+01 11 30 57 60 74 78 90 -2 17 4.346652e+01 12 30 57 60 74 78 90 -2 6 4.501102e+01 14 30 57 60 74 78 90 -2 1 4.709925e+01 18 30 57 60 74 78 90 -2 8 4.489658e+01 24 30 57 60 74 78 90 -2 7 4.480868e+01 25 30 57 60 74 78 90 -2 12 4.303401e+01 29 30 57 60 74 78 90 -2 34 4.199699e+01 30 32 57 60 74 78 90 -2 1 4.606816e+01 30 34 57 60 74 78 90 -2 16 4.384998e+01 30 36 57 60 74 78 90 -2 1 4.665818e+01 30 44 57 60 74 76 78 90 -2 3 4.593938e+01 30 44 57 60 74 78 90 -2 3 4.459263e+01 30 57 59 60 74 78 90 -2 7 4.492432e+01 30 57 60 62 74 78 90 -2 1 4.546417e+01 30 57 60 63 74 78 90 -2 2 4.455427e+01 30 57 60 66 74 78 90 -2 4 4.549801e+01 30 57 60 69 74 78 90 -2 3 4.535831e+01 30 57 60 70 74 78 90 -2 3 4.603031e+01 30 57 60 71 74 78 90 -2 4 4.449353e+01 30 57 60 74 76 78 90 -2 56 3.446418e+01 30 57 60 74 78 -2 99604 4.398003e+01 30 57 60 74 78 90 -2 9 4.424109e+01 30 57 60 74 78 90 91 -2 2 4.672090e+01 30 57 60 74 78 90 98 -2 38 3.793612e+01 30 57 60 74 90 -2 31 3.527826e+01 30 57 60 78 90 -2 41 3.830013e+01 30 57 74 78 90 -2 44 3.735476e+01 30 60 74 78 90 -2 39 3.101881e+01 57 60 74 78 90 -3 -3 3 3.646552e+01 0 57 60 74 78 90 -3 7 4.509987e+01 11 30 57 60 74 78 90 -3 41 4.346652e+01 12 30 57 60 74 78 90 -3 15 4.501102e+01 14 30 57 60 74 78 90 -3 1 4.943149e+01 17 30 57 60 74 78 90 -3 2 4.489658e+01 24 30 57 60 74 78 90 -3 7 4.480868e+01 25 30 57 60 74 78 90 -3 20 4.303401e+01 29 30 57 60 74 78 90 -3 65 4.199699e+01 30 32 57 60 74 78 90 -3 3 4.600229e+01 30 35 57 60 74 78 90 -3 19 4.384998e+01 30 36 57 60 74 78 90 -3 5 4.593938e+01 30 44 57 60 74 78 90 -3 2 4.602157e+01 30 56 57 60 74 78 90 -3 14 4.459263e+01 30 57 59 60 74 78 90 -3 3 4.593039e+01 30 57 60 61 74 78 90 -3 10 4.492432e+01 30 57 60 62 74 78 90 -3 4 4.546417e+01 30 57 60 63 74 78 90 -3 3 4.455427e+01 30 57 60 66 74 78 90 -3 3 4.549801e+01 30 57 60 69 74 78 90 -3 4 4.535831e+01 30 57 60 70 74 78 90 -3 2 4.603031e+01 30 57 60 71 74 78 90 -3 1 4.449353e+01 30 57 60 74 76 78 90 -3 135 3.446418e+01 30 57 60 74 78 -3 99142 4.398003e+01 30 57 60 74 78 90 -3 14 4.424109e+01 30 57 60 74 78 90 91 -3 80 3.793612e+01 30 57 60 74 90 -3 95 3.527826e+01 30 57 60 78 90 -3 93 3.830013e+01 30 57 74 78 90 -3 1 2.828830e+01 30 60 74 78 -3 106 3.735476e+01 30 60 74 78 90 -3 1 3.624070e+01 57 60 74 78 83 90 -3 99 3.101881e+01 57 60 74 78 90 +1 2 4.888530e+01 1,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 2 4.662988e+01 13,30,57,60,74,78,90 +1 5 4.501102e+01 14,30,57,60,74,78,90 +1 1 4.489658e+01 24,30,57,60,74,78,90 +1 2 4.480868e+01 25,30,57,60,74,78,90 +1 2 4.710177e+01 28,30,57,60,74,78,90 +1 12 4.303401e+01 29,30,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 1 4.606816e+01 30,34,57,60,74,78,90 +1 8 4.600229e+01 30,35,57,60,74,78,90 +1 9 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 3 4.459263e+01 30,57,59,60,74,78,90 +1 1 4.492432e+01 30,57,60,62,74,78,90 +1 5 4.455427e+01 30,57,60,66,74,78,90 +1 2 4.631319e+01 30,57,60,68,74,78,90 +1 10 4.535831e+01 30,57,60,70,74,78,90 +1 1 4.603031e+01 30,57,60,71,74,78,90 +1 10 3.446418e+01 30,57,60,74,78 +1 99860 4.398003e+01 30,57,60,74,78,90 +1 4 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 11 3.793612e+01 30,57,60,74,90 +1 8 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 7 3.735476e+01 30,60,74,78,90 +1 7 3.101881e+01 57,60,74,78,90 +2 2 5.000754e+01 0,30,57,60,74,78,90 +2 7 4.509987e+01 11,30,57,60,74,78,90 +2 15 4.346652e+01 12,30,57,60,74,78,90 +2 2 4.662988e+01 13,30,57,60,74,78,90 +2 5 4.501102e+01 14,30,57,60,74,78,90 +2 3 4.489658e+01 24,30,57,60,74,78,90 +2 6 4.480868e+01 25,30,57,60,74,78,90 +2 3 4.721079e+01 27,30,57,60,74,78,90 +2 32 4.303401e+01 29,30,57,60,74,78,90 +2 4 4.636270e+01 30,31,57,60,74,78,90 +2 13 4.199699e+01 30,32,57,60,74,78,90 +2 3 4.606816e+01 30,34,57,60,74,78,90 +2 3 4.600229e+01 30,35,57,60,74,78,90 +2 18 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.592417e+01 30,40,57,60,74,78,90 +2 2 4.593938e+01 30,44,57,60,74,78,90 +2 14 4.459263e+01 30,57,59,60,74,78,90 +2 5 4.492432e+01 30,57,60,62,74,78,90 +2 2 4.865774e+01 30,57,60,65,74,78,90 +2 11 4.455427e+01 30,57,60,66,74,78,90 +2 2 4.631319e+01 30,57,60,68,74,78,90 +2 2 4.549801e+01 30,57,60,69,74,78,90 +2 2 4.535831e+01 30,57,60,70,74,78,90 +2 1 4.449353e+01 30,57,60,74,76,78,90 +2 29 3.446418e+01 30,57,60,74,78 +2 99642 4.398003e+01 30,57,60,74,78,90 +2 11 4.424109e+01 30,57,60,74,78,90,91 +2 3 4.510340e+01 30,57,60,74,78,90,92 +2 27 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 45 3.830013e+01 30,57,74,78,90 +2 19 3.735476e+01 30,60,74,78,90 +2 35 3.101881e+01 57,60,74,78,90 +3 4 4.826373e+01 3,30,57,60,74,78,90 +3 4 4.776004e+01 9,30,57,60,74,78,90 +3 8 4.509987e+01 11,30,57,60,74,78,90 +3 36 4.346652e+01 12,30,57,60,74,78,90 +3 6 4.501102e+01 14,30,57,60,74,78,90 +3 2 4.780335e+01 19,30,57,60,74,78,90 +3 4 4.489658e+01 24,30,57,60,74,78,90 +3 3 4.480868e+01 25,30,57,60,74,78,90 +3 56 4.303401e+01 29,30,57,60,74,78,90 +3 43 4.199699e+01 30,32,57,60,74,78,90 +3 3 4.606816e+01 30,34,57,60,74,78,90 +3 22 4.384998e+01 30,36,57,60,74,78,90 +3 3 4.593938e+01 30,44,57,60,74,78,90 +3 12 4.459263e+01 30,57,59,60,74,78,90 +3 1 4.593039e+01 30,57,60,61,74,78,90 +3 2 4.492432e+01 30,57,60,62,74,78,90 +3 1 4.546417e+01 30,57,60,63,74,78,90 +3 1 4.865774e+01 30,57,60,65,74,78,90 +3 17 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.631319e+01 30,57,60,68,74,78,90 +3 3 4.535831e+01 30,57,60,70,74,78,90 +3 4 4.603031e+01 30,57,60,71,74,78,90 +3 2 4.449353e+01 30,57,60,74,76,78,90 +3 82 3.446418e+01 30,57,60,74,78 +3 99314 4.398003e+01 30,57,60,74,78,90 +3 10 4.424109e+01 30,57,60,74,78,90,91 +3 66 3.793612e+01 30,57,60,74,90 +3 63 3.527826e+01 30,57,60,78,90 +3 92 3.830013e+01 30,57,74,78,90 +3 44 3.735476e+01 30,60,74,78,90 +3 89 3.101881e+01 57,60,74,78,90 +1 3 4.509987e+01 11,30,57,60,74,78,90 +1 4 4.346652e+01 12,30,57,60,74,78,90 +1 4 4.662988e+01 13,30,57,60,74,78,90 +1 6 4.501102e+01 14,30,57,60,74,78,90 +1 1 5.047597e+01 21,30,57,60,74,78,90 +1 6 4.489658e+01 24,30,57,60,74,78,90 +1 4 4.710177e+01 28,30,57,60,74,78,90 +1 5 4.303401e+01 29,30,57,60,74,78,90 +1 9 4.199699e+01 30,32,57,60,74,78,90 +1 3 4.606816e+01 30,34,57,60,74,78,90 +1 13 4.384998e+01 30,36,57,60,74,78,90 +1 2 4.592417e+01 30,40,57,60,74,78,90 +1 2 4.593938e+01 30,44,57,60,74,78,90 +1 2 4.459263e+01 30,57,59,60,74,78,90 +1 7 4.492432e+01 30,57,60,62,74,78,90 +1 4 4.546417e+01 30,57,60,63,74,78,90 +1 1 4.455427e+01 30,57,60,66,74,78,90 +1 1 4.631319e+01 30,57,60,68,74,78,90 +1 2 4.549801e+01 30,57,60,69,74,78,90 +1 3 4.603031e+01 30,57,60,71,74,78,90 +1 3 4.449353e+01 30,57,60,74,76,78,90 +1 19 3.446418e+01 30,57,60,74,78 +1 1 4.822720e+01 30,57,60,74,78,86,90 +1 99825 4.398003e+01 30,57,60,74,78,90 +1 2 4.424109e+01 30,57,60,74,78,90,91 +1 2 4.510340e+01 30,57,60,74,78,90,92 +1 14 3.793612e+01 30,57,60,74,90 +1 10 3.527826e+01 30,57,60,78,90 +1 13 3.830013e+01 30,57,74,78,90 +1 17 3.735476e+01 30,60,74,78,90 +1 12 3.101881e+01 57,60,74,78,90 +2 3 4.509987e+01 11,30,57,60,74,78,90 +2 17 4.346652e+01 12,30,57,60,74,78,90 +2 6 4.501102e+01 14,30,57,60,74,78,90 +2 1 4.709925e+01 18,30,57,60,74,78,90 +2 8 4.489658e+01 24,30,57,60,74,78,90 +2 7 4.480868e+01 25,30,57,60,74,78,90 +2 12 4.303401e+01 29,30,57,60,74,78,90 +2 34 4.199699e+01 30,32,57,60,74,78,90 +2 1 4.606816e+01 30,34,57,60,74,78,90 +2 16 4.384998e+01 30,36,57,60,74,78,90 +2 1 4.665818e+01 30,44,57,60,74,76,78,90 +2 3 4.593938e+01 30,44,57,60,74,78,90 +2 3 4.459263e+01 30,57,59,60,74,78,90 +2 7 4.492432e+01 30,57,60,62,74,78,90 +2 1 4.546417e+01 30,57,60,63,74,78,90 +2 2 4.455427e+01 30,57,60,66,74,78,90 +2 4 4.549801e+01 30,57,60,69,74,78,90 +2 3 4.535831e+01 30,57,60,70,74,78,90 +2 3 4.603031e+01 30,57,60,71,74,78,90 +2 4 4.449353e+01 30,57,60,74,76,78,90 +2 56 3.446418e+01 30,57,60,74,78 +2 99604 4.398003e+01 30,57,60,74,78,90 +2 9 4.424109e+01 30,57,60,74,78,90,91 +2 2 4.672090e+01 30,57,60,74,78,90,98 +2 38 3.793612e+01 30,57,60,74,90 +2 31 3.527826e+01 30,57,60,78,90 +2 41 3.830013e+01 30,57,74,78,90 +2 44 3.735476e+01 30,60,74,78,90 +2 39 3.101881e+01 57,60,74,78,90 +3 3 3.646552e+01 0,57,60,74,78,90 +3 7 4.509987e+01 11,30,57,60,74,78,90 +3 41 4.346652e+01 12,30,57,60,74,78,90 +3 15 4.501102e+01 14,30,57,60,74,78,90 +3 1 4.943149e+01 17,30,57,60,74,78,90 +3 2 4.489658e+01 24,30,57,60,74,78,90 +3 7 4.480868e+01 25,30,57,60,74,78,90 +3 20 4.303401e+01 29,30,57,60,74,78,90 +3 65 4.199699e+01 30,32,57,60,74,78,90 +3 3 4.600229e+01 30,35,57,60,74,78,90 +3 19 4.384998e+01 30,36,57,60,74,78,90 +3 5 4.593938e+01 30,44,57,60,74,78,90 +3 2 4.602157e+01 30,56,57,60,74,78,90 +3 14 4.459263e+01 30,57,59,60,74,78,90 +3 3 4.593039e+01 30,57,60,61,74,78,90 +3 10 4.492432e+01 30,57,60,62,74,78,90 +3 4 4.546417e+01 30,57,60,63,74,78,90 +3 3 4.455427e+01 30,57,60,66,74,78,90 +3 3 4.549801e+01 30,57,60,69,74,78,90 +3 4 4.535831e+01 30,57,60,70,74,78,90 +3 2 4.603031e+01 30,57,60,71,74,78,90 +3 1 4.449353e+01 30,57,60,74,76,78,90 +3 135 3.446418e+01 30,57,60,74,78 +3 99142 4.398003e+01 30,57,60,74,78,90 +3 14 4.424109e+01 30,57,60,74,78,90,91 +3 80 3.793612e+01 30,57,60,74,90 +3 95 3.527826e+01 30,57,60,78,90 +3 93 3.830013e+01 30,57,74,78,90 +3 1 2.828830e+01 30,60,74,78 +3 106 3.735476e+01 30,60,74,78,90 +3 1 3.624070e+01 57,60,74,78,83,90 +3 99 3.101881e+01 57,60,74,78,90 diff --git a/test/verbose.test.expected-dat b/test/verbose.test.expected-dat index ee88d0f..f837b74 100644 --- a/test/verbose.test.expected-dat +++ b/test/verbose.test.expected-dat @@ -1,205 +1,199 @@ -1 -1 2 5.388530e+01 1 30 57 60 74 78 90 -1 4 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.162988e+01 13 30 57 60 74 78 90 -1 5 5.001102e+01 14 30 57 60 74 78 90 -1 7 4.489658e+01 24 30 57 60 74 78 90 -1 10 4.480868e+01 25 30 57 60 74 78 90 -1 18 4.697990e+01 26 30 57 60 74 78 90 -1 12 4.721079e+01 27 30 57 60 74 78 90 -1 7 4.710177e+01 28 30 57 60 74 78 90 -1 17 4.303401e+01 29 30 57 60 74 78 90 -1 5 4.636270e+01 30 31 57 60 74 78 90 -1 6 4.199699e+01 30 32 57 60 74 78 90 -1 2 5.106816e+01 30 34 57 60 74 78 90 -1 7 5.100229e+01 30 35 57 60 74 78 90 -1 8 4.884998e+01 30 36 57 60 74 78 90 -1 2 5.093938e+01 30 44 57 60 74 78 90 -1 1 4.959263e+01 30 57 59 60 74 78 90 -1 2 4.992432e+01 30 57 60 62 74 78 90 -1 7 4.955427e+01 30 57 60 66 74 78 90 -1 3 5.131319e+01 30 57 60 68 74 78 90 -1 5 5.035831e+01 30 57 60 70 74 78 90 -1 5 5.103031e+01 30 57 60 71 74 78 90 -1 11 3.946418e+01 30 57 60 74 78 -1 99800 4.898003e+01 30 57 60 74 78 90 -1 3 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 11 4.293612e+01 30 57 60 74 90 -1 8 4.027826e+01 30 57 60 78 90 -1 14 4.330013e+01 30 57 74 78 90 -1 6 4.235476e+01 30 60 74 78 90 -1 8 3.101881e+01 57 60 74 78 90 -2 -2 6 5.009987e+01 11 30 57 60 74 78 90 -2 9 4.846652e+01 12 30 57 60 74 78 90 -2 6 5.001102e+01 14 30 57 60 74 78 90 -2 30 4.489658e+01 24 30 57 60 74 78 90 -2 31 4.480868e+01 25 30 57 60 74 78 90 -2 30 4.697990e+01 26 30 57 60 74 78 90 -2 30 4.721079e+01 27 30 57 60 74 78 90 -2 25 4.710177e+01 28 30 57 60 74 78 90 -2 48 4.303401e+01 29 30 57 60 74 78 90 -2 33 4.636270e+01 30 31 57 60 74 78 90 -2 23 4.199699e+01 30 32 57 60 74 78 90 -2 3 5.106816e+01 30 34 57 60 74 78 90 -2 4 5.100229e+01 30 35 57 60 74 78 90 -2 16 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.225090e+01 30 37 57 60 74 78 90 -2 2 5.092417e+01 30 40 57 60 74 78 90 -2 2 5.102157e+01 30 56 57 60 74 78 90 -2 13 4.959263e+01 30 57 59 60 74 78 90 -2 7 4.992432e+01 30 57 60 62 74 78 90 -2 3 5.046417e+01 30 57 60 63 74 78 90 -2 9 4.955427e+01 30 57 60 66 74 78 90 -2 2 5.131319e+01 30 57 60 68 74 78 90 -2 6 5.035831e+01 30 57 60 70 74 78 90 -2 3 5.103031e+01 30 57 60 71 74 78 90 -2 3 4.949353e+01 30 57 60 74 76 78 90 -2 37 3.946418e+01 30 57 60 74 78 -2 99457 4.898003e+01 30 57 60 74 78 90 -2 9 4.924109e+01 30 57 60 74 78 90 91 -2 27 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 46 4.330013e+01 30 57 74 78 90 -2 17 4.235476e+01 30 60 74 78 90 -2 31 3.101881e+01 57 60 74 78 90 -3 -3 3 4.520192e+01 0 30 57 60 74 78 -3 11 5.009987e+01 11 30 57 60 74 78 90 -3 27 4.846652e+01 12 30 57 60 74 78 90 -3 1 5.001102e+01 14 30 57 60 74 78 90 -3 61 4.489658e+01 24 30 57 60 74 78 90 -3 73 4.480868e+01 25 30 57 60 74 78 90 -3 62 4.697990e+01 26 30 57 60 74 78 90 -3 75 4.721079e+01 27 30 57 60 74 78 90 -3 50 4.710177e+01 28 30 57 60 74 78 90 -3 103 4.303401e+01 29 30 57 60 74 78 90 -3 78 4.636270e+01 30 31 57 60 74 78 90 -3 58 4.199699e+01 30 32 57 60 74 78 90 -3 3 5.106816e+01 30 34 57 60 74 78 90 -3 27 4.884998e+01 30 36 57 60 74 78 90 -3 1 5.093938e+01 30 44 57 60 74 78 90 -3 16 4.959263e+01 30 57 59 60 74 78 90 -3 1 5.093039e+01 30 57 60 61 74 78 90 -3 3 4.992432e+01 30 57 60 62 74 78 90 -3 6 5.046417e+01 30 57 60 63 74 78 90 -3 1 4.955427e+01 30 57 60 66 74 78 90 -3 3 5.049801e+01 30 57 60 69 74 78 90 -3 1 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.103031e+01 30 57 60 71 74 78 90 -3 14 4.949353e+01 30 57 60 74 76 78 90 -3 94 3.946418e+01 30 57 60 74 78 -3 98854 4.898003e+01 30 57 60 74 78 90 -3 17 4.924109e+01 30 57 60 74 78 90 91 -3 4 5.010340e+01 30 57 60 74 78 90 92 -3 69 4.293612e+01 30 57 60 74 90 -3 62 4.027826e+01 30 57 60 78 90 -3 98 4.330013e+01 30 57 74 78 90 -3 39 4.235476e+01 30 60 74 78 90 -3 83 3.101881e+01 57 60 74 78 90 -1 -1 2 5.326373e+01 3 30 57 60 74 78 90 -1 1 5.009987e+01 11 30 57 60 74 78 90 -1 6 4.846652e+01 12 30 57 60 74 78 90 -1 2 5.001102e+01 14 30 57 60 74 78 90 -1 4 5.209925e+01 18 30 57 60 74 78 90 -1 22 4.489658e+01 24 30 57 60 74 78 90 -1 8 4.480868e+01 25 30 57 60 74 78 90 -1 4 4.697990e+01 26 30 57 60 74 78 90 -1 12 4.721079e+01 27 30 57 60 74 78 90 -1 9 4.710177e+01 28 30 57 60 74 78 90 -1 4 4.303401e+01 29 30 57 60 74 78 90 -1 14 4.636270e+01 30 31 57 60 74 78 90 -1 15 4.199699e+01 30 32 57 60 74 78 90 -1 1 5.106816e+01 30 34 57 60 74 78 90 -1 2 5.100229e+01 30 35 57 60 74 78 90 -1 14 4.884998e+01 30 36 57 60 74 78 90 -1 3 4.959263e+01 30 57 59 60 74 78 90 -1 3 5.093039e+01 30 57 60 61 74 78 90 -1 16 4.992432e+01 30 57 60 62 74 78 90 -1 1 5.046417e+01 30 57 60 63 74 78 90 -1 3 5.365774e+01 30 57 60 65 74 78 90 -1 6 5.049801e+01 30 57 60 69 74 78 90 -1 4 4.949353e+01 30 57 60 74 76 78 90 -1 16 3.946418e+01 30 57 60 74 78 -1 99755 4.898003e+01 30 57 60 74 78 90 -1 8 4.924109e+01 30 57 60 74 78 90 91 -1 2 5.010340e+01 30 57 60 74 78 90 92 -1 1 5.331382e+01 30 57 60 74 78 90 97 -1 14 4.293612e+01 30 57 60 74 90 -1 10 4.027826e+01 30 57 60 78 90 -1 13 4.330013e+01 30 57 74 78 90 -1 16 4.235476e+01 30 60 74 78 90 -1 9 3.101881e+01 57 60 74 78 90 -2 -2 9 4.846652e+01 12 30 57 60 74 78 90 -2 1 5.001102e+01 14 30 57 60 74 78 90 -2 1 5.209925e+01 18 30 57 60 74 78 90 -2 57 4.489658e+01 24 30 57 60 74 78 90 -2 22 4.480868e+01 25 30 57 60 74 78 90 -2 12 4.697990e+01 26 30 57 60 74 78 90 -2 25 4.721079e+01 27 30 57 60 74 78 90 -2 25 4.710177e+01 28 30 57 60 74 78 90 -2 19 4.303401e+01 29 30 57 60 74 78 90 -2 26 4.636270e+01 30 31 57 60 74 78 90 -2 39 4.199699e+01 30 32 57 60 74 78 90 -2 12 5.100229e+01 30 35 57 60 74 78 90 -2 22 4.884998e+01 30 36 57 60 74 78 90 -2 1 5.092417e+01 30 40 57 60 74 78 90 -2 2 5.550344e+01 30 42 57 60 74 78 90 -2 6 4.959263e+01 30 57 59 60 74 78 90 -2 19 4.992432e+01 30 57 60 62 74 78 90 -2 1 5.046417e+01 30 57 60 63 74 78 90 -2 2 4.955427e+01 30 57 60 66 74 78 90 -2 4 5.131319e+01 30 57 60 68 74 78 90 -2 4 5.049801e+01 30 57 60 69 74 78 90 -2 1 5.035831e+01 30 57 60 70 74 78 90 -2 7 4.949353e+01 30 57 60 74 76 78 90 -2 45 3.946418e+01 30 57 60 74 78 -2 99429 4.898003e+01 30 57 60 74 78 90 -2 20 4.924109e+01 30 57 60 74 78 90 91 -2 2 5.010340e+01 30 57 60 74 78 90 92 -2 2 5.172090e+01 30 57 60 74 78 90 98 -2 37 4.293612e+01 30 57 60 74 90 -2 31 4.027826e+01 30 57 60 78 90 -2 41 4.330013e+01 30 57 74 78 90 -2 47 4.235476e+01 30 60 74 78 90 -2 29 3.101881e+01 57 60 74 78 90 -3 -3 4 5.009987e+01 11 30 57 60 74 78 90 -3 21 4.846652e+01 12 30 57 60 74 78 90 -3 3 5.162988e+01 13 30 57 60 74 78 90 -3 6 5.001102e+01 14 30 57 60 74 78 90 -3 6 5.209925e+01 18 30 57 60 74 78 90 -3 3 5.408172e+01 22 30 57 60 74 78 90 -3 129 4.489658e+01 24 30 57 60 74 78 90 -3 63 4.480868e+01 25 30 57 60 74 78 90 -3 30 4.697990e+01 26 30 57 60 74 78 90 -3 46 4.721079e+01 27 30 57 60 74 78 90 -3 45 4.710177e+01 28 30 57 60 74 78 90 -3 39 4.303401e+01 29 30 57 60 74 78 90 -3 54 4.636270e+01 30 31 57 60 74 78 90 -3 96 4.199699e+01 30 32 57 60 74 78 90 -3 4 5.106816e+01 30 34 57 60 74 78 90 -3 3 5.100229e+01 30 35 57 60 74 78 90 -3 22 4.884998e+01 30 36 57 60 74 78 90 -3 2 5.271108e+01 30 38 57 60 74 78 90 -3 7 5.102157e+01 30 56 57 60 74 78 90 -3 8 4.959263e+01 30 57 59 60 74 78 90 -3 2 5.093039e+01 30 57 60 61 74 78 90 -3 12 4.992432e+01 30 57 60 62 74 78 90 -3 4 5.046417e+01 30 57 60 63 74 78 90 -3 5 4.955427e+01 30 57 60 66 74 78 90 -3 6 5.035831e+01 30 57 60 70 74 78 90 -3 2 5.313605e+01 30 57 60 73 74 78 90 -3 3 4.949353e+01 30 57 60 74 76 78 90 -3 119 3.946418e+01 30 57 60 74 78 -3 2 5.301417e+01 30 57 60 74 78 87 90 -3 98782 4.898003e+01 30 57 60 74 78 90 -3 19 4.924109e+01 30 57 60 74 78 90 91 -3 78 4.293612e+01 30 57 60 74 90 -3 89 4.027826e+01 30 57 60 78 90 -3 90 4.330013e+01 30 57 74 78 90 -3 118 4.235476e+01 30 60 74 78 90 -3 78 3.101881e+01 57 60 74 78 90 +1 2 5.388530e+01 1,30,57,60,74,78,90 +1 4 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.162988e+01 13,30,57,60,74,78,90 +1 5 5.001102e+01 14,30,57,60,74,78,90 +1 7 4.489658e+01 24,30,57,60,74,78,90 +1 10 4.480868e+01 25,30,57,60,74,78,90 +1 18 4.697990e+01 26,30,57,60,74,78,90 +1 12 4.721079e+01 27,30,57,60,74,78,90 +1 7 4.710177e+01 28,30,57,60,74,78,90 +1 17 4.303401e+01 29,30,57,60,74,78,90 +1 5 4.636270e+01 30,31,57,60,74,78,90 +1 6 4.199699e+01 30,32,57,60,74,78,90 +1 2 5.106816e+01 30,34,57,60,74,78,90 +1 7 5.100229e+01 30,35,57,60,74,78,90 +1 8 4.884998e+01 30,36,57,60,74,78,90 +1 2 5.093938e+01 30,44,57,60,74,78,90 +1 1 4.959263e+01 30,57,59,60,74,78,90 +1 2 4.992432e+01 30,57,60,62,74,78,90 +1 7 4.955427e+01 30,57,60,66,74,78,90 +1 3 5.131319e+01 30,57,60,68,74,78,90 +1 5 5.035831e+01 30,57,60,70,74,78,90 +1 5 5.103031e+01 30,57,60,71,74,78,90 +1 11 3.946418e+01 30,57,60,74,78 +1 99800 4.898003e+01 30,57,60,74,78,90 +1 3 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 11 4.293612e+01 30,57,60,74,90 +1 8 4.027826e+01 30,57,60,78,90 +1 14 4.330013e+01 30,57,74,78,90 +1 6 4.235476e+01 30,60,74,78,90 +1 8 3.101881e+01 57,60,74,78,90 +2 6 5.009987e+01 11,30,57,60,74,78,90 +2 9 4.846652e+01 12,30,57,60,74,78,90 +2 6 5.001102e+01 14,30,57,60,74,78,90 +2 30 4.489658e+01 24,30,57,60,74,78,90 +2 31 4.480868e+01 25,30,57,60,74,78,90 +2 30 4.697990e+01 26,30,57,60,74,78,90 +2 30 4.721079e+01 27,30,57,60,74,78,90 +2 25 4.710177e+01 28,30,57,60,74,78,90 +2 48 4.303401e+01 29,30,57,60,74,78,90 +2 33 4.636270e+01 30,31,57,60,74,78,90 +2 23 4.199699e+01 30,32,57,60,74,78,90 +2 3 5.106816e+01 30,34,57,60,74,78,90 +2 4 5.100229e+01 30,35,57,60,74,78,90 +2 16 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.225090e+01 30,37,57,60,74,78,90 +2 2 5.092417e+01 30,40,57,60,74,78,90 +2 2 5.102157e+01 30,56,57,60,74,78,90 +2 13 4.959263e+01 30,57,59,60,74,78,90 +2 7 4.992432e+01 30,57,60,62,74,78,90 +2 3 5.046417e+01 30,57,60,63,74,78,90 +2 9 4.955427e+01 30,57,60,66,74,78,90 +2 2 5.131319e+01 30,57,60,68,74,78,90 +2 6 5.035831e+01 30,57,60,70,74,78,90 +2 3 5.103031e+01 30,57,60,71,74,78,90 +2 3 4.949353e+01 30,57,60,74,76,78,90 +2 37 3.946418e+01 30,57,60,74,78 +2 99457 4.898003e+01 30,57,60,74,78,90 +2 9 4.924109e+01 30,57,60,74,78,90,91 +2 27 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 46 4.330013e+01 30,57,74,78,90 +2 17 4.235476e+01 30,60,74,78,90 +2 31 3.101881e+01 57,60,74,78,90 +3 3 4.520192e+01 0,30,57,60,74,78 +3 11 5.009987e+01 11,30,57,60,74,78,90 +3 27 4.846652e+01 12,30,57,60,74,78,90 +3 1 5.001102e+01 14,30,57,60,74,78,90 +3 61 4.489658e+01 24,30,57,60,74,78,90 +3 73 4.480868e+01 25,30,57,60,74,78,90 +3 62 4.697990e+01 26,30,57,60,74,78,90 +3 75 4.721079e+01 27,30,57,60,74,78,90 +3 50 4.710177e+01 28,30,57,60,74,78,90 +3 103 4.303401e+01 29,30,57,60,74,78,90 +3 78 4.636270e+01 30,31,57,60,74,78,90 +3 58 4.199699e+01 30,32,57,60,74,78,90 +3 3 5.106816e+01 30,34,57,60,74,78,90 +3 27 4.884998e+01 30,36,57,60,74,78,90 +3 1 5.093938e+01 30,44,57,60,74,78,90 +3 16 4.959263e+01 30,57,59,60,74,78,90 +3 1 5.093039e+01 30,57,60,61,74,78,90 +3 3 4.992432e+01 30,57,60,62,74,78,90 +3 6 5.046417e+01 30,57,60,63,74,78,90 +3 1 4.955427e+01 30,57,60,66,74,78,90 +3 3 5.049801e+01 30,57,60,69,74,78,90 +3 1 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.103031e+01 30,57,60,71,74,78,90 +3 14 4.949353e+01 30,57,60,74,76,78,90 +3 94 3.946418e+01 30,57,60,74,78 +3 98854 4.898003e+01 30,57,60,74,78,90 +3 17 4.924109e+01 30,57,60,74,78,90,91 +3 4 5.010340e+01 30,57,60,74,78,90,92 +3 69 4.293612e+01 30,57,60,74,90 +3 62 4.027826e+01 30,57,60,78,90 +3 98 4.330013e+01 30,57,74,78,90 +3 39 4.235476e+01 30,60,74,78,90 +3 83 3.101881e+01 57,60,74,78,90 +1 2 5.326373e+01 3,30,57,60,74,78,90 +1 1 5.009987e+01 11,30,57,60,74,78,90 +1 6 4.846652e+01 12,30,57,60,74,78,90 +1 2 5.001102e+01 14,30,57,60,74,78,90 +1 4 5.209925e+01 18,30,57,60,74,78,90 +1 22 4.489658e+01 24,30,57,60,74,78,90 +1 8 4.480868e+01 25,30,57,60,74,78,90 +1 4 4.697990e+01 26,30,57,60,74,78,90 +1 12 4.721079e+01 27,30,57,60,74,78,90 +1 9 4.710177e+01 28,30,57,60,74,78,90 +1 4 4.303401e+01 29,30,57,60,74,78,90 +1 14 4.636270e+01 30,31,57,60,74,78,90 +1 15 4.199699e+01 30,32,57,60,74,78,90 +1 1 5.106816e+01 30,34,57,60,74,78,90 +1 2 5.100229e+01 30,35,57,60,74,78,90 +1 14 4.884998e+01 30,36,57,60,74,78,90 +1 3 4.959263e+01 30,57,59,60,74,78,90 +1 3 5.093039e+01 30,57,60,61,74,78,90 +1 16 4.992432e+01 30,57,60,62,74,78,90 +1 1 5.046417e+01 30,57,60,63,74,78,90 +1 3 5.365774e+01 30,57,60,65,74,78,90 +1 6 5.049801e+01 30,57,60,69,74,78,90 +1 4 4.949353e+01 30,57,60,74,76,78,90 +1 16 3.946418e+01 30,57,60,74,78 +1 99755 4.898003e+01 30,57,60,74,78,90 +1 8 4.924109e+01 30,57,60,74,78,90,91 +1 2 5.010340e+01 30,57,60,74,78,90,92 +1 1 5.331382e+01 30,57,60,74,78,90,97 +1 14 4.293612e+01 30,57,60,74,90 +1 10 4.027826e+01 30,57,60,78,90 +1 13 4.330013e+01 30,57,74,78,90 +1 16 4.235476e+01 30,60,74,78,90 +1 9 3.101881e+01 57,60,74,78,90 +2 9 4.846652e+01 12,30,57,60,74,78,90 +2 1 5.001102e+01 14,30,57,60,74,78,90 +2 1 5.209925e+01 18,30,57,60,74,78,90 +2 57 4.489658e+01 24,30,57,60,74,78,90 +2 22 4.480868e+01 25,30,57,60,74,78,90 +2 12 4.697990e+01 26,30,57,60,74,78,90 +2 25 4.721079e+01 27,30,57,60,74,78,90 +2 25 4.710177e+01 28,30,57,60,74,78,90 +2 19 4.303401e+01 29,30,57,60,74,78,90 +2 26 4.636270e+01 30,31,57,60,74,78,90 +2 39 4.199699e+01 30,32,57,60,74,78,90 +2 12 5.100229e+01 30,35,57,60,74,78,90 +2 22 4.884998e+01 30,36,57,60,74,78,90 +2 1 5.092417e+01 30,40,57,60,74,78,90 +2 2 5.550344e+01 30,42,57,60,74,78,90 +2 6 4.959263e+01 30,57,59,60,74,78,90 +2 19 4.992432e+01 30,57,60,62,74,78,90 +2 1 5.046417e+01 30,57,60,63,74,78,90 +2 2 4.955427e+01 30,57,60,66,74,78,90 +2 4 5.131319e+01 30,57,60,68,74,78,90 +2 4 5.049801e+01 30,57,60,69,74,78,90 +2 1 5.035831e+01 30,57,60,70,74,78,90 +2 7 4.949353e+01 30,57,60,74,76,78,90 +2 45 3.946418e+01 30,57,60,74,78 +2 99429 4.898003e+01 30,57,60,74,78,90 +2 20 4.924109e+01 30,57,60,74,78,90,91 +2 2 5.010340e+01 30,57,60,74,78,90,92 +2 2 5.172090e+01 30,57,60,74,78,90,98 +2 37 4.293612e+01 30,57,60,74,90 +2 31 4.027826e+01 30,57,60,78,90 +2 41 4.330013e+01 30,57,74,78,90 +2 47 4.235476e+01 30,60,74,78,90 +2 29 3.101881e+01 57,60,74,78,90 +3 4 5.009987e+01 11,30,57,60,74,78,90 +3 21 4.846652e+01 12,30,57,60,74,78,90 +3 3 5.162988e+01 13,30,57,60,74,78,90 +3 6 5.001102e+01 14,30,57,60,74,78,90 +3 6 5.209925e+01 18,30,57,60,74,78,90 +3 3 5.408172e+01 22,30,57,60,74,78,90 +3 129 4.489658e+01 24,30,57,60,74,78,90 +3 63 4.480868e+01 25,30,57,60,74,78,90 +3 30 4.697990e+01 26,30,57,60,74,78,90 +3 46 4.721079e+01 27,30,57,60,74,78,90 +3 45 4.710177e+01 28,30,57,60,74,78,90 +3 39 4.303401e+01 29,30,57,60,74,78,90 +3 54 4.636270e+01 30,31,57,60,74,78,90 +3 96 4.199699e+01 30,32,57,60,74,78,90 +3 4 5.106816e+01 30,34,57,60,74,78,90 +3 3 5.100229e+01 30,35,57,60,74,78,90 +3 22 4.884998e+01 30,36,57,60,74,78,90 +3 2 5.271108e+01 30,38,57,60,74,78,90 +3 7 5.102157e+01 30,56,57,60,74,78,90 +3 8 4.959263e+01 30,57,59,60,74,78,90 +3 2 5.093039e+01 30,57,60,61,74,78,90 +3 12 4.992432e+01 30,57,60,62,74,78,90 +3 4 5.046417e+01 30,57,60,63,74,78,90 +3 5 4.955427e+01 30,57,60,66,74,78,90 +3 6 5.035831e+01 30,57,60,70,74,78,90 +3 2 5.313605e+01 30,57,60,73,74,78,90 +3 3 4.949353e+01 30,57,60,74,76,78,90 +3 119 3.946418e+01 30,57,60,74,78 +3 2 5.301417e+01 30,57,60,74,78,87,90 +3 98782 4.898003e+01 30,57,60,74,78,90 +3 19 4.924109e+01 30,57,60,74,78,90,91 +3 78 4.293612e+01 30,57,60,74,90 +3 89 4.027826e+01 30,57,60,78,90 +3 90 4.330013e+01 30,57,74,78,90 +3 118 4.235476e+01 30,60,74,78,90 +3 78 3.101881e+01 57,60,74,78,90 -- 2.7.4