Update unit tests.

diff --git a/test/importState.test.expected-dat b/test/importState.test.expected-dat
index 44e2b58..ee88d0f 100644 (file)
--- a/test/importState.test.expected-dat
+++ b/test/importState.test.expected-dat
@@ -1,205 +1,205 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      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
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-33     4.636270e+01    30      31      57      60      74      78      90
-23     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-4      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-37     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     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
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-103    4.303401e+01    29      30      57      60      74      78      90
-78     4.636270e+01    30      31      57      60      74      78      90
-58     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-27     4.884998e+01    30      36      57      60      74      78      90
-1      5.093938e+01    30      44      57      60      74      78      90
-16     4.959263e+01    30      57      59      60      74      78      90
-1      5.093039e+01    30      57      60      61      74      78      90
-3      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-14     4.949353e+01    30      57      60      74      76      78      90
-94     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     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      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-4      5.209925e+01    18      30      57      60      74      78      90
-22     4.489658e+01    24      30      57      60      74      78      90
-8      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-9      4.710177e+01    28      30      57      60      74      78      90
-4      4.303401e+01    29      30      57      60      74      78      90
-14     4.636270e+01    30      31      57      60      74      78      90
-15     4.199699e+01    30      32      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-3      5.093039e+01    30      57      60      61      74      78      90
-16     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-3      5.365774e+01    30      57      60      65      74      78      90
-6      5.049801e+01    30      57      60      69      74      78      90
-4      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-99755  4.898003e+01    30      57      60      74      78      90
-8      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-1      5.331382e+01    30      57      60      74      78      90      97
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-16     4.235476e+01    30      60      74      78      90
-9      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
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-57     4.489658e+01    24      30      57      60      74      78      90
-22     4.480868e+01    25      30      57      60      74      78      90
-12     4.697990e+01    26      30      57      60      74      78      90
-25     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-19     4.303401e+01    29      30      57      60      74      78      90
-26     4.636270e+01    30      31      57      60      74      78      90
-39     4.199699e+01    30      32      57      60      74      78      90
-12     5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-1      5.092417e+01    30      40      57      60      74      78      90
-2      5.550344e+01    30      42      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-19     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-45     3.946418e+01    30      57      60      74      78
-99429  4.898003e+01    30      57      60      74      78      90
-20     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-2      5.172090e+01    30      57      60      74      78      90      98
-37     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-41     4.330013e+01    30      57      74      78      90
-47     4.235476e+01    30      60      74      78      90
-29     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
-21     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-6      5.209925e+01    18      30      57      60      74      78      90
-3      5.408172e+01    22      30      57      60      74      78      90
-129    4.489658e+01    24      30      57      60      74      78      90
-63     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-46     4.721079e+01    27      30      57      60      74      78      90
-45     4.710177e+01    28      30      57      60      74      78      90
-39     4.303401e+01    29      30      57      60      74      78      90
-54     4.636270e+01    30      31      57      60      74      78      90
-96     4.199699e+01    30      32      57      60      74      78      90
-4      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-2      5.271108e+01    30      38      57      60      74      78      90
-7      5.102157e+01    30      56      57      60      74      78      90
-8      4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-12     4.992432e+01    30      57      60      62      74      78      90
-4      5.046417e+01    30      57      60      63      74      78      90
-5      4.955427e+01    30      57      60      66      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.313605e+01    30      57      60      73      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-119    3.946418e+01    30      57      60      74      78
-2      5.301417e+01    30      57      60      74      78      87      90
-98782  4.898003e+01    30      57      60      74      78      90
-19     4.924109e+01    30      57      60      74      78      90      91
-78     4.293612e+01    30      57      60      74      90
-89     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-118    4.235476e+01    30      60      74      78      90
-78     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/importState.test.expected-out b/test/importState.test.expected-out
index 006f7a6..a65ec69 100644 (file)
--- a/test/importState.test.expected-out
+++ b/test/importState.test.expected-out
@@ -1,7 +1,3 @@
 seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 30 
------------
-24 25 26 27 28 29 31 32 | 30 
------------
-24 25 26 27 28 29 31 32 | 30 

diff --git a/test/newFormat.test.expected-dat b/test/newFormat.test.expected-dat
index 44e2b58..1e76363 100644 (file)
--- a/test/newFormat.test.expected-dat
+++ b/test/newFormat.test.expected-dat
@@ -1,205 +1,190 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      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
-6      5.009987e+01    11      30      57      60      74      78      90
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-33     4.636270e+01    30      31      57      60      74      78      90
-23     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-4      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-37     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     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
-3      4.520192e+01    0       30      57      60      74      78
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-103    4.303401e+01    29      30      57      60      74      78      90
-78     4.636270e+01    30      31      57      60      74      78      90
-58     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-27     4.884998e+01    30      36      57      60      74      78      90
-1      5.093938e+01    30      44      57      60      74      78      90
-16     4.959263e+01    30      57      59      60      74      78      90
-1      5.093039e+01    30      57      60      61      74      78      90
-3      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-14     4.949353e+01    30      57      60      74      76      78      90
-94     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     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
-2      5.326373e+01    3       30      57      60      74      78      90
-1      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-4      5.209925e+01    18      30      57      60      74      78      90
-22     4.489658e+01    24      30      57      60      74      78      90
-8      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-9      4.710177e+01    28      30      57      60      74      78      90
-4      4.303401e+01    29      30      57      60      74      78      90
-14     4.636270e+01    30      31      57      60      74      78      90
-15     4.199699e+01    30      32      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-3      5.093039e+01    30      57      60      61      74      78      90
-16     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-3      5.365774e+01    30      57      60      65      74      78      90
-6      5.049801e+01    30      57      60      69      74      78      90
-4      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-99755  4.898003e+01    30      57      60      74      78      90
-8      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-1      5.331382e+01    30      57      60      74      78      90      97
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-16     4.235476e+01    30      60      74      78      90
-9      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
-9      4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-57     4.489658e+01    24      30      57      60      74      78      90
-22     4.480868e+01    25      30      57      60      74      78      90
-12     4.697990e+01    26      30      57      60      74      78      90
-25     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-19     4.303401e+01    29      30      57      60      74      78      90
-26     4.636270e+01    30      31      57      60      74      78      90
-39     4.199699e+01    30      32      57      60      74      78      90
-12     5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-1      5.092417e+01    30      40      57      60      74      78      90
-2      5.550344e+01    30      42      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-19     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-45     3.946418e+01    30      57      60      74      78
-99429  4.898003e+01    30      57      60      74      78      90
-20     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-2      5.172090e+01    30      57      60      74      78      90      98
-37     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-41     4.330013e+01    30      57      74      78      90
-47     4.235476e+01    30      60      74      78      90
-29     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
-4      5.009987e+01    11      30      57      60      74      78      90
-21     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-6      5.209925e+01    18      30      57      60      74      78      90
-3      5.408172e+01    22      30      57      60      74      78      90
-129    4.489658e+01    24      30      57      60      74      78      90
-63     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-46     4.721079e+01    27      30      57      60      74      78      90
-45     4.710177e+01    28      30      57      60      74      78      90
-39     4.303401e+01    29      30      57      60      74      78      90
-54     4.636270e+01    30      31      57      60      74      78      90
-96     4.199699e+01    30      32      57      60      74      78      90
-4      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-2      5.271108e+01    30      38      57      60      74      78      90
-7      5.102157e+01    30      56      57      60      74      78      90
-8      4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-12     4.992432e+01    30      57      60      62      74      78      90
-4      5.046417e+01    30      57      60      63      74      78      90
-5      4.955427e+01    30      57      60      66      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.313605e+01    30      57      60      73      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-119    3.946418e+01    30      57      60      74      78
-2      5.301417e+01    30      57      60      74      78      87      90
-98782  4.898003e+01    30      57      60      74      78      90
-19     4.924109e+01    30      57      60      74      78      90      91
-78     4.293612e+01    30      57      60      74      90
-89     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-118    4.235476e+01    30      60      74      78      90
-78     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/newFormat.test.expected-out b/test/newFormat.test.expected-out
index 96b8969..3da9b00 100644 (file)
--- a/test/newFormat.test.expected-out
+++ b/test/newFormat.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 30 
 0 1 2 4 8 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 30 
-0 1 2 4 8 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 30 
-0 1 2 4 8 | 3 5 6 7 

diff --git a/test/newFormat.test.expected-sum b/test/newFormat.test.expected-sum
index 374da29..57cfd74 100644 (file)
--- a/test/newFormat.test.expected-sum
+++ b/test/newFormat.test.expected-sum
@@ -1,2 +1,2 @@
-3      98854   30      57      60      74      78      90
-3      98782   30      57      60      74      78      90
+3      99314   30      57      60      74      78      90
+3      99142   30      57      60      74      78      90

diff --git a/test/test1_01-00.test.expected-dat b/test/test1_01-00.test.expected-dat
index 4cfdcb5..e46af5b 100644 (file)
--- a/test/test1_01-00.test.expected-dat
+++ b/test/test1_01-00.test.expected-dat
@@ -1,159 +1,159 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-6      5.100229e+01    30      35      57      60      74      78      90
-6      4.884998e+01    30      36      57      60      74      78      90
-4      5.093938e+01    30      44      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-8      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-10     3.946418e+01    30      57      60      74      78
-99884  4.898003e+01    30      57      60      74      78      90
-4      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-7      4.235476e+01    30      60      74      78      90
-7      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
-1      5.326373e+01    3       30      57      60      74      78      90
-13     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-4      5.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-20     4.884998e+01    30      36      57      60      74      78      90
-3      5.092417e+01    30      40      57      60      74      78      90
-5      5.093938e+01    30      44      57      60      74      78      90
-12     4.959263e+01    30      57      59      60      74      78      90
-5      4.992432e+01    30      57      60      62      74      78      90
-1      5.365774e+01    30      57      60      65      74      78      90
-13     4.955427e+01    30      57      60      66      74      78      90
-1      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-2      5.035831e+01    30      57      60      70      74      78      90
-1      4.949353e+01    30      57      60      74      76      78      90
-22     3.946418e+01    30      57      60      74      78
-99717  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-3      5.010340e+01    30      57      60      74      78      90      92
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-45     4.330013e+01    30      57      74      78      90
-20     4.235476e+01    30      60      74      78      90
-34     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
-31     4.846652e+01    12      30      57      60      74      78      90
-3      5.001102e+01    14      30      57      60      74      78      90
-1      4.572266e+01    30      32      57      74      78      90
-6      5.106816e+01    30      34      57      60      74      78      90
-18     4.884998e+01    30      36      57      60      74      78      90
-3      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-13     4.992432e+01    30      57      60      62      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-3      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-59     3.946418e+01    30      57      60      74      78
-99451  4.898003e+01    30      57      60      74      78      90
-13     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-68     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-93     4.330013e+01    30      57      74      78      90
-46     4.235476e+01    30      60      74      78      90
-2      3.783420e+01    42      57      60      74      78      90
-84     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
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-4      5.001102e+01    14      30      57      60      74      78      90
-6      5.106816e+01    30      34      57      60      74      78      90
-3      4.884998e+01    30      36      57      60      74      78      90
-7      5.093938e+01    30      44      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-2      4.959263e+01    30      57      59      60      74      78      90
-6      4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-2      5.049801e+01    30      57      60      69      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-21     3.946418e+01    30      57      60      74      78
-2      5.357980e+01    30      57      60      74      78      82      90
-1      5.322720e+01    30      57      60      74      78      86      90
-99856  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-3      5.010340e+01    30      57      60      74      78      90      92
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-12     4.330013e+01    30      57      74      78      90
-19     4.235476e+01    30      60      74      78      90
-12     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
-3      5.009987e+01    11      30      57      60      74      78      90
-16     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-9      4.884998e+01    30      36      57      60      74      78      90
-5      5.092417e+01    30      40      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-3      5.102157e+01    30      56      57      60      74      78      90
-4      4.992432e+01    30      57      60      62      74      78      90
-7      5.046417e+01    30      57      60      63      74      78      90
-8      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-9      5.049801e+01    30      57      60      69      74      78      90
-49     3.946418e+01    30      57      60      74      78
-99654  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-1      5.010340e+01    30      57      60      74      78      90      92
-6      5.172090e+01    30      57      60      74      78      90      98
-41     4.293612e+01    30      57      60      74      90
-32     4.027826e+01    30      57      60      78      90
-38     4.330013e+01    30      57      74      78      90
-52     4.235476e+01    30      60      74      78      90
-40     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
-39     4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-2      5.280335e+01    19      30      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-5      5.092417e+01    30      40      57      60      74      78      90
-3      5.102157e+01    30      56      57      60      74      78      90
-4      4.959263e+01    30      57      59      60      74      78      90
-1      4.113247e+01    30      57      60      61      74      78
-4      5.093039e+01    30      57      60      61      74      78      90
-4      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-6      4.949353e+01    30      57      60      74      76      78      90
-127    3.946418e+01    30      57      60      74      78
-2      5.366933e+01    30      57      60      74      78      89      90
-99251  4.898003e+01    30      57      60      74      78      90
-12     4.924109e+01    30      57      60      74      78      90      91
-86     4.293612e+01    30      57      60      74      90
-93     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-122    4.235476e+01    30      60      74      78      90
-108    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-00.test.expected-out b/test/test1_01-00.test.expected-out
index e9528d8..bef6af5 100644 (file)
--- a/test/test1_01-00.test.expected-out
+++ b/test/test1_01-00.test.expected-out
@@ -1,7 +1,3 @@
 seed = 66314
 1      30      57      60      74      78      90;
 | 30 
------------
-| 30 
------------
-| 30 

diff --git a/test/test1_01-01.test.expected-dat b/test/test1_01-01.test.expected-dat
index 4cfdcb5..50a46de 100644 (file)
--- a/test/test1_01-01.test.expected-dat
+++ b/test/test1_01-01.test.expected-dat
@@ -1,159 +1,160 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-6      5.100229e+01    30      35      57      60      74      78      90
-6      4.884998e+01    30      36      57      60      74      78      90
-4      5.093938e+01    30      44      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-8      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-10     3.946418e+01    30      57      60      74      78
-99884  4.898003e+01    30      57      60      74      78      90
-4      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-7      4.235476e+01    30      60      74      78      90
-7      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.500754e+01    0       30      57      60      74      78      90
-1      5.326373e+01    3       30      57      60      74      78      90
-13     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-4      5.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-20     4.884998e+01    30      36      57      60      74      78      90
-3      5.092417e+01    30      40      57      60      74      78      90
-5      5.093938e+01    30      44      57      60      74      78      90
-12     4.959263e+01    30      57      59      60      74      78      90
-5      4.992432e+01    30      57      60      62      74      78      90
-1      5.365774e+01    30      57      60      65      74      78      90
-13     4.955427e+01    30      57      60      66      74      78      90
-1      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-2      5.035831e+01    30      57      60      70      74      78      90
-1      4.949353e+01    30      57      60      74      76      78      90
-22     3.946418e+01    30      57      60      74      78
-99717  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-3      5.010340e+01    30      57      60      74      78      90      92
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-45     4.330013e+01    30      57      74      78      90
-20     4.235476e+01    30      60      74      78      90
-34     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
-7      5.009987e+01    11      30      57      60      74      78      90
-31     4.846652e+01    12      30      57      60      74      78      90
-3      5.001102e+01    14      30      57      60      74      78      90
-1      4.572266e+01    30      32      57      74      78      90
-6      5.106816e+01    30      34      57      60      74      78      90
-18     4.884998e+01    30      36      57      60      74      78      90
-3      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-13     4.992432e+01    30      57      60      62      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-3      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-59     3.946418e+01    30      57      60      74      78
-99451  4.898003e+01    30      57      60      74      78      90
-13     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-68     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-93     4.330013e+01    30      57      74      78      90
-46     4.235476e+01    30      60      74      78      90
-2      3.783420e+01    42      57      60      74      78      90
-84     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      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-4      5.001102e+01    14      30      57      60      74      78      90
-6      5.106816e+01    30      34      57      60      74      78      90
-3      4.884998e+01    30      36      57      60      74      78      90
-7      5.093938e+01    30      44      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-2      4.959263e+01    30      57      59      60      74      78      90
-6      4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-2      5.049801e+01    30      57      60      69      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-21     3.946418e+01    30      57      60      74      78
-2      5.357980e+01    30      57      60      74      78      82      90
-1      5.322720e+01    30      57      60      74      78      86      90
-99856  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-3      5.010340e+01    30      57      60      74      78      90      92
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-12     4.330013e+01    30      57      74      78      90
-19     4.235476e+01    30      60      74      78      90
-12     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
-3      5.276004e+01    9       30      57      60      74      78      90
-3      5.009987e+01    11      30      57      60      74      78      90
-16     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-9      4.884998e+01    30      36      57      60      74      78      90
-5      5.092417e+01    30      40      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-3      5.102157e+01    30      56      57      60      74      78      90
-4      4.992432e+01    30      57      60      62      74      78      90
-7      5.046417e+01    30      57      60      63      74      78      90
-8      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-9      5.049801e+01    30      57      60      69      74      78      90
-49     3.946418e+01    30      57      60      74      78
-99654  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-1      5.010340e+01    30      57      60      74      78      90      92
-6      5.172090e+01    30      57      60      74      78      90      98
-41     4.293612e+01    30      57      60      74      90
-32     4.027826e+01    30      57      60      78      90
-38     4.330013e+01    30      57      74      78      90
-52     4.235476e+01    30      60      74      78      90
-40     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
-6      5.009987e+01    11      30      57      60      74      78      90
-39     4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-2      5.280335e+01    19      30      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-5      5.092417e+01    30      40      57      60      74      78      90
-3      5.102157e+01    30      56      57      60      74      78      90
-4      4.959263e+01    30      57      59      60      74      78      90
-1      4.113247e+01    30      57      60      61      74      78
-4      5.093039e+01    30      57      60      61      74      78      90
-4      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-6      4.949353e+01    30      57      60      74      76      78      90
-127    3.946418e+01    30      57      60      74      78
-2      5.366933e+01    30      57      60      74      78      89      90
-99251  4.898003e+01    30      57      60      74      78      90
-12     4.924109e+01    30      57      60      74      78      90      91
-86     4.293612e+01    30      57      60      74      90
-93     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-122    4.235476e+01    30      60      74      78      90
-108    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-01.test.expected-out b/test/test1_01-01.test.expected-out
index d67e266..8fb8138 100644 (file)
--- a/test/test1_01-01.test.expected-out
+++ b/test/test1_01-01.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 | 30 
 | 3 5 6 7 
------------
-| 30 
-| 3 5 6 7 
------------
-| 30 
-| 3 5 6 7 

diff --git a/test/test1_01-01.test.expected-sum b/test/test1_01-01.test.expected-sum
index 889b76a..36e89ab 100644 (file)
--- a/test/test1_01-01.test.expected-sum
+++ b/test/test1_01-01.test.expected-sum
@@ -1,2 +1,2 @@
-3      99451   30      57      60      74      78      90
-3      99251   30      57      60      74      78      90
+3      99409   30      57      60      74      78      90
+3      99291   30      57      60      74      78      90

diff --git a/test/test1_01-10.test.expected-dat b/test/test1_01-10.test.expected-dat
index 2488cb5..adb286a 100644 (file)
--- a/test/test1_01-10.test.expected-dat
+++ b/test/test1_01-10.test.expected-dat
@@ -1,189 +1,181 @@
 1
-8      5.500754e+01    0       30      57      60      74      78      90
-27     5.388530e+01    1       30      57      60      74      78      90
-13     5.672672e+01    2       30      57      60      74      78      90
-11     5.742996e+01    4       30      57      60      74      78      90
-1      5.967337e+01    8       30      57      60      74      78      90
-4      5.846652e+01    12      30      57      60      74      78      90
-1      6.162988e+01    13      30      57      60      74      78      90
-6      6.001102e+01    14      30      57      60      74      78      90
-3      6.106816e+01    30      34      57      60      74      78      90
-6      6.100229e+01    30      35      57      60      74      78      90
-6      5.884998e+01    30      36      57      60      74      78      90
-2      6.093938e+01    30      44      57      60      74      78      90
-1      5.959263e+01    30      57      59      60      74      78      90
-1      5.992432e+01    30      57      60      62      74      78      90
-7      5.955427e+01    30      57      60      66      74      78      90
-3      6.131319e+01    30      57      60      68      74      78      90
-9      6.035831e+01    30      57      60      70      74      78      90
-2      6.103031e+01    30      57      60      71      74      78      90
-8      4.946418e+01    30      57      60      74      78
-99829  5.898003e+01    30      57      60      74      78      90
-4      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-11     5.293612e+01    30      57      60      74      90
-8      5.027826e+01    30      57      60      78      90
-13     5.330013e+01    30      57      74      78      90
-7      5.235476e+01    30      60      74      78      90
-7      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       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
-25     5.500754e+01    0       30      57      60      74      78      90
-2      5.883549e+01    1       17      30      57      60      74      78      90
-64     5.388530e+01    1       30      57      60      74      78      90
-26     5.672672e+01    2       30      57      60      74      78      90
-25     5.742996e+01    4       30      57      60      74      78      90
-11     5.967337e+01    8       30      57      60      74      78      90
-1      6.009987e+01    11      30      57      60      74      78      90
-9      5.846652e+01    12      30      57      60      74      78      90
-2      6.162988e+01    13      30      57      60      74      78      90
-6      6.001102e+01    14      30      57      60      74      78      90
-2      6.106816e+01    30      34      57      60      74      78      90
-4      6.100229e+01    30      35      57      60      74      78      90
-17     5.884998e+01    30      36      57      60      74      78      90
-3      6.093938e+01    30      44      57      60      74      78      90
-4      6.102157e+01    30      56      57      60      74      78      90
-15     5.959263e+01    30      57      59      60      74      78      90
-1      6.093039e+01    30      57      60      61      74      78      90
-5      5.992432e+01    30      57      60      62      74      78      90
-5      6.046417e+01    30      57      60      63      74      78      90
-14     5.955427e+01    30      57      60      66      74      78      90
-2      6.131319e+01    30      57      60      68      74      78      90
-1      6.049801e+01    30      57      60      69      74      78      90
-13     6.035831e+01    30      57      60      70      74      78      90
-1      6.103031e+01    30      57      60      71      74      78      90
-3      5.711293e+01    30      57      60      72      78      90
-2      5.949353e+01    30      57      60      74      76      78      90
-27     4.946418e+01    30      57      60      74      78
-99559  5.898003e+01    30      57      60      74      78      90
-3      5.924109e+01    30      57      60      74      78      90      91
-27     5.293612e+01    30      57      60      74      90
-28     5.027826e+01    30      57      60      78      90
-44     5.330013e+01    30      57      74      78      90
-17     5.235476e+01    30      60      74      78      90
-32     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      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
-58     5.500754e+01    0       30      57      60      74      78      90
-2      5.883549e+01    1       17      30      57      60      74      78      90
-130    5.388530e+01    1       30      57      60      74      78      90
-60     5.672672e+01    2       30      57      60      74      78      90
-50     5.742996e+01    4       30      57      60      74      78      90
-9      5.967337e+01    8       30      57      60      74      78      90
-1      6.276004e+01    9       30      57      60      74      78      90
-22     5.846652e+01    12      30      57      60      74      78      90
-5      6.001102e+01    14      30      57      60      74      78      90
-2      6.209925e+01    18      30      57      60      74      78      90
-3      6.100229e+01    30      35      57      60      74      78      90
-21     5.884998e+01    30      36      57      60      74      78      90
-13     5.959263e+01    30      57      59      60      74      78      90
-7      5.992432e+01    30      57      60      62      74      78      90
-4      6.046417e+01    30      57      60      63      74      78      90
-17     5.955427e+01    30      57      60      66      74      78      90
-3      6.049801e+01    30      57      60      69      74      78      90
-3      6.035831e+01    30      57      60      70      74      78      90
-6      5.711293e+01    30      57      60      72      78      90
-8      5.949353e+01    30      57      60      74      76      78      90
-61     4.946418e+01    30      57      60      74      78
-99186  5.898003e+01    30      57      60      74      78      90
-4      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-66     5.293612e+01    30      57      60      74      90
-57     5.027826e+01    30      57      60      78      90
-3      4.477875e+01    30      57      60      90
-84     5.330013e+01    30      57      74      78      90
-39     5.235476e+01    30      60      74      78      90
-74     4.101881e+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
-18     5.500754e+01    0       30      57      60      74      78      90
-16     5.388530e+01    1       30      57      60      74      78      90
-10     5.672672e+01    2       30      57      60      74      78      90
-11     5.742996e+01    4       30      57      60      74      78      90
-4      6.009987e+01    11      30      57      60      74      78      90
-10     5.846652e+01    12      30      57      60      74      78      90
-3      6.162988e+01    13      30      57      60      74      78      90
-1      6.001102e+01    14      30      57      60      74      78      90
-2      6.106816e+01    30      34      57      60      74      78      90
-8      5.884998e+01    30      36      57      60      74      78      90
-1      6.092417e+01    30      40      57      60      74      78      90
-4      6.093938e+01    30      44      57      60      74      78      90
-10     5.959263e+01    30      57      59      60      74      78      90
-1      6.093039e+01    30      57      60      61      74      78      90
-6      5.992432e+01    30      57      60      62      74      78      90
-2      6.046417e+01    30      57      60      63      74      78      90
-1      5.955427e+01    30      57      60      66      74      78      90
-4      6.049801e+01    30      57      60      69      74      78      90
-2      5.949353e+01    30      57      60      74      76      78      90
-28     4.946418e+01    30      57      60      74      78
-99780  5.898003e+01    30      57      60      74      78      90
-12     5.924109e+01    30      57      60      74      78      90      91
-3      6.010340e+01    30      57      60      74      78      90      92
-2      6.410580e+01    30      57      60      74      78      90      95
-15     5.293612e+01    30      57      60      74      90
-8      5.027826e+01    30      57      60      78      90
-10     5.330013e+01    30      57      74      78      90
-18     5.235476e+01    30      60      74      78      90
-10     4.101881e+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
-38     5.500754e+01    0       30      57      60      74      78      90
-50     5.388530e+01    1       30      57      60      74      78      90
-17     5.672672e+01    2       30      57      60      74      78      90
-23     5.742996e+01    4       30      57      60      74      78      90
-3      6.009987e+01    11      30      57      60      74      78      90
-21     5.846652e+01    12      30      57      60      74      78      90
-2      6.162988e+01    13      30      57      60      74      78      90
-8      6.001102e+01    14      30      57      60      74      78      90
-2      6.209925e+01    18      30      57      60      74      78      90
-3      6.106816e+01    30      34      57      60      74      78      90
-4      6.100229e+01    30      35      57      60      74      78      90
-10     5.884998e+01    30      36      57      60      74      78      90
-1      6.093938e+01    30      44      57      60      74      78      90
-3      6.102157e+01    30      56      57      60      74      78      90
-8      5.959263e+01    30      57      59      60      74      78      90
-2      6.093039e+01    30      57      60      61      74      78      90
-4      5.992432e+01    30      57      60      62      74      78      90
-4      6.046417e+01    30      57      60      63      74      78      90
-2      5.955427e+01    30      57      60      66      74      78      90
-1      6.131319e+01    30      57      60      68      74      78      90
-2      6.049801e+01    30      57      60      69      74      78      90
-8      5.949353e+01    30      57      60      74      76      78      90
-84     4.946418e+01    30      57      60      74      78
-99485  5.898003e+01    30      57      60      74      78      90
-25     5.924109e+01    30      57      60      74      78      90      91
-5      6.010340e+01    30      57      60      74      78      90      92
-39     5.293612e+01    30      57      60      74      90
-29     5.027826e+01    30      57      60      78      90
-32     5.330013e+01    30      57      74      78      90
-53     5.235476e+01    30      60      74      78      90
-32     4.101881e+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
-97     5.500754e+01    0       30      57      60      74      78      90
-117    5.388530e+01    1       30      57      60      74      78      90
-34     5.672672e+01    2       30      57      60      74      78      90
-46     5.742996e+01    4       30      57      60      74      78      90
-9      5.967337e+01    8       30      57      60      74      78      90
-2      6.009987e+01    11      30      57      60      74      78      90
-34     5.846652e+01    12      30      57      60      74      78      90
-1      6.162988e+01    13      30      57      60      74      78      90
-8      6.001102e+01    14      30      57      60      74      78      90
-3      6.106816e+01    30      34      57      60      74      78      90
-6      6.100229e+01    30      35      57      60      74      78      90
-11     5.884998e+01    30      36      57      60      74      78      90
-1      6.225090e+01    30      37      57      60      74      78      90
-3      6.092417e+01    30      40      57      60      74      78      90
-6      6.102157e+01    30      56      57      60      74      78      90
-8      5.959263e+01    30      57      59      60      74      78      90
-4      6.093039e+01    30      57      60      61      74      78      90
-2      5.992432e+01    30      57      60      62      74      78      90
-5      6.046417e+01    30      57      60      63      74      78      90
-8      5.955427e+01    30      57      60      66      74      78      90
-1      6.035831e+01    30      57      60      70      74      78      90
-13     5.949353e+01    30      57      60      74      76      78      90
-190    4.946418e+01    30      57      60      74      78
-98912  5.898003e+01    30      57      60      74      78      90
-23     5.924109e+01    30      57      60      74      78      90      91
-4      6.010340e+01    30      57      60      74      78      90      92
-3      6.172090e+01    30      57      60      74      78      90      98
-78     5.293612e+01    30      57      60      74      90
-84     5.027826e+01    30      57      60      78      90
-75     5.330013e+01    30      57      74      78      90
-127    5.235476e+01    30      60      74      78      90
-85     4.101881e+01    57      60      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-10.test.expected-out b/test/test1_01-10.test.expected-out
index 8dd6b37..ed81587 100644 (file)
--- a/test/test1_01-10.test.expected-out
+++ b/test/test1_01-10.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 | 30 
 0 1 2 4 8 | 
------------
-| 30 
-0 1 2 4 8 | 
------------
-| 30 
-0 1 2 4 8 | 

diff --git a/test/test1_01-10.test.expected-sum b/test/test1_01-10.test.expected-sum
index 357d312..dfc53b0 100644 (file)
--- a/test/test1_01-10.test.expected-sum
+++ b/test/test1_01-10.test.expected-sum
@@ -1,2 +1,2 @@
-3      130     1       30      57      60      74      78      90
-3      117     1       30      57      60      74      78      90
+3      83      57      60      74      78      90
+3      63      57      60      74      78      90

diff --git a/test/test1_01-11.test.expected-dat b/test/test1_01-11.test.expected-dat
index 4cfdcb5..50a46de 100644 (file)
--- a/test/test1_01-11.test.expected-dat
+++ b/test/test1_01-11.test.expected-dat
@@ -1,159 +1,160 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-6      5.100229e+01    30      35      57      60      74      78      90
-6      4.884998e+01    30      36      57      60      74      78      90
-4      5.093938e+01    30      44      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-8      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-10     3.946418e+01    30      57      60      74      78
-99884  4.898003e+01    30      57      60      74      78      90
-4      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-7      4.235476e+01    30      60      74      78      90
-7      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.500754e+01    0       30      57      60      74      78      90
-1      5.326373e+01    3       30      57      60      74      78      90
-13     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-4      5.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-20     4.884998e+01    30      36      57      60      74      78      90
-3      5.092417e+01    30      40      57      60      74      78      90
-5      5.093938e+01    30      44      57      60      74      78      90
-12     4.959263e+01    30      57      59      60      74      78      90
-5      4.992432e+01    30      57      60      62      74      78      90
-1      5.365774e+01    30      57      60      65      74      78      90
-13     4.955427e+01    30      57      60      66      74      78      90
-1      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-2      5.035831e+01    30      57      60      70      74      78      90
-1      4.949353e+01    30      57      60      74      76      78      90
-22     3.946418e+01    30      57      60      74      78
-99717  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-3      5.010340e+01    30      57      60      74      78      90      92
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-45     4.330013e+01    30      57      74      78      90
-20     4.235476e+01    30      60      74      78      90
-34     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
-7      5.009987e+01    11      30      57      60      74      78      90
-31     4.846652e+01    12      30      57      60      74      78      90
-3      5.001102e+01    14      30      57      60      74      78      90
-1      4.572266e+01    30      32      57      74      78      90
-6      5.106816e+01    30      34      57      60      74      78      90
-18     4.884998e+01    30      36      57      60      74      78      90
-3      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-13     4.992432e+01    30      57      60      62      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-3      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-59     3.946418e+01    30      57      60      74      78
-99451  4.898003e+01    30      57      60      74      78      90
-13     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-68     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-93     4.330013e+01    30      57      74      78      90
-46     4.235476e+01    30      60      74      78      90
-2      3.783420e+01    42      57      60      74      78      90
-84     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      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-4      5.001102e+01    14      30      57      60      74      78      90
-6      5.106816e+01    30      34      57      60      74      78      90
-3      4.884998e+01    30      36      57      60      74      78      90
-7      5.093938e+01    30      44      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-2      4.959263e+01    30      57      59      60      74      78      90
-6      4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-2      5.049801e+01    30      57      60      69      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-21     3.946418e+01    30      57      60      74      78
-2      5.357980e+01    30      57      60      74      78      82      90
-1      5.322720e+01    30      57      60      74      78      86      90
-99856  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-3      5.010340e+01    30      57      60      74      78      90      92
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-12     4.330013e+01    30      57      74      78      90
-19     4.235476e+01    30      60      74      78      90
-12     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
-3      5.276004e+01    9       30      57      60      74      78      90
-3      5.009987e+01    11      30      57      60      74      78      90
-16     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-9      4.884998e+01    30      36      57      60      74      78      90
-5      5.092417e+01    30      40      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-3      5.102157e+01    30      56      57      60      74      78      90
-4      4.992432e+01    30      57      60      62      74      78      90
-7      5.046417e+01    30      57      60      63      74      78      90
-8      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-9      5.049801e+01    30      57      60      69      74      78      90
-49     3.946418e+01    30      57      60      74      78
-99654  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-1      5.010340e+01    30      57      60      74      78      90      92
-6      5.172090e+01    30      57      60      74      78      90      98
-41     4.293612e+01    30      57      60      74      90
-32     4.027826e+01    30      57      60      78      90
-38     4.330013e+01    30      57      74      78      90
-52     4.235476e+01    30      60      74      78      90
-40     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
-6      5.009987e+01    11      30      57      60      74      78      90
-39     4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-2      5.280335e+01    19      30      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-5      5.092417e+01    30      40      57      60      74      78      90
-3      5.102157e+01    30      56      57      60      74      78      90
-4      4.959263e+01    30      57      59      60      74      78      90
-1      4.113247e+01    30      57      60      61      74      78
-4      5.093039e+01    30      57      60      61      74      78      90
-4      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-6      4.949353e+01    30      57      60      74      76      78      90
-127    3.946418e+01    30      57      60      74      78
-2      5.366933e+01    30      57      60      74      78      89      90
-99251  4.898003e+01    30      57      60      74      78      90
-12     4.924109e+01    30      57      60      74      78      90      91
-86     4.293612e+01    30      57      60      74      90
-93     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-122    4.235476e+01    30      60      74      78      90
-108    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-11.test.expected-out b/test/test1_01-11.test.expected-out
index c5c1ec6..1732118 100644 (file)
--- a/test/test1_01-11.test.expected-out
+++ b/test/test1_01-11.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 | 30 
 0 1 2 4 8 | 3 5 6 7 
------------
-| 30 
-0 1 2 4 8 | 3 5 6 7 
------------
-| 30 
-0 1 2 4 8 | 3 5 6 7 

diff --git a/test/test1_01-11.test.expected-sum b/test/test1_01-11.test.expected-sum
index 889b76a..36e89ab 100644 (file)
--- a/test/test1_01-11.test.expected-sum
+++ b/test/test1_01-11.test.expected-sum
@@ -1,2 +1,2 @@
-3      99451   30      57      60      74      78      90
-3      99251   30      57      60      74      78      90
+3      99409   30      57      60      74      78      90
+3      99291   30      57      60      74      78      90

diff --git a/test/test1_10-00.test.expected-dat b/test/test1_10-00.test.expected-dat
index 0178319..b6df57c 100644 (file)
--- a/test/test1_10-00.test.expected-dat
+++ b/test/test1_10-00.test.expected-dat
@@ -1,204 +1,204 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      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
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-32     4.636270e+01    30      31      57      60      74      78      90
-24     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-5      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-14     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-38     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     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
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-102    4.303401e+01    29      30      57      60      74      78      90
-77     4.636270e+01    30      31      57      60      74      78      90
-59     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-26     4.884998e+01    30      36      57      60      74      78      90
-3      5.093938e+01    30      44      57      60      74      78      90
-14     4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-13     4.949353e+01    30      57      60      74      76      78      90
-95     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-16     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     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
-7      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-20     4.489658e+01    24      30      57      60      74      78      90
-6      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-13     4.721079e+01    27      30      57      60      74      78      90
-10     4.710177e+01    28      30      57      60      74      78      90
-6      4.303401e+01    29      30      57      60      74      78      90
-16     4.636270e+01    30      31      57      60      74      78      90
-12     4.199699e+01    30      32      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-5      4.992432e+01    30      57      60      62      74      78      90
-4      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-10     5.035831e+01    30      57      60      70      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-1      5.322720e+01    30      57      60      74      78      86      90
-99757  4.898003e+01    30      57      60      74      78      90
-6      4.924109e+01    30      57      60      74      78      90      91
-5      5.010340e+01    30      57      60      74      78      90      92
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-12     4.330013e+01    30      57      74      78      90
-19     4.235476e+01    30      60      74      78      90
-12     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      5.162988e+01    13      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-60     4.489658e+01    24      30      57      60      74      78      90
-16     4.480868e+01    25      30      57      60      74      78      90
-15     4.697990e+01    26      30      57      60      74      78      90
-33     4.721079e+01    27      30      57      60      74      78      90
-30     4.710177e+01    28      30      57      60      74      78      90
-21     4.303401e+01    29      30      57      60      74      78      90
-32     4.636270e+01    30      31      57      60      74      78      90
-41     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-23     4.884998e+01    30      36      57      60      74      78      90
-4      5.093938e+01    30      44      57      60      74      78      90
-4      4.959263e+01    30      57      59      60      74      78      90
-6      4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-10     4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-11     4.949353e+01    30      57      60      74      76      78      90
-50     3.946418e+01    30      57      60      74      78
-99377  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-5      5.010340e+01    30      57      60      74      78      90      92
-39     4.293612e+01    30      57      60      74      90
-32     4.027826e+01    30      57      60      78      90
-37     4.330013e+01    30      57      74      78      90
-49     4.235476e+01    30      60      74      78      90
-42     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      5.009987e+01    11      30      57      60      74      78      90
-47     4.846652e+01    12      30      57      60      74      78      90
-1      5.162988e+01    13      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-135    4.489658e+01    24      30      57      60      74      78      90
-49     4.480868e+01    25      30      57      60      74      78      90
-44     4.697990e+01    26      30      57      60      74      78      90
-68     4.721079e+01    27      30      57      60      74      78      90
-55     4.710177e+01    28      30      57      60      74      78      90
-44     4.303401e+01    29      30      57      60      74      78      90
-82     4.636270e+01    30      31      57      60      74      78      90
-86     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-18     4.884998e+01    30      36      57      60      74      78      90
-1      4.207300e+01    30      38      57      60      74      78
-1      5.271108e+01    30      38      57      60      74      78      90
-3      5.093938e+01    30      44      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-5      5.093039e+01    30      57      60      61      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-17     4.955427e+01    30      57      60      66      74      78      90
-5      5.049801e+01    30      57      60      69      74      78      90
-13     4.949353e+01    30      57      60      74      76      78      90
-126    3.946418e+01    30      57      60      74      78
-4      5.301417e+01    30      57      60      74      78      87      90
-98669  4.898003e+01    30      57      60      74      78      90
-11     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-3      5.172090e+01    30      57      60      74      78      90      98
-82     4.293612e+01    30      57      60      74      90
-95     4.027826e+01    30      57      60      78      90
-84     4.330013e+01    30      57      74      78      90
-119    4.235476e+01    30      60      74      78      90
-2      4.433957e+01    57      60      74      78      87      90
-104    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-00.test.expected-out b/test/test1_10-00.test.expected-out
index 7093699..2c194ba 100644 (file)
--- a/test/test1_10-00.test.expected-out
+++ b/test/test1_10-00.test.expected-out
@@ -1,7 +1,3 @@
 seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 
------------
-24 25 26 27 28 29 31 32 | 
------------
-24 25 26 27 28 29 31 32 | 

diff --git a/test/test1_10-01.test.expected-dat b/test/test1_10-01.test.expected-dat
index 0178319..1b4ab93 100644 (file)
--- a/test/test1_10-01.test.expected-dat
+++ b/test/test1_10-01.test.expected-dat
@@ -1,204 +1,189 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      4.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.601881e+01    57      60      74      78      90
 2
-6      5.009987e+01    11      30      57      60      74      78      90
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-32     4.636270e+01    30      31      57      60      74      78      90
-24     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-5      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-14     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-38     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     4.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.601881e+01    57      60      74      78      90
 3
-3      4.520192e+01    0       30      57      60      74      78
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-102    4.303401e+01    29      30      57      60      74      78      90
-77     4.636270e+01    30      31      57      60      74      78      90
-59     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-26     4.884998e+01    30      36      57      60      74      78      90
-3      5.093938e+01    30      44      57      60      74      78      90
-14     4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-13     4.949353e+01    30      57      60      74      76      78      90
-95     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-16     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     4.101881e+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      5.009987e+01    11      30      57      60      74      78      90
-7      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-20     4.489658e+01    24      30      57      60      74      78      90
-6      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-13     4.721079e+01    27      30      57      60      74      78      90
-10     4.710177e+01    28      30      57      60      74      78      90
-6      4.303401e+01    29      30      57      60      74      78      90
-16     4.636270e+01    30      31      57      60      74      78      90
-12     4.199699e+01    30      32      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-5      4.992432e+01    30      57      60      62      74      78      90
-4      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-10     5.035831e+01    30      57      60      70      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-1      5.322720e+01    30      57      60      74      78      86      90
-99757  4.898003e+01    30      57      60      74      78      90
-6      4.924109e+01    30      57      60      74      78      90      91
-5      5.010340e+01    30      57      60      74      78      90      92
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-12     4.330013e+01    30      57      74      78      90
-19     4.235476e+01    30      60      74      78      90
-12     4.101881e+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
-24     4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-60     4.489658e+01    24      30      57      60      74      78      90
-16     4.480868e+01    25      30      57      60      74      78      90
-15     4.697990e+01    26      30      57      60      74      78      90
-33     4.721079e+01    27      30      57      60      74      78      90
-30     4.710177e+01    28      30      57      60      74      78      90
-21     4.303401e+01    29      30      57      60      74      78      90
-32     4.636270e+01    30      31      57      60      74      78      90
-41     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-23     4.884998e+01    30      36      57      60      74      78      90
-4      5.093938e+01    30      44      57      60      74      78      90
-4      4.959263e+01    30      57      59      60      74      78      90
-6      4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-10     4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-11     4.949353e+01    30      57      60      74      76      78      90
-50     3.946418e+01    30      57      60      74      78
-99377  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-5      5.010340e+01    30      57      60      74      78      90      92
-39     4.293612e+01    30      57      60      74      90
-32     4.027826e+01    30      57      60      78      90
-37     4.330013e+01    30      57      74      78      90
-49     4.235476e+01    30      60      74      78      90
-42     4.101881e+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
-2      5.097160e+01    8       30      57      60      78      90
-3      5.009987e+01    11      30      57      60      74      78      90
-47     4.846652e+01    12      30      57      60      74      78      90
-1      5.162988e+01    13      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-135    4.489658e+01    24      30      57      60      74      78      90
-49     4.480868e+01    25      30      57      60      74      78      90
-44     4.697990e+01    26      30      57      60      74      78      90
-68     4.721079e+01    27      30      57      60      74      78      90
-55     4.710177e+01    28      30      57      60      74      78      90
-44     4.303401e+01    29      30      57      60      74      78      90
-82     4.636270e+01    30      31      57      60      74      78      90
-86     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-18     4.884998e+01    30      36      57      60      74      78      90
-1      4.207300e+01    30      38      57      60      74      78
-1      5.271108e+01    30      38      57      60      74      78      90
-3      5.093938e+01    30      44      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-5      5.093039e+01    30      57      60      61      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-17     4.955427e+01    30      57      60      66      74      78      90
-5      5.049801e+01    30      57      60      69      74      78      90
-13     4.949353e+01    30      57      60      74      76      78      90
-126    3.946418e+01    30      57      60      74      78
-4      5.301417e+01    30      57      60      74      78      87      90
-98669  4.898003e+01    30      57      60      74      78      90
-11     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-3      5.172090e+01    30      57      60      74      78      90      98
-82     4.293612e+01    30      57      60      74      90
-95     4.027826e+01    30      57      60      78      90
-84     4.330013e+01    30      57      74      78      90
-119    4.235476e+01    30      60      74      78      90
-2      4.433957e+01    57      60      74      78      87      90
-104    4.101881e+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-01.test.expected-out b/test/test1_10-01.test.expected-out
index f176a3c..8e3ace4 100644 (file)
--- a/test/test1_10-01.test.expected-out
+++ b/test/test1_10-01.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 
 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 
-| 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 
-| 3 5 6 7 

diff --git a/test/test1_10-01.test.expected-sum b/test/test1_10-01.test.expected-sum
index 7f0e8fd..5d81d40 100644 (file)
--- a/test/test1_10-01.test.expected-sum
+++ b/test/test1_10-01.test.expected-sum
@@ -1,2 +1,2 @@
-3      98854   30      57      60      74      78      90
-3      98669   30      57      60      74      78      90
+3      99294   30      57      60      74      78      90
+3      99113   30      57      60      74      78      90

diff --git a/test/test1_10-10.test.expected-dat b/test/test1_10-10.test.expected-dat
index 969e509..23448a6 100644 (file)
--- a/test/test1_10-10.test.expected-dat
+++ b/test/test1_10-10.test.expected-dat
@@ -1,251 +1,198 @@
 1
-8      5.500754e+01    0       30      57      60      74      78      90
-27     5.388530e+01    1       30      57      60      74      78      90
-13     5.672672e+01    2       30      57      60      74      78      90
-11     5.742996e+01    4       30      57      60      74      78      90
-1      5.967337e+01    8       30      57      60      74      78      90
-4      5.846652e+01    12      30      57      60      74      78      90
-1      6.162988e+01    13      30      57      60      74      78      90
-6      6.001102e+01    14      30      57      60      74      78      90
-9      5.489658e+01    24      30      57      60      74      78      90
-8      5.480868e+01    25      30      57      60      74      78      90
-16     5.697990e+01    26      30      57      60      74      78      90
-11     5.721079e+01    27      30      57      60      74      78      90
-9      5.710177e+01    28      30      57      60      74      78      90
-17     5.303401e+01    29      30      57      60      74      78      90
-7      5.636270e+01    30      31      57      60      74      78      90
-7      5.199699e+01    30      32      57      60      74      78      90
-1      6.106816e+01    30      34      57      60      74      78      90
-8      6.100229e+01    30      35      57      60      74      78      90
-4      5.884998e+01    30      36      57      60      74      78      90
-2      6.093938e+01    30      44      57      60      74      78      90
-2      5.959263e+01    30      57      59      60      74      78      90
-2      5.992432e+01    30      57      60      62      74      78      90
-5      5.955427e+01    30      57      60      66      74      78      90
-1      6.131319e+01    30      57      60      68      74      78      90
-9      6.035831e+01    30      57      60      70      74      78      90
-1      6.103031e+01    30      57      60      71      74      78      90
-10     4.946418e+01    30      57      60      74      78
-99747  5.898003e+01    30      57      60      74      78      90
-4      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-11     5.293612e+01    30      57      60      74      90
-8      5.027826e+01    30      57      60      78      90
-14     5.330013e+01    30      57      74      78      90
-6      5.235476e+01    30      60      74      78      90
-8      5.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
-20     5.500754e+01    0       30      57      60      74      78      90
-59     5.388530e+01    1       30      57      60      74      78      90
-29     5.672672e+01    2       30      57      60      74      78      90
-20     5.742996e+01    4       30      57      60      74      78      90
-10     5.967337e+01    8       30      57      60      74      78      90
-13     5.846652e+01    12      30      57      60      74      78      90
-4      6.001102e+01    14      30      57      60      74      78      90
-3      6.381227e+01    16      30      57      60      74      78      90
-33     5.489658e+01    24      30      57      60      74      78      90
-22     5.480868e+01    25      30      57      60      74      78      90
-39     5.697990e+01    26      30      57      60      74      78      90
-29     5.721079e+01    27      30      57      60      74      78      90
-21     5.710177e+01    28      30      57      60      74      78      90
-42     5.303401e+01    29      30      57      60      74      78      90
-34     5.636270e+01    30      31      57      60      74      78      90
-22     5.199699e+01    30      32      57      60      74      78      90
-6      6.100229e+01    30      35      57      60      74      78      90
-18     5.884998e+01    30      36      57      60      74      78      90
-1      6.092417e+01    30      40      57      60      74      78      90
-8      6.093938e+01    30      44      57      60      74      78      90
-14     5.959263e+01    30      57      59      60      74      78      90
-4      5.992432e+01    30      57      60      62      74      78      90
-1      6.046417e+01    30      57      60      63      74      78      90
-6      5.955427e+01    30      57      60      66      74      78      90
-1      6.131319e+01    30      57      60      68      74      78      90
-3      6.049801e+01    30      57      60      69      74      78      90
-5      6.035831e+01    30      57      60      70      74      78      90
-1      6.103031e+01    30      57      60      71      74      78      90
-6      6.313605e+01    30      57      60      73      74      78      90
-1      5.949353e+01    30      57      60      74      76      78      90
-32     4.946418e+01    30      57      60      74      78
-99335  5.898003e+01    30      57      60      74      78      90
-8      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-1      6.471666e+01    30      57      60      74      78      90      96
-25     5.293612e+01    30      57      60      74      90
-29     5.027826e+01    30      57      60      78      90
-45     5.330013e+01    30      57      74      78      90
-16     5.235476e+01    30      60      74      78      90
-32     5.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
-2      5.327413e+01    0       28      30      57      60      74      78      90
-50     5.500754e+01    0       30      57      60      74      78      90
-121    5.388530e+01    1       30      57      60      74      78      90
-59     5.672672e+01    2       30      57      60      74      78      90
-48     5.742996e+01    4       30      57      60      74      78      90
-15     5.967337e+01    8       30      57      60      74      78      90
-2      5.796065e+01    11      28      30      57      60      74      78      90
-4      6.009987e+01    11      30      57      60      74      78      90
-30     5.846652e+01    12      30      57      60      74      78      90
-1      6.162988e+01    13      30      57      60      74      78      90
-2      6.001102e+01    14      30      57      60      74      78      90
-1      6.280335e+01    19      30      57      60      74      78      90
-77     5.489658e+01    24      30      57      60      74      78      90
-46     5.480868e+01    25      30      57      60      74      78      90
-82     5.697990e+01    26      30      57      60      74      78      90
-54     5.721079e+01    27      30      57      60      74      78      90
-47     5.710177e+01    28      30      57      60      74      78      90
-100    5.303401e+01    29      30      57      60      74      78      90
-73     5.636270e+01    30      31      57      60      74      78      90
-2      5.818141e+01    30      31      57      60      74      78      90      92
-57     5.199699e+01    30      32      57      60      74      78      90
-1      6.106816e+01    30      34      57      60      74      78      90
-32     5.884998e+01    30      36      57      60      74      78      90
-6      6.093938e+01    30      44      57      60      74      78      90
-3      6.102157e+01    30      56      57      60      74      78      90
-16     5.959263e+01    30      57      59      60      74      78      90
-2      5.992432e+01    30      57      60      62      74      78      90
-1      6.046417e+01    30      57      60      63      74      78      90
-3      5.955427e+01    30      57      60      66      74      78      90
-4      6.131319e+01    30      57      60      68      74      78      90
-3      6.049801e+01    30      57      60      69      74      78      90
-4      6.035831e+01    30      57      60      70      74      78      90
-2      5.949353e+01    30      57      60      74      76      78      90
-81     4.946418e+01    30      57      60      74      78
-2      6.301417e+01    30      57      60      74      78      87      90
-98612  5.898003e+01    30      57      60      74      78      90
-18     5.924109e+01    30      57      60      74      78      90      91
-3      6.010340e+01    30      57      60      74      78      90      92
-64     5.293612e+01    30      57      60      74      90
-61     5.027826e+01    30      57      60      78      90
-92     5.330013e+01    30      57      74      78      90
-39     5.235476e+01    30      60      74      78      90
-78     5.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
-15     5.500754e+01    0       30      57      60      74      78      90
-19     5.388530e+01    1       30      57      60      74      78      90
-9      5.672672e+01    2       30      57      60      74      78      90
-16     5.742996e+01    4       30      57      60      74      78      90
-4      5.967337e+01    8       30      57      60      74      78      90
-7      6.009987e+01    11      30      57      60      74      78      90
-9      5.846652e+01    12      30      57      60      74      78      90
-1      6.162988e+01    13      30      57      60      74      78      90
-2      6.001102e+01    14      30      57      60      74      78      90
-1      6.381227e+01    16      30      57      60      74      78      90
-3      6.209925e+01    18      30      57      60      74      78      90
-21     5.489658e+01    24      30      57      60      74      78      90
-11     5.480868e+01    25      30      57      60      74      78      90
-2      5.697990e+01    26      30      57      60      74      78      90
-17     5.721079e+01    27      30      57      60      74      78      90
-8      5.710177e+01    28      30      57      60      74      78      90
-9      5.303401e+01    29      30      57      60      74      78      90
-16     5.636270e+01    30      31      57      60      74      78      90
-13     5.199699e+01    30      32      57      60      74      78      90
-5      6.106816e+01    30      34      57      60      74      78      90
-7      5.884998e+01    30      36      57      60      74      78      90
-3      6.225090e+01    30      37      57      60      74      78      90
-3      6.093938e+01    30      44      57      60      74      78      90
-3      6.102157e+01    30      56      57      60      74      78      90
-7      5.959263e+01    30      57      59      60      74      78      90
-2      6.093039e+01    30      57      60      61      74      78      90
-9      5.992432e+01    30      57      60      62      74      78      90
-2      6.046417e+01    30      57      60      63      74      78      90
-4      5.955427e+01    30      57      60      66      74      78      90
-2      6.049801e+01    30      57      60      69      74      78      90
-2      5.949353e+01    30      57      60      74      76      78      90
-19     4.946418e+01    30      57      60      74      78
-2      6.357980e+01    30      57      60      74      78      82      90
-99674  5.898003e+01    30      57      60      74      78      90
-9      5.924109e+01    30      57      60      74      78      90      91
-2      6.331382e+01    30      57      60      74      78      90      97
-2      6.172090e+01    30      57      60      74      78      90      98
-15     5.293612e+01    30      57      60      74      90
-7      5.027826e+01    30      57      60      78      90
-10     5.330013e+01    30      57      74      78      90
-19     5.235476e+01    30      60      74      78      90
-9      5.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
-30     5.500754e+01    0       30      57      60      74      78      90
-57     5.388530e+01    1       30      57      60      74      78      90
-18     5.672672e+01    2       30      57      60      74      78      90
-1      4.756768e+01    2       30      57      60      78      90
-30     5.742996e+01    4       30      57      60      74      78      90
-5      5.967337e+01    8       30      57      60      74      78      90
-1      6.276004e+01    9       30      57      60      74      78      90
-2      6.009987e+01    11      30      57      60      74      78      90
-23     5.846652e+01    12      30      57      60      74      78      90
-3      6.162988e+01    13      30      57      60      74      78      90
-5      6.001102e+01    14      30      57      60      74      78      90
-3      6.209925e+01    18      30      57      60      74      78      90
-1      6.408172e+01    22      30      57      60      74      78      90
-41     5.489658e+01    24      30      57      60      74      78      90
-30     5.480868e+01    25      30      57      60      74      78      90
-12     5.697990e+01    26      30      57      60      74      78      90
-38     5.721079e+01    27      30      57      60      74      78      90
-20     5.710177e+01    28      30      57      60      74      78      90
-22     5.303401e+01    29      30      57      60      74      78      90
-41     5.636270e+01    30      31      57      60      74      78      90
-44     5.199699e+01    30      32      57      60      74      78      90
-2      6.106816e+01    30      34      57      60      74      78      90
-9      5.884998e+01    30      36      57      60      74      78      90
-3      6.225090e+01    30      37      57      60      74      78      90
-2      6.102157e+01    30      56      57      60      74      78      90
-7      5.959263e+01    30      57      59      60      74      78      90
-1      6.093039e+01    30      57      60      61      74      78      90
-14     5.992432e+01    30      57      60      62      74      78      90
-4      5.955427e+01    30      57      60      66      74      78      90
-2      6.049801e+01    30      57      60      69      74      78      90
-2      6.035831e+01    30      57      60      70      74      78      90
-1      6.103031e+01    30      57      60      71      74      78      90
-11     5.949353e+01    30      57      60      74      76      78      90
-57     4.946418e+01    30      57      60      74      78
-1      6.461185e+01    30      57      60      74      78      85      90
-99263  5.898003e+01    30      57      60      74      78      90
-16     5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-33     5.293612e+01    30      57      60      74      90
-28     5.027826e+01    30      57      60      78      90
-32     5.330013e+01    30      57      74      78      90
-55     5.235476e+01    30      60      74      78      90
-28     5.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
-5      5.578041e+01    0       30      57      60      74      76      78      90
-69     5.500754e+01    0       30      57      60      74      78      90
-134    5.388530e+01    1       30      57      60      74      78      90
-37     5.672672e+01    2       30      57      60      74      78      90
-1      4.756768e+01    2       30      57      60      78      90
-59     5.742996e+01    4       30      57      60      74      78      90
-20     5.967337e+01    8       30      57      60      74      78      90
-3      6.009987e+01    11      30      57      60      74      78      90
-35     5.846652e+01    12      30      57      60      74      78      90
-4      6.001102e+01    14      30      57      60      74      78      90
-1      5.787777e+01    24      30      57      60      73      74      78      90
-101    5.489658e+01    24      30      57      60      74      78      90
-82     5.480868e+01    25      30      57      60      74      78      90
-3      4.950842e+01    25      30      57      74      78      90
-33     5.697990e+01    26      30      57      60      74      78      90
-62     5.721079e+01    27      30      57      60      74      78      90
-48     5.710177e+01    28      30      57      60      74      78      90
-54     5.303401e+01    29      30      57      60      74      78      90
-98     5.636270e+01    30      31      57      60      74      78      90
-101    5.199699e+01    30      32      57      60      74      78      90
-4      6.106816e+01    30      34      57      60      74      78      90
-2      6.100229e+01    30      35      57      60      74      78      90
-13     5.884998e+01    30      36      57      60      74      78      90
-3      6.093938e+01    30      44      57      60      74      78      90
-2      6.102157e+01    30      56      57      60      74      78      90
-4      5.959263e+01    30      57      59      60      74      78      90
-5      6.093039e+01    30      57      60      61      74      78      90
-7      5.992432e+01    30      57      60      62      74      78      90
-13     5.955427e+01    30      57      60      66      74      78      90
-1      6.131319e+01    30      57      60      68      74      78      90
-1      6.049801e+01    30      57      60      69      74      78      90
-7      6.035831e+01    30      57      60      70      74      78      90
-12     5.949353e+01    30      57      60      74      76      78      90
-127    4.946418e+01    30      57      60      74      78
-98413  5.898003e+01    30      57      60      74      78      90
-12     5.924109e+01    30      57      60      74      78      90      91
-5      6.010340e+01    30      57      60      74      78      90      92
-72     5.293612e+01    30      57      60      74      90
-83     5.027826e+01    30      57      60      78      90
-64     5.330013e+01    30      57      74      78      90
-132    5.235476e+01    30      60      74      78      90
-68     5.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-10.test.expected-out b/test/test1_10-10.test.expected-out
index 26d3be8..d556bae 100644 (file)
--- a/test/test1_10-10.test.expected-out
+++ b/test/test1_10-10.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 
 0 1 2 4 8 | 
------------
-24 25 26 27 28 29 31 32 | 
-0 1 2 4 8 | 
------------
-24 25 26 27 28 29 31 32 | 
-0 1 2 4 8 | 

diff --git a/test/test1_10-10.test.expected-sum b/test/test1_10-10.test.expected-sum
index b313909..3eeab5c 100644 (file)
--- a/test/test1_10-10.test.expected-sum
+++ b/test/test1_10-10.test.expected-sum
@@ -1,2 +1,2 @@
-3      121     1       30      57      60      74      78      90
-3      134     1       30      57      60      74      78      90
+3      46      29      30      57      60      74      78      90
+3      77      30      32      57      60      74      78      90

diff --git a/test/test1_10-11.test.expected-dat b/test/test1_10-11.test.expected-dat
index 0178319..1b4ab93 100644 (file)
--- a/test/test1_10-11.test.expected-dat
+++ b/test/test1_10-11.test.expected-dat
@@ -1,204 +1,189 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      4.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.601881e+01    57      60      74      78      90
 2
-6      5.009987e+01    11      30      57      60      74      78      90
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-32     4.636270e+01    30      31      57      60      74      78      90
-24     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-5      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-14     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-38     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     4.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.601881e+01    57      60      74      78      90
 3
-3      4.520192e+01    0       30      57      60      74      78
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-102    4.303401e+01    29      30      57      60      74      78      90
-77     4.636270e+01    30      31      57      60      74      78      90
-59     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-26     4.884998e+01    30      36      57      60      74      78      90
-3      5.093938e+01    30      44      57      60      74      78      90
-14     4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-13     4.949353e+01    30      57      60      74      76      78      90
-95     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-16     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     4.101881e+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      5.009987e+01    11      30      57      60      74      78      90
-7      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-20     4.489658e+01    24      30      57      60      74      78      90
-6      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-13     4.721079e+01    27      30      57      60      74      78      90
-10     4.710177e+01    28      30      57      60      74      78      90
-6      4.303401e+01    29      30      57      60      74      78      90
-16     4.636270e+01    30      31      57      60      74      78      90
-12     4.199699e+01    30      32      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      5.102157e+01    30      56      57      60      74      78      90
-5      4.992432e+01    30      57      60      62      74      78      90
-4      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-10     5.035831e+01    30      57      60      70      74      78      90
-2      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-1      5.322720e+01    30      57      60      74      78      86      90
-99757  4.898003e+01    30      57      60      74      78      90
-6      4.924109e+01    30      57      60      74      78      90      91
-5      5.010340e+01    30      57      60      74      78      90      92
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-12     4.330013e+01    30      57      74      78      90
-19     4.235476e+01    30      60      74      78      90
-12     4.101881e+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
-24     4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-60     4.489658e+01    24      30      57      60      74      78      90
-16     4.480868e+01    25      30      57      60      74      78      90
-15     4.697990e+01    26      30      57      60      74      78      90
-33     4.721079e+01    27      30      57      60      74      78      90
-30     4.710177e+01    28      30      57      60      74      78      90
-21     4.303401e+01    29      30      57      60      74      78      90
-32     4.636270e+01    30      31      57      60      74      78      90
-41     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-23     4.884998e+01    30      36      57      60      74      78      90
-4      5.093938e+01    30      44      57      60      74      78      90
-4      4.959263e+01    30      57      59      60      74      78      90
-6      4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-10     4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-11     4.949353e+01    30      57      60      74      76      78      90
-50     3.946418e+01    30      57      60      74      78
-99377  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-5      5.010340e+01    30      57      60      74      78      90      92
-39     4.293612e+01    30      57      60      74      90
-32     4.027826e+01    30      57      60      78      90
-37     4.330013e+01    30      57      74      78      90
-49     4.235476e+01    30      60      74      78      90
-42     4.101881e+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
-2      5.097160e+01    8       30      57      60      78      90
-3      5.009987e+01    11      30      57      60      74      78      90
-47     4.846652e+01    12      30      57      60      74      78      90
-1      5.162988e+01    13      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-135    4.489658e+01    24      30      57      60      74      78      90
-49     4.480868e+01    25      30      57      60      74      78      90
-44     4.697990e+01    26      30      57      60      74      78      90
-68     4.721079e+01    27      30      57      60      74      78      90
-55     4.710177e+01    28      30      57      60      74      78      90
-44     4.303401e+01    29      30      57      60      74      78      90
-82     4.636270e+01    30      31      57      60      74      78      90
-86     4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-18     4.884998e+01    30      36      57      60      74      78      90
-1      4.207300e+01    30      38      57      60      74      78
-1      5.271108e+01    30      38      57      60      74      78      90
-3      5.093938e+01    30      44      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-5      5.093039e+01    30      57      60      61      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-17     4.955427e+01    30      57      60      66      74      78      90
-5      5.049801e+01    30      57      60      69      74      78      90
-13     4.949353e+01    30      57      60      74      76      78      90
-126    3.946418e+01    30      57      60      74      78
-4      5.301417e+01    30      57      60      74      78      87      90
-98669  4.898003e+01    30      57      60      74      78      90
-11     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-3      5.172090e+01    30      57      60      74      78      90      98
-82     4.293612e+01    30      57      60      74      90
-95     4.027826e+01    30      57      60      78      90
-84     4.330013e+01    30      57      74      78      90
-119    4.235476e+01    30      60      74      78      90
-2      4.433957e+01    57      60      74      78      87      90
-104    4.101881e+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-11.test.expected-out b/test/test1_10-11.test.expected-out
index a6c671f..ed7c910 100644 (file)
--- a/test/test1_10-11.test.expected-out
+++ b/test/test1_10-11.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 
 0 1 2 4 8 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 
-0 1 2 4 8 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 
-0 1 2 4 8 | 3 5 6 7 

diff --git a/test/test1_10-11.test.expected-sum b/test/test1_10-11.test.expected-sum
index 7f0e8fd..5d81d40 100644 (file)
--- a/test/test1_10-11.test.expected-sum
+++ b/test/test1_10-11.test.expected-sum
@@ -1,2 +1,2 @@
-3      98854   30      57      60      74      78      90
-3      98669   30      57      60      74      78      90
+3      99294   30      57      60      74      78      90
+3      99113   30      57      60      74      78      90

diff --git a/test/test1_11-00.test.expected-dat b/test/test1_11-00.test.expected-dat
index 44e2b58..ee88d0f 100644 (file)
--- a/test/test1_11-00.test.expected-dat
+++ b/test/test1_11-00.test.expected-dat
@@ -1,205 +1,205 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      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
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-33     4.636270e+01    30      31      57      60      74      78      90
-23     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-4      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-37     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     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
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-103    4.303401e+01    29      30      57      60      74      78      90
-78     4.636270e+01    30      31      57      60      74      78      90
-58     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-27     4.884998e+01    30      36      57      60      74      78      90
-1      5.093938e+01    30      44      57      60      74      78      90
-16     4.959263e+01    30      57      59      60      74      78      90
-1      5.093039e+01    30      57      60      61      74      78      90
-3      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-14     4.949353e+01    30      57      60      74      76      78      90
-94     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     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      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-4      5.209925e+01    18      30      57      60      74      78      90
-22     4.489658e+01    24      30      57      60      74      78      90
-8      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-9      4.710177e+01    28      30      57      60      74      78      90
-4      4.303401e+01    29      30      57      60      74      78      90
-14     4.636270e+01    30      31      57      60      74      78      90
-15     4.199699e+01    30      32      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-3      5.093039e+01    30      57      60      61      74      78      90
-16     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-3      5.365774e+01    30      57      60      65      74      78      90
-6      5.049801e+01    30      57      60      69      74      78      90
-4      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-99755  4.898003e+01    30      57      60      74      78      90
-8      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-1      5.331382e+01    30      57      60      74      78      90      97
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-16     4.235476e+01    30      60      74      78      90
-9      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
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-57     4.489658e+01    24      30      57      60      74      78      90
-22     4.480868e+01    25      30      57      60      74      78      90
-12     4.697990e+01    26      30      57      60      74      78      90
-25     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-19     4.303401e+01    29      30      57      60      74      78      90
-26     4.636270e+01    30      31      57      60      74      78      90
-39     4.199699e+01    30      32      57      60      74      78      90
-12     5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-1      5.092417e+01    30      40      57      60      74      78      90
-2      5.550344e+01    30      42      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-19     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-45     3.946418e+01    30      57      60      74      78
-99429  4.898003e+01    30      57      60      74      78      90
-20     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-2      5.172090e+01    30      57      60      74      78      90      98
-37     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-41     4.330013e+01    30      57      74      78      90
-47     4.235476e+01    30      60      74      78      90
-29     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
-21     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-6      5.209925e+01    18      30      57      60      74      78      90
-3      5.408172e+01    22      30      57      60      74      78      90
-129    4.489658e+01    24      30      57      60      74      78      90
-63     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-46     4.721079e+01    27      30      57      60      74      78      90
-45     4.710177e+01    28      30      57      60      74      78      90
-39     4.303401e+01    29      30      57      60      74      78      90
-54     4.636270e+01    30      31      57      60      74      78      90
-96     4.199699e+01    30      32      57      60      74      78      90
-4      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-2      5.271108e+01    30      38      57      60      74      78      90
-7      5.102157e+01    30      56      57      60      74      78      90
-8      4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-12     4.992432e+01    30      57      60      62      74      78      90
-4      5.046417e+01    30      57      60      63      74      78      90
-5      4.955427e+01    30      57      60      66      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.313605e+01    30      57      60      73      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-119    3.946418e+01    30      57      60      74      78
-2      5.301417e+01    30      57      60      74      78      87      90
-98782  4.898003e+01    30      57      60      74      78      90
-19     4.924109e+01    30      57      60      74      78      90      91
-78     4.293612e+01    30      57      60      74      90
-89     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-118    4.235476e+01    30      60      74      78      90
-78     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-00.test.expected-out b/test/test1_11-00.test.expected-out
index 006f7a6..a65ec69 100644 (file)
--- a/test/test1_11-00.test.expected-out
+++ b/test/test1_11-00.test.expected-out
@@ -1,7 +1,3 @@
 seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 30 
------------
-24 25 26 27 28 29 31 32 | 30 
------------
-24 25 26 27 28 29 31 32 | 30 

diff --git a/test/test1_11-01.test.expected-dat b/test/test1_11-01.test.expected-dat
index 44e2b58..1e76363 100644 (file)
--- a/test/test1_11-01.test.expected-dat
+++ b/test/test1_11-01.test.expected-dat
@@ -1,205 +1,190 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      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
-6      5.009987e+01    11      30      57      60      74      78      90
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-33     4.636270e+01    30      31      57      60      74      78      90
-23     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-4      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-37     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     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
-3      4.520192e+01    0       30      57      60      74      78
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-103    4.303401e+01    29      30      57      60      74      78      90
-78     4.636270e+01    30      31      57      60      74      78      90
-58     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-27     4.884998e+01    30      36      57      60      74      78      90
-1      5.093938e+01    30      44      57      60      74      78      90
-16     4.959263e+01    30      57      59      60      74      78      90
-1      5.093039e+01    30      57      60      61      74      78      90
-3      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-14     4.949353e+01    30      57      60      74      76      78      90
-94     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     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
-2      5.326373e+01    3       30      57      60      74      78      90
-1      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-4      5.209925e+01    18      30      57      60      74      78      90
-22     4.489658e+01    24      30      57      60      74      78      90
-8      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-9      4.710177e+01    28      30      57      60      74      78      90
-4      4.303401e+01    29      30      57      60      74      78      90
-14     4.636270e+01    30      31      57      60      74      78      90
-15     4.199699e+01    30      32      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-3      5.093039e+01    30      57      60      61      74      78      90
-16     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-3      5.365774e+01    30      57      60      65      74      78      90
-6      5.049801e+01    30      57      60      69      74      78      90
-4      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-99755  4.898003e+01    30      57      60      74      78      90
-8      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-1      5.331382e+01    30      57      60      74      78      90      97
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-16     4.235476e+01    30      60      74      78      90
-9      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
-9      4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-57     4.489658e+01    24      30      57      60      74      78      90
-22     4.480868e+01    25      30      57      60      74      78      90
-12     4.697990e+01    26      30      57      60      74      78      90
-25     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-19     4.303401e+01    29      30      57      60      74      78      90
-26     4.636270e+01    30      31      57      60      74      78      90
-39     4.199699e+01    30      32      57      60      74      78      90
-12     5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-1      5.092417e+01    30      40      57      60      74      78      90
-2      5.550344e+01    30      42      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-19     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-45     3.946418e+01    30      57      60      74      78
-99429  4.898003e+01    30      57      60      74      78      90
-20     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-2      5.172090e+01    30      57      60      74      78      90      98
-37     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-41     4.330013e+01    30      57      74      78      90
-47     4.235476e+01    30      60      74      78      90
-29     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
-4      5.009987e+01    11      30      57      60      74      78      90
-21     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-6      5.209925e+01    18      30      57      60      74      78      90
-3      5.408172e+01    22      30      57      60      74      78      90
-129    4.489658e+01    24      30      57      60      74      78      90
-63     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-46     4.721079e+01    27      30      57      60      74      78      90
-45     4.710177e+01    28      30      57      60      74      78      90
-39     4.303401e+01    29      30      57      60      74      78      90
-54     4.636270e+01    30      31      57      60      74      78      90
-96     4.199699e+01    30      32      57      60      74      78      90
-4      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-2      5.271108e+01    30      38      57      60      74      78      90
-7      5.102157e+01    30      56      57      60      74      78      90
-8      4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-12     4.992432e+01    30      57      60      62      74      78      90
-4      5.046417e+01    30      57      60      63      74      78      90
-5      4.955427e+01    30      57      60      66      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.313605e+01    30      57      60      73      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-119    3.946418e+01    30      57      60      74      78
-2      5.301417e+01    30      57      60      74      78      87      90
-98782  4.898003e+01    30      57      60      74      78      90
-19     4.924109e+01    30      57      60      74      78      90      91
-78     4.293612e+01    30      57      60      74      90
-89     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-118    4.235476e+01    30      60      74      78      90
-78     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-01.test.expected-out b/test/test1_11-01.test.expected-out
index 44f21cb..9b56efd 100644 (file)
--- a/test/test1_11-01.test.expected-out
+++ b/test/test1_11-01.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 30 
 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 30 
-| 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 30 
-| 3 5 6 7 

diff --git a/test/test1_11-01.test.expected-sum b/test/test1_11-01.test.expected-sum
index 374da29..57cfd74 100644 (file)
--- a/test/test1_11-01.test.expected-sum
+++ b/test/test1_11-01.test.expected-sum
@@ -1,2 +1,2 @@
-3      98854   30      57      60      74      78      90
-3      98782   30      57      60      74      78      90
+3      99314   30      57      60      74      78      90
+3      99142   30      57      60      74      78      90

diff --git a/test/test1_11-10.test.expected-dat b/test/test1_11-10.test.expected-dat
index 4a6496d..e1e940c 100644 (file)
--- a/test/test1_11-10.test.expected-dat
+++ b/test/test1_11-10.test.expected-dat
@@ -1,246 +1,194 @@
 1
-8      5.500754e+01    0       30      57      60      74      78      90
-27     5.388530e+01    1       30      57      60      74      78      90
-13     5.672672e+01    2       30      57      60      74      78      90
-11     5.742996e+01    4       30      57      60      74      78      90
-1      5.967337e+01    8       30      57      60      74      78      90
-4      5.846652e+01    12      30      57      60      74      78      90
-1      6.162988e+01    13      30      57      60      74      78      90
-6      6.001102e+01    14      30      57      60      74      78      90
-9      5.489658e+01    24      30      57      60      74      78      90
-8      5.480868e+01    25      30      57      60      74      78      90
-16     5.697990e+01    26      30      57      60      74      78      90
-11     5.721079e+01    27      30      57      60      74      78      90
-9      5.710177e+01    28      30      57      60      74      78      90
-17     5.303401e+01    29      30      57      60      74      78      90
-7      5.636270e+01    30      31      57      60      74      78      90
-7      5.199699e+01    30      32      57      60      74      78      90
-1      6.106816e+01    30      34      57      60      74      78      90
-8      6.100229e+01    30      35      57      60      74      78      90
-4      5.884998e+01    30      36      57      60      74      78      90
-2      6.093938e+01    30      44      57      60      74      78      90
-2      5.959263e+01    30      57      59      60      74      78      90
-2      5.992432e+01    30      57      60      62      74      78      90
-5      5.955427e+01    30      57      60      66      74      78      90
-1      6.131319e+01    30      57      60      68      74      78      90
-9      6.035831e+01    30      57      60      70      74      78      90
-1      6.103031e+01    30      57      60      71      74      78      90
-10     4.946418e+01    30      57      60      74      78
-99747  5.898003e+01    30      57      60      74      78      90
-4      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-11     5.293612e+01    30      57      60      74      90
-8      5.027826e+01    30      57      60      78      90
-14     5.330013e+01    30      57      74      78      90
-6      5.235476e+01    30      60      74      78      90
-8      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       3.601881e+01    57      60      74      78      90
 2
-20     5.500754e+01    0       30      57      60      74      78      90
-59     5.388530e+01    1       30      57      60      74      78      90
-29     5.672672e+01    2       30      57      60      74      78      90
-20     5.742996e+01    4       30      57      60      74      78      90
-10     5.967337e+01    8       30      57      60      74      78      90
-13     5.846652e+01    12      30      57      60      74      78      90
-4      6.001102e+01    14      30      57      60      74      78      90
-3      6.381227e+01    16      30      57      60      74      78      90
-33     5.489658e+01    24      30      57      60      74      78      90
-23     5.480868e+01    25      30      57      60      74      78      90
-38     5.697990e+01    26      30      57      60      74      78      90
-29     5.721079e+01    27      30      57      60      74      78      90
-21     5.710177e+01    28      30      57      60      74      78      90
-42     5.303401e+01    29      30      57      60      74      78      90
-34     5.636270e+01    30      31      57      60      74      78      90
-22     5.199699e+01    30      32      57      60      74      78      90
-6      6.100229e+01    30      35      57      60      74      78      90
-18     5.884998e+01    30      36      57      60      74      78      90
-1      6.092417e+01    30      40      57      60      74      78      90
-9      6.093938e+01    30      44      57      60      74      78      90
-13     5.959263e+01    30      57      59      60      74      78      90
-4      5.992432e+01    30      57      60      62      74      78      90
-1      6.046417e+01    30      57      60      63      74      78      90
-6      5.955427e+01    30      57      60      66      74      78      90
-1      6.131319e+01    30      57      60      68      74      78      90
-3      6.049801e+01    30      57      60      69      74      78      90
-5      6.035831e+01    30      57      60      70      74      78      90
-1      6.103031e+01    30      57      60      71      74      78      90
-6      6.313605e+01    30      57      60      73      74      78      90
-1      5.949353e+01    30      57      60      74      76      78      90
-32     4.946418e+01    30      57      60      74      78
-99335  5.898003e+01    30      57      60      74      78      90
-8      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-1      6.471666e+01    30      57      60      74      78      90      96
-25     5.293612e+01    30      57      60      74      90
-29     5.027826e+01    30      57      60      78      90
-45     5.330013e+01    30      57      74      78      90
-16     5.235476e+01    30      60      74      78      90
-32     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      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.617203e+01    0       30      57      60      69      74      78      90
-51     5.500754e+01    0       30      57      60      74      78      90
-122    5.388530e+01    1       30      57      60      74      78      90
-70     5.672672e+01    2       30      57      60      74      78      90
-36     5.742996e+01    4       30      57      60      74      78      90
-14     5.967337e+01    8       30      57      60      74      78      90
-4      6.276004e+01    9       30      57      60      74      78      90
-3      6.009987e+01    11      30      57      60      74      78      90
-23     5.846652e+01    12      30      57      60      74      78      90
-9      6.001102e+01    14      30      57      60      74      78      90
-1      6.408172e+01    22      30      57      60      74      78      90
-74     5.489658e+01    24      30      57      60      74      78      90
-48     5.480868e+01    25      30      57      60      74      78      90
-79     5.697990e+01    26      30      57      60      74      78      90
-54     5.721079e+01    27      30      57      60      74      78      90
-40     5.710177e+01    28      30      57      60      74      78      90
-6      5.872783e+01    29      30      57      60      74      78      81      90
-99     5.303401e+01    29      30      57      60      74      78      90
-87     5.636270e+01    30      31      57      60      74      78      90
-1      5.987728e+01    30      32      54      57      60      74      78      90
-61     5.199699e+01    30      32      57      60      74      78      90
-5      6.106816e+01    30      34      57      60      74      78      90
-6      6.100229e+01    30      35      57      60      74      78      90
-29     5.884998e+01    30      36      57      60      74      78      90
-5      6.092417e+01    30      40      57      60      74      78      90
-2      6.102157e+01    30      56      57      60      74      78      90
-12     5.959263e+01    30      57      59      60      74      78      90
-8      5.992432e+01    30      57      60      62      74      78      90
-5      6.046417e+01    30      57      60      63      74      78      90
-12     5.955427e+01    30      57      60      66      74      78      90
-2      6.049801e+01    30      57      60      69      74      78      90
-2      6.035831e+01    30      57      60      70      74      78      90
-5      5.949353e+01    30      57      60      74      76      78      90
-84     4.946418e+01    30      57      60      74      78
-98585  5.898003e+01    30      57      60      74      78      90
-13     5.924109e+01    30      57      60      74      78      90      91
-4      6.010340e+01    30      57      60      74      78      90      92
-58     5.293612e+01    30      57      60      74      90
-62     5.027826e+01    30      57      60      78      90
-95     5.330013e+01    30      57      74      78      90
-38     5.235476e+01    30      60      74      78      90
-83     4.101881e+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
-15     5.500754e+01    0       30      57      60      74      78      90
-19     5.388530e+01    1       30      57      60      74      78      90
-9      5.672672e+01    2       30      57      60      74      78      90
-11     5.742996e+01    4       30      57      60      74      78      90
-7      5.967337e+01    8       30      57      60      74      78      90
-2      6.009987e+01    11      30      57      60      74      78      90
-7      5.846652e+01    12      30      57      60      74      78      90
-5      6.001102e+01    14      30      57      60      74      78      90
-22     5.489658e+01    24      30      57      60      74      78      90
-5      5.480868e+01    25      30      57      60      74      78      90
-3      5.697990e+01    26      30      57      60      74      78      90
-7      5.721079e+01    27      30      57      60      74      78      90
-10     5.710177e+01    28      30      57      60      74      78      90
-7      5.303401e+01    29      30      57      60      74      78      90
-27     5.636270e+01    30      31      57      60      74      78      90
-11     5.199699e+01    30      32      57      60      74      78      90
-2      6.106816e+01    30      34      57      60      74      78      90
-2      6.100229e+01    30      35      57      60      74      78      90
-7      5.884998e+01    30      36      57      60      74      78      90
-6      6.092417e+01    30      40      57      60      74      78      90
-1      5.959263e+01    30      57      59      60      74      78      90
-9      5.992432e+01    30      57      60      62      74      78      90
-3      6.046417e+01    30      57      60      63      74      78      90
-2      6.365774e+01    30      57      60      65      74      78      90
-3      5.955427e+01    30      57      60      66      74      78      90
-6      6.035831e+01    30      57      60      70      74      78      90
-3      6.103031e+01    30      57      60      71      74      78      90
-3      5.949353e+01    30      57      60      74      76      78      90
-18     4.946418e+01    30      57      60      74      78
-2      6.468682e+01    30      57      60      74      78      81      90
-99702  5.898003e+01    30      57      60      74      78      90
-3      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-1      6.172090e+01    30      57      60      74      78      90      98
-14     5.293612e+01    30      57      60      74      90
-8      5.027826e+01    30      57      60      78      90
-12     5.330013e+01    30      57      74      78      90
-15     5.235476e+01    30      60      74      78      90
-9      4.101881e+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
-34     5.500754e+01    0       30      57      60      74      78      90
-53     5.388530e+01    1       30      57      60      74      78      90
-17     5.672672e+01    2       30      57      60      74      78      90
-33     5.742996e+01    4       30      57      60      74      78      90
-11     5.967337e+01    8       30      57      60      74      78      90
-1      6.276004e+01    9       30      57      60      74      78      90
-2      6.009987e+01    11      30      57      60      74      78      90
-19     5.846652e+01    12      30      57      60      74      78      90
-7      6.001102e+01    14      30      57      60      74      78      90
-3      6.381227e+01    16      30      57      60      74      78      90
-43     5.489658e+01    24      30      57      60      74      78      90
-16     5.480868e+01    25      30      57      60      74      78      90
-23     5.697990e+01    26      30      57      60      74      78      90
-16     5.721079e+01    27      30      57      60      74      78      90
-32     5.710177e+01    28      30      57      60      74      78      90
-19     5.303401e+01    29      30      57      60      74      78      90
-67     5.636270e+01    30      31      57      60      74      78      90
-35     5.199699e+01    30      32      57      60      74      78      90
-2      6.106816e+01    30      34      57      60      74      78      90
-1      6.100229e+01    30      35      57      60      74      78      90
-11     5.884998e+01    30      36      57      60      74      78      90
-2      6.225090e+01    30      37      57      60      74      78      90
-1      6.092417e+01    30      40      57      60      74      78      90
-4      5.959263e+01    30      57      59      60      74      78      90
-1      6.093039e+01    30      57      60      61      74      78      90
-7      5.992432e+01    30      57      60      62      74      78      90
-8      6.046417e+01    30      57      60      63      74      78      90
-4      5.955427e+01    30      57      60      66      74      78      90
-2      6.131319e+01    30      57      60      68      74      78      90
-5      6.035831e+01    30      57      60      70      74      78      90
-5      6.103031e+01    30      57      60      71      74      78      90
-13     5.949353e+01    30      57      60      74      76      78      90
-54     4.946418e+01    30      57      60      74      78
-2      6.384568e+01    30      57      60      74      78      84      90
-99256  5.898003e+01    30      57      60      74      78      90
-4      5.924109e+01    30      57      60      74      78      90      91
-4      6.010340e+01    30      57      60      74      78      90      92
-3      6.620694e+01    30      57      60      74      78      90      94
-36     5.293612e+01    30      57      60      74      90
-29     5.027826e+01    30      57      60      78      90
-40     5.330013e+01    30      57      74      78      90
-45     5.235476e+01    30      60      74      78      90
-30     4.101881e+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
-82     5.500754e+01    0       30      57      60      74      78      90
-124    5.388530e+01    1       30      57      60      74      78      90
-34     5.672672e+01    2       30      57      60      74      78      90
-73     5.742996e+01    4       30      57      60      74      78      90
-16     5.967337e+01    8       30      57      60      74      78      90
-4      6.009987e+01    11      30      57      60      74      78      90
-26     5.846652e+01    12      30      57      60      74      78      90
-5      6.001102e+01    14      30      57      60      74      78      90
-1      6.209925e+01    18      30      57      60      74      78      90
-103    5.489658e+01    24      30      57      60      74      78      90
-62     5.480868e+01    25      30      57      60      74      78      90
-49     5.697990e+01    26      30      57      60      74      78      90
-32     5.721079e+01    27      30      57      60      74      78      90
-56     5.710177e+01    28      30      57      60      74      78      90
-43     5.303401e+01    29      30      57      60      74      78      90
-145    5.636270e+01    30      31      57      60      74      78      90
-80     5.199699e+01    30      32      57      60      74      78      90
-6      6.106816e+01    30      34      57      60      74      78      90
-17     5.884998e+01    30      36      57      60      74      78      90
-1      6.093938e+01    30      44      57      60      74      78      90
-4      5.959263e+01    30      57      59      60      74      78      90
-3      6.093039e+01    30      57      60      61      74      78      90
-10     5.992432e+01    30      57      60      62      74      78      90
-1      6.046417e+01    30      57      60      63      74      78      90
-11     5.955427e+01    30      57      60      66      74      78      90
-2      6.131319e+01    30      57      60      68      74      78      90
-2      6.049801e+01    30      57      60      69      74      78      90
-1      6.035831e+01    30      57      60      70      74      78      90
-14     5.949353e+01    30      57      60      74      76      78      90
-120    4.946418e+01    30      57      60      74      78
-2      6.384568e+01    30      57      60      74      78      84      90
-4      6.301417e+01    30      57      60      74      78      87      90
-98400  5.898003e+01    30      57      60      74      78      90
-7      5.924109e+01    30      57      60      74      78      90      91
-2      6.010340e+01    30      57      60      74      78      90      92
-1      6.620694e+01    30      57      60      74      78      90      94
-82     5.293612e+01    30      57      60      74      90
-88     5.027826e+01    30      57      60      78      90
-90     5.330013e+01    30      57      74      78      90
-114    5.235476e+01    30      60      74      78      90
-83     4.101881e+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-10.test.expected-out b/test/test1_11-10.test.expected-out
index aa10faf..f3f020a 100644 (file)
--- a/test/test1_11-10.test.expected-out
+++ b/test/test1_11-10.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 30 
 0 1 2 4 8 | 
------------
-24 25 26 27 28 29 31 32 | 30 
-0 1 2 4 8 | 
------------
-24 25 26 27 28 29 31 32 | 30 
-0 1 2 4 8 | 

diff --git a/test/test1_11-10.test.expected-sum b/test/test1_11-10.test.expected-sum
index 853a3fa..5cdd6fd 100644 (file)
--- a/test/test1_11-10.test.expected-sum
+++ b/test/test1_11-10.test.expected-sum
@@ -1,2 +1,2 @@
-3      122     1       30      57      60      74      78      90
-3      145     30      31      57      60      74      78      90
+3      82      57      60      74      78      90
+3      118     57      60      74      78      90

diff --git a/test/test1_11-11.test.expected-dat b/test/test1_11-11.test.expected-dat
index 44e2b58..1e76363 100644 (file)
--- a/test/test1_11-11.test.expected-dat
+++ b/test/test1_11-11.test.expected-dat
@@ -1,205 +1,190 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      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
-6      5.009987e+01    11      30      57      60      74      78      90
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-33     4.636270e+01    30      31      57      60      74      78      90
-23     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-4      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-37     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     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
-3      4.520192e+01    0       30      57      60      74      78
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-103    4.303401e+01    29      30      57      60      74      78      90
-78     4.636270e+01    30      31      57      60      74      78      90
-58     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-27     4.884998e+01    30      36      57      60      74      78      90
-1      5.093938e+01    30      44      57      60      74      78      90
-16     4.959263e+01    30      57      59      60      74      78      90
-1      5.093039e+01    30      57      60      61      74      78      90
-3      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-14     4.949353e+01    30      57      60      74      76      78      90
-94     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     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
-2      5.326373e+01    3       30      57      60      74      78      90
-1      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-4      5.209925e+01    18      30      57      60      74      78      90
-22     4.489658e+01    24      30      57      60      74      78      90
-8      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-9      4.710177e+01    28      30      57      60      74      78      90
-4      4.303401e+01    29      30      57      60      74      78      90
-14     4.636270e+01    30      31      57      60      74      78      90
-15     4.199699e+01    30      32      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-3      5.093039e+01    30      57      60      61      74      78      90
-16     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-3      5.365774e+01    30      57      60      65      74      78      90
-6      5.049801e+01    30      57      60      69      74      78      90
-4      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-99755  4.898003e+01    30      57      60      74      78      90
-8      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-1      5.331382e+01    30      57      60      74      78      90      97
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-16     4.235476e+01    30      60      74      78      90
-9      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
-9      4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-57     4.489658e+01    24      30      57      60      74      78      90
-22     4.480868e+01    25      30      57      60      74      78      90
-12     4.697990e+01    26      30      57      60      74      78      90
-25     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-19     4.303401e+01    29      30      57      60      74      78      90
-26     4.636270e+01    30      31      57      60      74      78      90
-39     4.199699e+01    30      32      57      60      74      78      90
-12     5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-1      5.092417e+01    30      40      57      60      74      78      90
-2      5.550344e+01    30      42      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-19     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-45     3.946418e+01    30      57      60      74      78
-99429  4.898003e+01    30      57      60      74      78      90
-20     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-2      5.172090e+01    30      57      60      74      78      90      98
-37     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-41     4.330013e+01    30      57      74      78      90
-47     4.235476e+01    30      60      74      78      90
-29     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
-4      5.009987e+01    11      30      57      60      74      78      90
-21     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-6      5.209925e+01    18      30      57      60      74      78      90
-3      5.408172e+01    22      30      57      60      74      78      90
-129    4.489658e+01    24      30      57      60      74      78      90
-63     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-46     4.721079e+01    27      30      57      60      74      78      90
-45     4.710177e+01    28      30      57      60      74      78      90
-39     4.303401e+01    29      30      57      60      74      78      90
-54     4.636270e+01    30      31      57      60      74      78      90
-96     4.199699e+01    30      32      57      60      74      78      90
-4      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-2      5.271108e+01    30      38      57      60      74      78      90
-7      5.102157e+01    30      56      57      60      74      78      90
-8      4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-12     4.992432e+01    30      57      60      62      74      78      90
-4      5.046417e+01    30      57      60      63      74      78      90
-5      4.955427e+01    30      57      60      66      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.313605e+01    30      57      60      73      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-119    3.946418e+01    30      57      60      74      78
-2      5.301417e+01    30      57      60      74      78      87      90
-98782  4.898003e+01    30      57      60      74      78      90
-19     4.924109e+01    30      57      60      74      78      90      91
-78     4.293612e+01    30      57      60      74      90
-89     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-118    4.235476e+01    30      60      74      78      90
-78     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-11.test.expected-out b/test/test1_11-11.test.expected-out
index 96b8969..3da9b00 100644 (file)
--- a/test/test1_11-11.test.expected-out
+++ b/test/test1_11-11.test.expected-out
@@ -2,9 +2,3 @@ seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 30 
 0 1 2 4 8 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 30 
-0 1 2 4 8 | 3 5 6 7 
------------
-24 25 26 27 28 29 31 32 | 30 
-0 1 2 4 8 | 3 5 6 7 

diff --git a/test/test1_11-11.test.expected-sum b/test/test1_11-11.test.expected-sum
index 374da29..57cfd74 100644 (file)
--- a/test/test1_11-11.test.expected-sum
+++ b/test/test1_11-11.test.expected-sum
@@ -1,2 +1,2 @@
-3      98854   30      57      60      74      78      90
-3      98782   30      57      60      74      78      90
+3      99314   30      57      60      74      78      90
+3      99142   30      57      60      74      78      90

diff --git a/test/verbose.test.expected-dat b/test/verbose.test.expected-dat
index 44e2b58..ee88d0f 100644 (file)
--- a/test/verbose.test.expected-dat
+++ b/test/verbose.test.expected-dat
@@ -1,205 +1,205 @@
 1
-2      5.388530e+01    1       30      57      60      74      78      90
-4      4.846652e+01    12      30      57      60      74      78      90
-2      5.162988e+01    13      30      57      60      74      78      90
-5      5.001102e+01    14      30      57      60      74      78      90
-7      4.489658e+01    24      30      57      60      74      78      90
-10     4.480868e+01    25      30      57      60      74      78      90
-18     4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-7      4.710177e+01    28      30      57      60      74      78      90
-17     4.303401e+01    29      30      57      60      74      78      90
-5      4.636270e+01    30      31      57      60      74      78      90
-6      4.199699e+01    30      32      57      60      74      78      90
-2      5.106816e+01    30      34      57      60      74      78      90
-7      5.100229e+01    30      35      57      60      74      78      90
-8      4.884998e+01    30      36      57      60      74      78      90
-2      5.093938e+01    30      44      57      60      74      78      90
-1      4.959263e+01    30      57      59      60      74      78      90
-2      4.992432e+01    30      57      60      62      74      78      90
-7      4.955427e+01    30      57      60      66      74      78      90
-3      5.131319e+01    30      57      60      68      74      78      90
-5      5.035831e+01    30      57      60      70      74      78      90
-5      5.103031e+01    30      57      60      71      74      78      90
-11     3.946418e+01    30      57      60      74      78
-99800  4.898003e+01    30      57      60      74      78      90
-3      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-11     4.293612e+01    30      57      60      74      90
-8      4.027826e+01    30      57      60      78      90
-14     4.330013e+01    30      57      74      78      90
-6      4.235476e+01    30      60      74      78      90
-8      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
-9      4.846652e+01    12      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-30     4.489658e+01    24      30      57      60      74      78      90
-31     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-30     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-48     4.303401e+01    29      30      57      60      74      78      90
-33     4.636270e+01    30      31      57      60      74      78      90
-23     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-4      5.100229e+01    30      35      57      60      74      78      90
-16     4.884998e+01    30      36      57      60      74      78      90
-1      5.225090e+01    30      37      57      60      74      78      90
-2      5.092417e+01    30      40      57      60      74      78      90
-2      5.102157e+01    30      56      57      60      74      78      90
-13     4.959263e+01    30      57      59      60      74      78      90
-7      4.992432e+01    30      57      60      62      74      78      90
-3      5.046417e+01    30      57      60      63      74      78      90
-9      4.955427e+01    30      57      60      66      74      78      90
-2      5.131319e+01    30      57      60      68      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-3      5.103031e+01    30      57      60      71      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-37     3.946418e+01    30      57      60      74      78
-99457  4.898003e+01    30      57      60      74      78      90
-9      4.924109e+01    30      57      60      74      78      90      91
-27     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-46     4.330013e+01    30      57      74      78      90
-17     4.235476e+01    30      60      74      78      90
-31     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
-11     5.009987e+01    11      30      57      60      74      78      90
-27     4.846652e+01    12      30      57      60      74      78      90
-1      5.001102e+01    14      30      57      60      74      78      90
-61     4.489658e+01    24      30      57      60      74      78      90
-73     4.480868e+01    25      30      57      60      74      78      90
-62     4.697990e+01    26      30      57      60      74      78      90
-75     4.721079e+01    27      30      57      60      74      78      90
-50     4.710177e+01    28      30      57      60      74      78      90
-103    4.303401e+01    29      30      57      60      74      78      90
-78     4.636270e+01    30      31      57      60      74      78      90
-58     4.199699e+01    30      32      57      60      74      78      90
-3      5.106816e+01    30      34      57      60      74      78      90
-27     4.884998e+01    30      36      57      60      74      78      90
-1      5.093938e+01    30      44      57      60      74      78      90
-16     4.959263e+01    30      57      59      60      74      78      90
-1      5.093039e+01    30      57      60      61      74      78      90
-3      4.992432e+01    30      57      60      62      74      78      90
-6      5.046417e+01    30      57      60      63      74      78      90
-1      4.955427e+01    30      57      60      66      74      78      90
-3      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-2      5.103031e+01    30      57      60      71      74      78      90
-14     4.949353e+01    30      57      60      74      76      78      90
-94     3.946418e+01    30      57      60      74      78
-98854  4.898003e+01    30      57      60      74      78      90
-17     4.924109e+01    30      57      60      74      78      90      91
-4      5.010340e+01    30      57      60      74      78      90      92
-69     4.293612e+01    30      57      60      74      90
-62     4.027826e+01    30      57      60      78      90
-98     4.330013e+01    30      57      74      78      90
-39     4.235476e+01    30      60      74      78      90
-83     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      5.009987e+01    11      30      57      60      74      78      90
-6      4.846652e+01    12      30      57      60      74      78      90
-2      5.001102e+01    14      30      57      60      74      78      90
-4      5.209925e+01    18      30      57      60      74      78      90
-22     4.489658e+01    24      30      57      60      74      78      90
-8      4.480868e+01    25      30      57      60      74      78      90
-4      4.697990e+01    26      30      57      60      74      78      90
-12     4.721079e+01    27      30      57      60      74      78      90
-9      4.710177e+01    28      30      57      60      74      78      90
-4      4.303401e+01    29      30      57      60      74      78      90
-14     4.636270e+01    30      31      57      60      74      78      90
-15     4.199699e+01    30      32      57      60      74      78      90
-1      5.106816e+01    30      34      57      60      74      78      90
-2      5.100229e+01    30      35      57      60      74      78      90
-14     4.884998e+01    30      36      57      60      74      78      90
-3      4.959263e+01    30      57      59      60      74      78      90
-3      5.093039e+01    30      57      60      61      74      78      90
-16     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-3      5.365774e+01    30      57      60      65      74      78      90
-6      5.049801e+01    30      57      60      69      74      78      90
-4      4.949353e+01    30      57      60      74      76      78      90
-16     3.946418e+01    30      57      60      74      78
-99755  4.898003e+01    30      57      60      74      78      90
-8      4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-1      5.331382e+01    30      57      60      74      78      90      97
-14     4.293612e+01    30      57      60      74      90
-10     4.027826e+01    30      57      60      78      90
-13     4.330013e+01    30      57      74      78      90
-16     4.235476e+01    30      60      74      78      90
-9      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
-1      5.001102e+01    14      30      57      60      74      78      90
-1      5.209925e+01    18      30      57      60      74      78      90
-57     4.489658e+01    24      30      57      60      74      78      90
-22     4.480868e+01    25      30      57      60      74      78      90
-12     4.697990e+01    26      30      57      60      74      78      90
-25     4.721079e+01    27      30      57      60      74      78      90
-25     4.710177e+01    28      30      57      60      74      78      90
-19     4.303401e+01    29      30      57      60      74      78      90
-26     4.636270e+01    30      31      57      60      74      78      90
-39     4.199699e+01    30      32      57      60      74      78      90
-12     5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-1      5.092417e+01    30      40      57      60      74      78      90
-2      5.550344e+01    30      42      57      60      74      78      90
-6      4.959263e+01    30      57      59      60      74      78      90
-19     4.992432e+01    30      57      60      62      74      78      90
-1      5.046417e+01    30      57      60      63      74      78      90
-2      4.955427e+01    30      57      60      66      74      78      90
-4      5.131319e+01    30      57      60      68      74      78      90
-4      5.049801e+01    30      57      60      69      74      78      90
-1      5.035831e+01    30      57      60      70      74      78      90
-7      4.949353e+01    30      57      60      74      76      78      90
-45     3.946418e+01    30      57      60      74      78
-99429  4.898003e+01    30      57      60      74      78      90
-20     4.924109e+01    30      57      60      74      78      90      91
-2      5.010340e+01    30      57      60      74      78      90      92
-2      5.172090e+01    30      57      60      74      78      90      98
-37     4.293612e+01    30      57      60      74      90
-31     4.027826e+01    30      57      60      78      90
-41     4.330013e+01    30      57      74      78      90
-47     4.235476e+01    30      60      74      78      90
-29     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
-21     4.846652e+01    12      30      57      60      74      78      90
-3      5.162988e+01    13      30      57      60      74      78      90
-6      5.001102e+01    14      30      57      60      74      78      90
-6      5.209925e+01    18      30      57      60      74      78      90
-3      5.408172e+01    22      30      57      60      74      78      90
-129    4.489658e+01    24      30      57      60      74      78      90
-63     4.480868e+01    25      30      57      60      74      78      90
-30     4.697990e+01    26      30      57      60      74      78      90
-46     4.721079e+01    27      30      57      60      74      78      90
-45     4.710177e+01    28      30      57      60      74      78      90
-39     4.303401e+01    29      30      57      60      74      78      90
-54     4.636270e+01    30      31      57      60      74      78      90
-96     4.199699e+01    30      32      57      60      74      78      90
-4      5.106816e+01    30      34      57      60      74      78      90
-3      5.100229e+01    30      35      57      60      74      78      90
-22     4.884998e+01    30      36      57      60      74      78      90
-2      5.271108e+01    30      38      57      60      74      78      90
-7      5.102157e+01    30      56      57      60      74      78      90
-8      4.959263e+01    30      57      59      60      74      78      90
-2      5.093039e+01    30      57      60      61      74      78      90
-12     4.992432e+01    30      57      60      62      74      78      90
-4      5.046417e+01    30      57      60      63      74      78      90
-5      4.955427e+01    30      57      60      66      74      78      90
-6      5.035831e+01    30      57      60      70      74      78      90
-2      5.313605e+01    30      57      60      73      74      78      90
-3      4.949353e+01    30      57      60      74      76      78      90
-119    3.946418e+01    30      57      60      74      78
-2      5.301417e+01    30      57      60      74      78      87      90
-98782  4.898003e+01    30      57      60      74      78      90
-19     4.924109e+01    30      57      60      74      78      90      91
-78     4.293612e+01    30      57      60      74      90
-89     4.027826e+01    30      57      60      78      90
-90     4.330013e+01    30      57      74      78      90
-118    4.235476e+01    30      60      74      78      90
-78     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/verbose.test.expected-out b/test/verbose.test.expected-out
index 40916e3..64f0820 100644 (file)
--- a/test/verbose.test.expected-out
+++ b/test/verbose.test.expected-out
@@ -1,8 +1,6 @@
 seed = 66314
 1      30      57      60      74      78      90;
 24 25 26 27 28 29 31 32 | 30 
------------
-24 25 26 27 28 29 31 32 | 30 
 survival probability 0.00240569 number survived 0 total number 0       0       30      57      60      74      78      90
 survival probability 0.00735298 number survived 1 total number 1       1       30      57      60      74      78      90
 survival probability 0.000431987 number survived 0 total number 0      2       30      57      60      74      78      90
@@ -315,8 +313,6 @@ survival probability 0.998641 number survived 21 total number 21    30      60      74      78      90
 survival probability 1 number survived 39 total number 39      57      60      74      78      90
 checkpoint, total_deaths = 50637
 The total population size is 49363
------------
-24 25 26 27 28 29 31 32 | 30 
 survival probability 0.00240687 number survived 0 total number 0       0       30      57      60      74      78      90
 survival probability 0.00735655 number survived 0 total number 0       1       30      57      60      74      78      90
 survival probability 0.000432199 number survived 0 total number 0      2       30      57      60      74      78      90