| Previous changeset 2:cef64c36c89e (2024-03-12) Next changeset 4:ed85107b3cfd (2025-02-21) |
|
Commit message:
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/nonpareil commit 062d683f6b646318503d32aaad3ddfa35bb2f20e |
|
modified:
macros.xml nonpareil.xml test-data/test1-all_data_output test-data/test1-mating_vector_output test-data/test1-summary test-data/test2-all_data_output test-data/test2-mating_vector_output test-data/test2-summary |
| b |
| diff -r cef64c36c89e -r 9016f67b716f macros.xml --- a/macros.xml Tue Mar 12 08:50:50 2024 +0000 +++ b/macros.xml Thu Feb 13 19:37:59 2025 +0000 |
| b |
| @@ -10,5 +10,5 @@ <xref type="bio.tools">nonpareil</xref> </xrefs> </xml> - <token name="@TOOL_VERSION@">3.1.1</token> + <token name="@TOOL_VERSION@">3.5.5</token> </macros> \ No newline at end of file |
| b |
| diff -r cef64c36c89e -r 9016f67b716f nonpareil.xml --- a/nonpareil.xml Tue Mar 12 08:50:50 2024 +0000 +++ b/nonpareil.xml Thu Feb 13 19:37:59 2025 +0000 |
| [ |
| @@ -1,4 +1,4 @@ -<tool id="nonpareil" name="Nonpareil" version="@TOOL_VERSION@.1" profile="21.01"> +<tool id="nonpareil" name="Nonpareil" version="@TOOL_VERSION@+galaxy0" profile="21.01"> <description>to estimate average coverage and generate Nonpareil curves</description> <macros> <import>macros.xml</import> @@ -8,6 +8,9 @@ <version_command>nonpareil -V</version_command> <command detect_errors="exit_code"> <![CDATA[ +#import re +#set summary_path = re.sub('[^\s\w\-.]', '_', str($input.element_identifier)) + ln -s '$input' input && nonpareil @@ -30,7 +33,7 @@ #if $log_test -l '$log' #end if - -o '$summary' + -o '$summary_path' $use_portion_in_output -m '$sampling.min_sampling_portion' -M '$sampling.max_sampling_portion' @@ -45,7 +48,10 @@ -x '$mating.proba' #end if -r '$seed' - && echo $log_test +&& cp '$summary_path' '$summary' +#if '$json_object' + && NonpareilCurves.R --json '$json_output' '$summary_path' +#end if ]]></command> <inputs> <param name="input" type="data" format="fastq,fasta" label="Input sequences" help="FastQ format is recommended for kmer algorithm and Fasta for the alignment" argument="-s"/> @@ -72,6 +78,7 @@ </section> <param name="seed" type="integer" value="1000" min="0" label="Random generator seed?" argument="-r"/> <param name="log_test" type="boolean" truevalue="true" falsevalue="false" checked="false" label="Output log file?"/> + <param name="json_object" type="boolean" label="Extract the curves object as a JSON file?" help="Can be used as an input for MultiQC"/> </inputs> <outputs> <data format="tabular" name="summary" label="${tool.name} on ${on_string}: Redundancy summary"> @@ -87,10 +94,13 @@ <data format="txt" name="log" label="${tool.name} on ${on_string}: Log"> <filter>log_test</filter> </data> + <data format="txt" name="json_output" label="${tool.name} on ${on_string}: Curves object (JSON)"> + <filter>json_object</filter> + </data> <data format="tabular" name="mating_vector_output" label="${tool.name} on ${on_string}: Mates distribution"/> </outputs> <tests> - <test expect_num_outputs="4"> + <test expect_num_outputs="5"> <param name="input" value="test.fasta"/> <param name="algo" value="alignment"/> <param name="subsampling" value="0.7"/> @@ -110,6 +120,7 @@ </section> <param name="seed" value="1000"/> <param name="log_test" value="true"/> + <param name="json_object" value="true"/> <output name="all_data_output" value="test1-all_data_output" compare="sim_size" delta="0"/> <output name="log"> <assert_contents> @@ -120,6 +131,14 @@ </output> <output name="summary" value="test1-summary" compare="sim_size" delta="0"/> <output name="mating_vector_output" value="test1-mating_vector_output" compare="sim_size" delta="0"/> + <output name="json_output"> + <assert_contents> + <has_text text="LRstar"/> + <has_text text="alignment"/> + <has_text text="test.fasta"/> + <has_text text="500"/> + </assert_contents> + </output> </test> <test expect_num_outputs="3"> <param name="input" value="test.fastq"/> |
| b |
| diff -r cef64c36c89e -r 9016f67b716f test-data/test1-all_data_output --- a/test-data/test1-all_data_output Tue Mar 12 08:50:50 2024 +0000 +++ b/test-data/test1-all_data_output Thu Feb 13 19:37:59 2025 +0000 |
| b |
| b'@@ -2129,9 +2129,9 @@\n 0.00\t80\t0.0000000000\n 0.00\t81\t0.0000000000\n 0.00\t82\t0.0000000000\n-0.00\t83\t0.5000000000\n+0.00\t83\t0.0000000000\n 0.00\t84\t0.0000000000\n-0.00\t85\t0.0000000000\n+0.00\t85\t0.2500000000\n 0.00\t86\t0.0000000000\n 0.00\t87\t0.0000000000\n 0.00\t88\t0.0000000000\n@@ -2176,7 +2176,7 @@\n 0.00\t127\t0.0000000000\n 0.00\t128\t0.0000000000\n 0.00\t129\t0.0000000000\n-0.00\t130\t0.3333333333\n+0.00\t130\t0.0000000000\n 0.00\t131\t0.0000000000\n 0.00\t132\t0.0000000000\n 0.00\t133\t0.0000000000\n@@ -2227,7 +2227,7 @@\n 0.00\t178\t0.0000000000\n 0.00\t179\t0.0000000000\n 0.00\t180\t0.0000000000\n-0.00\t181\t1.0000000000\n+0.00\t181\t0.0000000000\n 0.00\t182\t0.0000000000\n 0.00\t183\t0.0000000000\n 0.00\t184\t0.0000000000\n@@ -2437,7 +2437,7 @@\n 0.00\t388\t0.0000000000\n 0.00\t389\t0.0000000000\n 0.00\t390\t0.0000000000\n-0.00\t391\t0.0000000000\n+0.00\t391\t1.0000000000\n 0.00\t392\t0.0000000000\n 0.00\t393\t0.0000000000\n 0.00\t394\t0.0000000000\n@@ -2484,7 +2484,7 @@\n 0.00\t435\t0.0000000000\n 0.00\t436\t0.0000000000\n 0.00\t437\t0.0000000000\n-0.00\t438\t0.2000000000\n+0.00\t438\t0.0000000000\n 0.00\t439\t0.0000000000\n 0.00\t440\t0.0000000000\n 0.00\t441\t0.0000000000\n@@ -2740,7 +2740,7 @@\n 0.00\t691\t0.0000000000\n 0.00\t692\t0.0000000000\n 0.00\t693\t0.0000000000\n-0.00\t694\t0.2000000000\n+0.00\t694\t0.0000000000\n 0.00\t695\t0.0000000000\n 0.00\t696\t0.0000000000\n 0.00\t697\t0.0000000000\n@@ -2850,7 +2850,7 @@\n 0.00\t801\t0.0000000000\n 0.00\t802\t0.0000000000\n 0.00\t803\t0.0000000000\n-0.00\t804\t0.2500000000\n+0.00\t804\t0.0000000000\n 0.00\t805\t0.0000000000\n 0.00\t806\t0.0000000000\n 0.00\t807\t0.0000000000\n@@ -2986,7 +2986,7 @@\n 0.00\t937\t0.0000000000\n 0.00\t938\t0.0000000000\n 0.00\t939\t0.0000000000\n-0.00\t940\t0.1666666667\n+0.00\t940\t0.0000000000\n 0.00\t941\t0.0000000000\n 0.00\t942\t0.0000000000\n 0.00\t943\t0.0000000000\n@@ -3071,7 +3071,7 @@\n 0.00\t1022\t0.0000000000\n 0.00\t1023\t0.0000000000\n 0.01\t0\t0.0000000000\n-0.01\t1\t0.0000000000\n+0.01\t1\t0.2500000000\n 0.01\t2\t0.0000000000\n 0.01\t3\t0.0000000000\n 0.01\t4\t0.0000000000\n@@ -3144,11 +3144,11 @@\n 0.01\t71\t0.0000000000\n 0.01\t72\t0.0000000000\n 0.01\t73\t0.0000000000\n-0.01\t74\t0.0000000000\n+0.01\t74\t0.2500000000\n 0.01\t75\t0.0000000000\n 0.01\t76\t0.0000000000\n 0.01\t77\t0.0000000000\n-0.01\t78\t0.1666666667\n+0.01\t78\t0.0000000000\n 0.01\t79\t0.0000000000\n 0.01\t80\t0.0000000000\n 0.01\t81\t0.0000000000\n@@ -3223,12 +3223,12 @@\n 0.01\t150\t0.0000000000\n 0.01\t151\t0.0000000000\n 0.01\t152\t0.0000000000\n-0.01\t153\t0.2000000000\n+0.01\t153\t0.0000000000\n 0.01\t154\t0.0000000000\n 0.01\t155\t0.0000000000\n 0.01\t156\t0.0000000000\n 0.01\t157\t0.0000000000\n-0.01\t158\t0.0000000000\n+0.01\t158\t0.5000000000\n 0.01\t159\t0.0000000000\n 0.01\t160\t0.0000000000\n 0.01\t161\t0.0000000000\n@@ -3251,7 +3251,7 @@\n 0.01\t178\t0.0000000000\n 0.01\t179\t0.0000000000\n 0.01\t180\t0.0000000000\n-0.01\t181\t0.0000000000\n+0.01\t181\t0.2000000000\n 0.01\t182\t0.0000000000\n 0.01\t183\t0.0000000000\n 0.01\t184\t0.0000000000\n@@ -3273,7 +3273,7 @@\n 0.01\t200\t0.0000000000\n 0.01\t201\t0.0000000000\n 0.01\t202\t0.0000000000\n-0.01\t203\t0.1428571429\n+0.01\t203\t0.0000000000\n 0.01\t204\t0.0000000000\n 0.01\t205\t0.0000000000\n 0.01\t206\t0.0000000000\n@@ -3308,7 +3308,7 @@\n 0.01\t235\t0.0000000000\n 0.01\t236\t0.0000000000\n 0.01\t237\t0.0000000000\n-0.01\t238\t0.2000000000\n+0.01\t238\t0.0000000000\n 0.01\t239\t0.0000000000\n 0.01\t240\t0.0000000000\n 0.01\t241\t0.0000000000\n@@ -3324,7 +3324,7 @@\n 0.01\t251\t0.0000000000\n 0.01\t252\t0.0000000000\n 0.01\t253\t0.0000000000\n-0.01\t254\t0.2500000000\n+0.01\t254\t0.0000000000\n 0.01\t255\t0.0000000000\n 0.01\t256\t0.0000000000\n 0.01\t257\t0.0000000000\n@@ -3334,7 +3334,7 @@\n 0.01\t261\t0.0000000000\n 0.01\t262\t0.0000000000\n 0.01\t263\t0.0000000000\n-0.01\t264\t0.0000000000\n+0.01\t264\t0.3333333333\n 0.01\t265\t0.0000000000\n 0.01\t266\t0.0000000000\n 0.01\t267\t0.0000000000\n@@ -3357,7 +3357,7 @@\n 0.01\t284\t0.0000000000\n 0.01\t285\t0.0000000000\n 0.01\t286\t0.0000000000\n-0.01\t287\t0.3333333333\n+0.01\t287\t0.0000000000\n 0.01\t288\t0.0000000000\n 0.01\t289\t0.0000000000\n 0.01\t290\t0.0000000000\n@@ -3397,7 +3397,7 @@\n 0.01\t324\t0.0000000000\n 0.01\t325\t0.0000000000\n 0.01\t326\t0.0000000000\n-0.01\t327\t0.0000000000\n+0.01\t327\t0.2000000000\n 0.01\t328\t0.0000000000\n 0.01\t329\t0.0000000000\n 0.01\t330\t0.0000000000'..b'0\t851\t0.1910994764\n+1.00\t852\t0.2120418848\n+1.00\t853\t0.2146596859\n+1.00\t854\t0.2068062827\n+1.00\t855\t0.2225130890\n+1.00\t856\t0.2172774869\n+1.00\t857\t0.2329842932\n+1.00\t858\t0.2094240838\n+1.00\t859\t0.1963350785\n+1.00\t860\t0.2041884817\n+1.00\t861\t0.2094240838\n+1.00\t862\t0.2146596859\n+1.00\t863\t0.1989528796\n+1.00\t864\t0.2015706806\n+1.00\t865\t0.2251308901\n+1.00\t866\t0.2094240838\n+1.00\t867\t0.2225130890\n+1.00\t868\t0.2068062827\n+1.00\t869\t0.2015706806\n+1.00\t870\t0.2041884817\n+1.00\t871\t0.2068062827\n+1.00\t872\t0.2277486911\n+1.00\t873\t0.2120418848\n+1.00\t874\t0.1989528796\n+1.00\t875\t0.1937172775\n+1.00\t876\t0.2094240838\n+1.00\t877\t0.2382198953\n+1.00\t878\t0.2251308901\n+1.00\t879\t0.2120418848\n+1.00\t880\t0.2146596859\n+1.00\t881\t0.2015706806\n+1.00\t882\t0.2303664921\n+1.00\t883\t0.2068062827\n+1.00\t884\t0.2068062827\n+1.00\t885\t0.2068062827\n+1.00\t886\t0.2120418848\n+1.00\t887\t0.2172774869\n+1.00\t888\t0.2146596859\n+1.00\t889\t0.2172774869\n+1.00\t890\t0.2120418848\n+1.00\t891\t0.2198952880\n+1.00\t892\t0.2225130890\n+1.00\t893\t0.2225130890\n+1.00\t894\t0.1963350785\n+1.00\t895\t0.2277486911\n+1.00\t896\t0.2146596859\n+1.00\t897\t0.2225130890\n+1.00\t898\t0.2172774869\n+1.00\t899\t0.1963350785\n+1.00\t900\t0.2198952880\n+1.00\t901\t0.2329842932\n+1.00\t902\t0.2277486911\n+1.00\t903\t0.2198952880\n+1.00\t904\t0.2094240838\n+1.00\t905\t0.2094240838\n+1.00\t906\t0.2094240838\n+1.00\t907\t0.2068062827\n+1.00\t908\t0.2120418848\n+1.00\t909\t0.2172774869\n+1.00\t910\t0.2146596859\n+1.00\t911\t0.2094240838\n+1.00\t912\t0.2146596859\n+1.00\t913\t0.2015706806\n+1.00\t914\t0.2172774869\n+1.00\t915\t0.2041884817\n+1.00\t916\t0.2015706806\n+1.00\t917\t0.2094240838\n+1.00\t918\t0.2094240838\n+1.00\t919\t0.2120418848\n+1.00\t920\t0.2146596859\n+1.00\t921\t0.2146596859\n+1.00\t922\t0.2041884817\n+1.00\t923\t0.1937172775\n+1.00\t924\t0.1963350785\n+1.00\t925\t0.2225130890\n+1.00\t926\t0.2068062827\n+1.00\t927\t0.2094240838\n+1.00\t928\t0.2094240838\n+1.00\t929\t0.2015706806\n+1.00\t930\t0.2120418848\n+1.00\t931\t0.2094240838\n+1.00\t932\t0.2172774869\n+1.00\t933\t0.2198952880\n+1.00\t934\t0.2120418848\n+1.00\t935\t0.2146596859\n+1.00\t936\t0.1937172775\n+1.00\t937\t0.2120418848\n+1.00\t938\t0.2198952880\n+1.00\t939\t0.2225130890\n+1.00\t940\t0.2120418848\n+1.00\t941\t0.2225130890\n+1.00\t942\t0.2015706806\n+1.00\t943\t0.2094240838\n+1.00\t944\t0.2277486911\n+1.00\t945\t0.2172774869\n+1.00\t946\t0.2094240838\n+1.00\t947\t0.2094240838\n+1.00\t948\t0.2094240838\n+1.00\t949\t0.2251308901\n+1.00\t950\t0.2251308901\n+1.00\t951\t0.2094240838\n+1.00\t952\t0.2094240838\n+1.00\t953\t0.2041884817\n+1.00\t954\t0.2198952880\n+1.00\t955\t0.2015706806\n+1.00\t956\t0.2041884817\n+1.00\t957\t0.2094240838\n+1.00\t958\t0.2146596859\n+1.00\t959\t0.2146596859\n+1.00\t960\t0.2146596859\n+1.00\t961\t0.2146596859\n+1.00\t962\t0.2198952880\n+1.00\t963\t0.2120418848\n+1.00\t964\t0.2251308901\n+1.00\t965\t0.2172774869\n+1.00\t966\t0.2172774869\n+1.00\t967\t0.2225130890\n+1.00\t968\t0.2251308901\n+1.00\t969\t0.2041884817\n+1.00\t970\t0.2068062827\n+1.00\t971\t0.2094240838\n+1.00\t972\t0.2120418848\n+1.00\t973\t0.2094240838\n+1.00\t974\t0.2146596859\n+1.00\t975\t0.2146596859\n+1.00\t976\t0.2356020942\n+1.00\t977\t0.2172774869\n+1.00\t978\t0.2172774869\n+1.00\t979\t0.2146596859\n+1.00\t980\t0.2198952880\n+1.00\t981\t0.2251308901\n+1.00\t982\t0.2094240838\n+1.00\t983\t0.2120418848\n+1.00\t984\t0.2172774869\n+1.00\t985\t0.2041884817\n+1.00\t986\t0.2146596859\n+1.00\t987\t0.2015706806\n+1.00\t988\t0.2198952880\n+1.00\t989\t0.1910994764\n+1.00\t990\t0.2303664921\n+1.00\t991\t0.2120418848\n+1.00\t992\t0.2120418848\n+1.00\t993\t0.2172774869\n+1.00\t994\t0.2094240838\n+1.00\t995\t0.2198952880\n+1.00\t996\t0.2277486911\n+1.00\t997\t0.2198952880\n+1.00\t998\t0.2120418848\n+1.00\t999\t0.2041884817\n+1.00\t1000\t0.2198952880\n+1.00\t1001\t0.1963350785\n+1.00\t1002\t0.2120418848\n+1.00\t1003\t0.2120418848\n+1.00\t1004\t0.2120418848\n+1.00\t1005\t0.2120418848\n+1.00\t1006\t0.2172774869\n+1.00\t1007\t0.2120418848\n+1.00\t1008\t0.2015706806\n+1.00\t1009\t0.1910994764\n+1.00\t1010\t0.2015706806\n+1.00\t1011\t0.2094240838\n+1.00\t1012\t0.2172774869\n+1.00\t1013\t0.2225130890\n+1.00\t1014\t0.2041884817\n+1.00\t1015\t0.2068062827\n+1.00\t1016\t0.2251308901\n+1.00\t1017\t0.2094240838\n+1.00\t1018\t0.2120418848\n+1.00\t1019\t0.2068062827\n+1.00\t1020\t0.2225130890\n+1.00\t1021\t0.2198952880\n+1.00\t1022\t0.2172774869\n+1.00\t1023\t0.2146596859\n' |
| b |
| diff -r cef64c36c89e -r 9016f67b716f test-data/test1-mating_vector_output --- a/test-data/test1-mating_vector_output Tue Mar 12 08:50:50 2024 +0000 +++ b/test-data/test1-mating_vector_output Thu Feb 13 19:37:59 2025 +0000 |
| b |
| @@ -5,22 +5,13 @@ 1 1 1 -2 -1 -1 -1 15 -5 2 2 1 2 1 2 -12 -1 -7 -4 1 15 1 @@ -38,13 +29,6 @@ 1 1 1 -1 -1 -7 -1 -1 -5 -1 5 1 2 @@ -56,17 +40,10 @@ 1 1 1 -1 -1 -2 3 1 1 1 -1 -1 -1 -1 6 1 1 @@ -82,21 +59,9 @@ 1 1 1 -1 -1 -1 -1 -1 4 1 1 -2 -2 -1 -1 -1 -1 -1 1 1 1 @@ -109,8 +74,6 @@ 1 1 1 -1 -1 9 1 2 @@ -125,7 +88,6 @@ 1 7 3 -6 1 2 1 @@ -135,7 +97,6 @@ 3 1 1 -1 6 2 1 @@ -147,18 +108,14 @@ 1 2 2 -1 8 1 14 -2 -1 -1 -2 1 1 1 -10 +1 +1 1 1 1 @@ -172,38 +129,29 @@ 1 1 1 -1 2 3 1 1 -11 1 1 1 5 2 -3 -5 2 1 1 1 1 -1 3 1 1 1 1 -1 2 1 1 1 -1 -1 -1 7 1 1 @@ -214,10 +162,6 @@ 1 1 1 -1 -1 -4 -1 3 1 1 @@ -228,12 +172,7 @@ 1 1 1 -1 -1 -1 2 -11 -1 3 1 1 @@ -258,24 +197,16 @@ 1 1 1 -2 -1 1 2 1 -3 4 1 1 -3 -4 1 1 2 20 -9 -1 -1 1 1 1 @@ -289,33 +220,24 @@ 1 1 1 -1 -1 -1 2 1 1 1 -1 16 -1 3 1 1 1 1 -5 1 1 11 1 1 -1 2 1 1 -2 -1 11 1 1 @@ -327,8 +249,6 @@ 1 1 1 -14 -1 1 1 1 @@ -344,12 +264,10 @@ 1 1 1 -1 2 1 1 1 -1 2 1 1 @@ -358,24 +276,16 @@ 1 1 1 -1 -1 -1 10 1 1 -1 2 1 -1 -1 2 7 1 1 7 -1 -1 6 1 10 @@ -389,8 +299,6 @@ 1 2 1 -2 -1 3 1 6 @@ -404,27 +312,18 @@ 1 1 1 -1 -1 -1 2 1 1 1 1 1 -1 3 -1 -1 2 1 3 1 -1 2 -2 -1 1 2 4 @@ -442,32 +341,21 @@ 1 1 1 -1 -1 3 1 1 4 1 1 -1 2 1 1 1 -2 -1 -1 7 1 2 1 1 -2 -1 -1 -1 -2 1 1 1 @@ -477,7 +365,6 @@ 1 1 16 -1 2 1 15 @@ -485,15 +372,11 @@ 1 1 1 -1 -16 2 1 1 -1 2 1 1 -1 +6 1 -6 |
| b |
| diff -r cef64c36c89e -r 9016f67b716f test-data/test1-summary --- a/test-data/test1-summary Tue Mar 12 08:50:50 2024 +0000 +++ b/test-data/test1-summary Thu Feb 13 19:37:59 2025 +0000 |
| b |
| @@ -1,26 +1,25 @@ # @impl: Nonpareil -# @ksize: 0 -# @version: 3.10 +# @version: 3.5.5 # @maxL: 100 -# @L: 88.673 -# @R: 499 +# @L: 88.496 +# @R: 500 # @overlap: 50.00 # @divide: 0.70 0 0.00000 0.00000 0.00000 0.00000 0.00000 2 0.00000 0.00000 0.00000 0.00000 0.00000 -2 0.00259 0.03858 0.00000 0.00000 0.00000 -3 0.00736 0.05285 0.00000 0.00000 0.00000 -5 0.01178 0.05475 0.00000 0.00000 0.00000 -7 0.01201 0.04692 0.00000 0.00000 0.00000 -10 0.02276 0.04935 0.00000 0.00000 0.00000 -14 0.03080 0.04952 0.00000 0.00000 0.06250 -20 0.03937 0.04308 0.00000 0.03846 0.06250 -29 0.05619 0.04283 0.02941 0.05000 0.08333 -41 0.06459 0.03882 0.04000 0.06061 0.08824 -59 0.08671 0.03486 0.06250 0.08621 0.10811 -84 0.10398 0.03206 0.08163 0.10227 0.12500 -120 0.12697 0.02740 0.10784 0.12500 0.14516 -171 0.15146 0.02419 0.13497 0.15000 0.16842 -245 0.17368 0.01952 0.16017 0.17391 0.18750 -349 0.19748 0.01450 0.18733 0.19714 0.20728 -499 0.21904 0.00795 0.21443 0.21844 0.22445 +2 0.00122 0.03219 0.00000 0.00000 0.00000 +3 0.00459 0.03920 0.00000 0.00000 0.00000 +5 0.00598 0.04771 0.00000 0.00000 0.00000 +7 0.00752 0.03872 0.00000 0.00000 0.00000 +10 0.01463 0.04474 0.00000 0.00000 0.00000 +14 0.02313 0.04766 0.00000 0.00000 0.00000 +20 0.03288 0.04683 0.00000 0.00000 0.06250 +29 0.04394 0.04327 0.00000 0.04167 0.06897 +41 0.05851 0.04234 0.03030 0.04000 0.08571 +59 0.07860 0.03881 0.05085 0.07500 0.10204 +84 0.09890 0.03579 0.07463 0.09589 0.12281 +120 0.12158 0.03260 0.09901 0.10204 0.14414 +171 0.14321 0.02677 0.12500 0.14085 0.16154 +245 0.16793 0.02202 0.15344 0.16667 0.18280 +350 0.19139 0.01667 0.18045 0.19118 0.20229 +500 0.21282 0.00901 0.20681 0.21204 0.21990 |
| b |
| diff -r cef64c36c89e -r 9016f67b716f test-data/test2-all_data_output --- a/test-data/test2-all_data_output Tue Mar 12 08:50:50 2024 +0000 +++ b/test-data/test2-all_data_output Thu Feb 13 19:37:59 2025 +0000 |
| b |
| b'@@ -2808,7 +2808,7 @@\n 0.00\t759\t0.0000000000\n 0.00\t760\t0.0000000000\n 0.00\t761\t0.0000000000\n-0.00\t762\t1.0000000000\n+0.00\t762\t0.0000000000\n 0.00\t763\t0.0000000000\n 0.00\t764\t0.0000000000\n 0.00\t765\t0.0000000000\n@@ -4656,7 +4656,7 @@\n 0.01\t559\t0.0000000000\n 0.01\t560\t0.0000000000\n 0.01\t561\t0.0000000000\n-0.01\t562\t0.0000000000\n+0.01\t562\t1.0000000000\n 0.01\t563\t0.0000000000\n 0.01\t564\t0.0000000000\n 0.01\t565\t0.0000000000\n@@ -4925,7 +4925,7 @@\n 0.01\t828\t0.0000000000\n 0.01\t829\t0.0000000000\n 0.01\t830\t0.0000000000\n-0.01\t831\t1.0000000000\n+0.01\t831\t0.0000000000\n 0.01\t832\t0.0000000000\n 0.01\t833\t0.0000000000\n 0.01\t834\t0.0000000000\n@@ -5226,7 +5226,7 @@\n 0.01\t105\t0.0000000000\n 0.01\t106\t0.0000000000\n 0.01\t107\t0.0000000000\n-0.01\t108\t0.0000000000\n+0.01\t108\t1.0000000000\n 0.01\t109\t0.0000000000\n 0.01\t110\t0.0000000000\n 0.01\t111\t0.0000000000\n@@ -5308,7 +5308,7 @@\n 0.01\t187\t0.0000000000\n 0.01\t188\t0.0000000000\n 0.01\t189\t0.0000000000\n-0.01\t190\t0.0000000000\n+0.01\t190\t1.0000000000\n 0.01\t191\t0.0000000000\n 0.01\t192\t0.0000000000\n 0.01\t193\t0.0000000000\n@@ -5655,7 +5655,7 @@\n 0.01\t534\t0.0000000000\n 0.01\t535\t0.0000000000\n 0.01\t536\t0.0000000000\n-0.01\t537\t0.0000000000\n+0.01\t537\t1.0000000000\n 0.01\t538\t0.0000000000\n 0.01\t539\t0.0000000000\n 0.01\t540\t0.0000000000\n@@ -6383,8 +6383,8 @@\n 0.02\t238\t0.0000000000\n 0.02\t239\t0.0000000000\n 0.02\t240\t0.0000000000\n-0.02\t241\t1.0000000000\n-0.02\t242\t1.0000000000\n+0.02\t241\t0.0000000000\n+0.02\t242\t0.0000000000\n 0.02\t243\t0.0000000000\n 0.02\t244\t0.0000000000\n 0.02\t245\t0.0000000000\n@@ -6676,7 +6676,7 @@\n 0.02\t531\t0.0000000000\n 0.02\t532\t0.0000000000\n 0.02\t533\t0.0000000000\n-0.02\t534\t1.0000000000\n+0.02\t534\t0.0000000000\n 0.02\t535\t0.0000000000\n 0.02\t536\t0.0000000000\n 0.02\t537\t0.0000000000\n@@ -7166,7 +7166,7 @@\n 0.02\t1021\t0.0000000000\n 0.02\t1022\t0.0000000000\n 0.02\t1023\t0.0000000000\n-0.03\t0\t1.0000000000\n+0.03\t0\t0.0000000000\n 0.03\t1\t0.0000000000\n 0.03\t2\t0.0000000000\n 0.03\t3\t0.0000000000\n@@ -7285,8 +7285,8 @@\n 0.03\t116\t0.0000000000\n 0.03\t117\t0.0000000000\n 0.03\t118\t0.0000000000\n-0.03\t119\t0.0000000000\n-0.03\t120\t0.0000000000\n+0.03\t119\t1.0000000000\n+0.03\t120\t0.5000000000\n 0.03\t121\t0.0000000000\n 0.03\t122\t0.0000000000\n 0.03\t123\t0.0000000000\n@@ -7415,7 +7415,7 @@\n 0.03\t246\t0.0000000000\n 0.03\t247\t0.0000000000\n 0.03\t248\t0.0000000000\n-0.03\t249\t0.3333333333\n+0.03\t249\t0.0000000000\n 0.03\t250\t0.0000000000\n 0.03\t251\t0.0000000000\n 0.03\t252\t0.0000000000\n@@ -7541,7 +7541,7 @@\n 0.03\t372\t0.0000000000\n 0.03\t373\t0.0000000000\n 0.03\t374\t0.0000000000\n-0.03\t375\t0.0000000000\n+0.03\t375\t1.0000000000\n 0.03\t376\t0.0000000000\n 0.03\t377\t0.0000000000\n 0.03\t378\t0.0000000000\n@@ -7570,7 +7570,7 @@\n 0.03\t401\t0.0000000000\n 0.03\t402\t0.0000000000\n 0.03\t403\t0.0000000000\n-0.03\t404\t1.0000000000\n+0.03\t404\t0.0000000000\n 0.03\t405\t0.0000000000\n 0.03\t406\t0.0000000000\n 0.03\t407\t0.0000000000\n@@ -7858,7 +7858,7 @@\n 0.03\t689\t0.0000000000\n 0.03\t690\t0.0000000000\n 0.03\t691\t0.0000000000\n-0.03\t692\t1.0000000000\n+0.03\t692\t0.0000000000\n 0.03\t693\t0.0000000000\n 0.03\t694\t0.0000000000\n 0.03\t695\t0.0000000000\n@@ -7935,7 +7935,7 @@\n 0.03\t766\t0.0000000000\n 0.03\t767\t0.0000000000\n 0.03\t768\t0.0000000000\n-0.03\t769\t0.0000000000\n+0.03\t769\t0.5000000000\n 0.03\t770\t0.0000000000\n 0.03\t771\t0.0000000000\n 0.03\t772\t0.0000000000\n@@ -7955,7 +7955,7 @@\n 0.03\t786\t0.0000000000\n 0.03\t787\t0.0000000000\n 0.03\t788\t0.0000000000\n-0.03\t789\t0.0000000000\n+0.03\t789\t0.5000000000\n 0.03\t790\t0.0000000000\n 0.03\t791\t0.0000000000\n 0.03\t792\t0.0000000000\n@@ -7985,7 +7985,7 @@\n 0.03\t816\t0.0000000000\n 0.03\t817\t0.0000000000\n 0.03\t818\t0.0000000000\n-0.03\t819\t0.0000000000\n+0.03\t819\t0.5000000000\n 0.03\t820\t0.0000000000\n 0.03\t821\t0.0000000000\n 0.03\t822\t0.0000000000\n@@ -8070,7 +8070,7 @@\n 0.03\t901\t0.0000000000\n 0.03\t902\t0.0000000000\n 0.03\t903\t0.0000000000\n-0.03\t904\t0.0000000000\n+0.03\t904\t0.5000000000\n 0.03\t905\t0.0000000000\n 0.03\t906\t0.0000000000\n 0.03\t907\t0.0000000000\n@@ -8170,7 +8170,7 @@\n 0.03\t1001\t0.0000000000\n 0.03\t1002\t0.0000000000\n 0.03\t1003\t0.0000000000\n-0.03\t1004\t0.0000000000\n+0.03\t1004\t1.0000000000\n 0.03\t1005\t0.0000000000\n 0.03\t1006\t0.0000000000\n 0.03\t1007\t0.000'..b'00\n 1.00\t917\t0.2000000000\n 1.00\t918\t0.2000000000\n-1.00\t919\t0.3000000000\n+1.00\t919\t0.2000000000\n 1.00\t920\t0.2000000000\n-1.00\t921\t0.3000000000\n-1.00\t922\t0.3000000000\n-1.00\t923\t0.3000000000\n-1.00\t924\t0.3000000000\n-1.00\t925\t0.3000000000\n-1.00\t926\t0.3000000000\n+1.00\t921\t0.2000000000\n+1.00\t922\t0.2000000000\n+1.00\t923\t0.2000000000\n+1.00\t924\t0.2000000000\n+1.00\t925\t0.1000000000\n+1.00\t926\t0.2000000000\n 1.00\t927\t0.2000000000\n 1.00\t928\t0.2000000000\n 1.00\t929\t0.2000000000\n-1.00\t930\t0.3000000000\n-1.00\t931\t0.3000000000\n-1.00\t932\t0.3000000000\n-1.00\t933\t0.2000000000\n+1.00\t930\t0.2000000000\n+1.00\t931\t0.2000000000\n+1.00\t932\t0.2000000000\n+1.00\t933\t0.1000000000\n 1.00\t934\t0.2000000000\n 1.00\t935\t0.2000000000\n 1.00\t936\t0.2000000000\n 1.00\t937\t0.2000000000\n-1.00\t938\t0.3000000000\n+1.00\t938\t0.2000000000\n 1.00\t939\t0.2000000000\n 1.00\t940\t0.2000000000\n-1.00\t941\t0.3000000000\n-1.00\t942\t0.1000000000\n-1.00\t943\t0.3000000000\n-1.00\t944\t0.3000000000\n-1.00\t945\t0.3000000000\n-1.00\t946\t0.3000000000\n-1.00\t947\t0.3000000000\n-1.00\t948\t0.3000000000\n+1.00\t941\t0.2000000000\n+1.00\t942\t0.2000000000\n+1.00\t943\t0.1000000000\n+1.00\t944\t0.2000000000\n+1.00\t945\t0.2000000000\n+1.00\t946\t0.2000000000\n+1.00\t947\t0.2000000000\n+1.00\t948\t0.2000000000\n 1.00\t949\t0.2000000000\n-1.00\t950\t0.3000000000\n+1.00\t950\t0.2000000000\n 1.00\t951\t0.2000000000\n-1.00\t952\t0.3000000000\n+1.00\t952\t0.2000000000\n 1.00\t953\t0.2000000000\n-1.00\t954\t0.3000000000\n-1.00\t955\t0.3000000000\n-1.00\t956\t0.3000000000\n+1.00\t954\t0.2000000000\n+1.00\t955\t0.2000000000\n+1.00\t956\t0.2000000000\n 1.00\t957\t0.2000000000\n-1.00\t958\t0.3000000000\n-1.00\t959\t0.3000000000\n-1.00\t960\t0.3000000000\n-1.00\t961\t0.3000000000\n-1.00\t962\t0.3000000000\n+1.00\t958\t0.2000000000\n+1.00\t959\t0.2000000000\n+1.00\t960\t0.2000000000\n+1.00\t961\t0.2000000000\n+1.00\t962\t0.2000000000\n 1.00\t963\t0.2000000000\n-1.00\t964\t0.3000000000\n-1.00\t965\t0.3000000000\n-1.00\t966\t0.3000000000\n-1.00\t967\t0.3000000000\n-1.00\t968\t0.3000000000\n+1.00\t964\t0.2000000000\n+1.00\t965\t0.2000000000\n+1.00\t966\t0.2000000000\n+1.00\t967\t0.2000000000\n+1.00\t968\t0.2000000000\n 1.00\t969\t0.2000000000\n 1.00\t970\t0.2000000000\n 1.00\t971\t0.2000000000\n-1.00\t972\t0.3000000000\n-1.00\t973\t0.3000000000\n-1.00\t974\t0.3000000000\n+1.00\t972\t0.2000000000\n+1.00\t973\t0.2000000000\n+1.00\t974\t0.2000000000\n 1.00\t975\t0.2000000000\n-1.00\t976\t0.3000000000\n-1.00\t977\t0.2000000000\n+1.00\t976\t0.2000000000\n+1.00\t977\t0.0000000000\n 1.00\t978\t0.1000000000\n 1.00\t979\t0.2000000000\n 1.00\t980\t0.2000000000\n-1.00\t981\t0.3000000000\n+1.00\t981\t0.2000000000\n 1.00\t982\t0.2000000000\n-1.00\t983\t0.2000000000\n-1.00\t984\t0.3000000000\n+1.00\t983\t0.1000000000\n+1.00\t984\t0.2000000000\n 1.00\t985\t0.2000000000\n-1.00\t986\t0.3000000000\n-1.00\t987\t0.3000000000\n+1.00\t986\t0.2000000000\n+1.00\t987\t0.2000000000\n 1.00\t988\t0.2000000000\n-1.00\t989\t0.3000000000\n+1.00\t989\t0.2000000000\n 1.00\t990\t0.2000000000\n-1.00\t991\t0.3000000000\n-1.00\t992\t0.3000000000\n+1.00\t991\t0.2000000000\n+1.00\t992\t0.2000000000\n 1.00\t993\t0.2000000000\n 1.00\t994\t0.2000000000\n-1.00\t995\t0.3000000000\n+1.00\t995\t0.2000000000\n 1.00\t996\t0.2000000000\n 1.00\t997\t0.2000000000\n 1.00\t998\t0.2000000000\n 1.00\t999\t0.2000000000\n 1.00\t1000\t0.2000000000\n-1.00\t1001\t0.3000000000\n-1.00\t1002\t0.3000000000\n-1.00\t1003\t0.3000000000\n+1.00\t1001\t0.2000000000\n+1.00\t1002\t0.2000000000\n+1.00\t1003\t0.2000000000\n 1.00\t1004\t0.2000000000\n-1.00\t1005\t0.3000000000\n+1.00\t1005\t0.2000000000\n 1.00\t1006\t0.2000000000\n-1.00\t1007\t0.3000000000\n-1.00\t1008\t0.3000000000\n-1.00\t1009\t0.3000000000\n-1.00\t1010\t0.2000000000\n+1.00\t1007\t0.2000000000\n+1.00\t1008\t0.1000000000\n+1.00\t1009\t0.1000000000\n+1.00\t1010\t0.1000000000\n 1.00\t1011\t0.2000000000\n 1.00\t1012\t0.2000000000\n-1.00\t1013\t0.3000000000\n-1.00\t1014\t0.3000000000\n-1.00\t1015\t0.3000000000\n-1.00\t1016\t0.3000000000\n-1.00\t1017\t0.3000000000\n-1.00\t1018\t0.1000000000\n-1.00\t1019\t0.3000000000\n-1.00\t1020\t0.3000000000\n+1.00\t1013\t0.2000000000\n+1.00\t1014\t0.2000000000\n+1.00\t1015\t0.2000000000\n+1.00\t1016\t0.2000000000\n+1.00\t1017\t0.2000000000\n+1.00\t1018\t0.2000000000\n+1.00\t1019\t0.2000000000\n+1.00\t1020\t0.2000000000\n 1.00\t1021\t0.2000000000\n 1.00\t1022\t0.2000000000\n 1.00\t1023\t0.2000000000\n' |
| b |
| diff -r cef64c36c89e -r 9016f67b716f test-data/test2-mating_vector_output --- a/test-data/test2-mating_vector_output Tue Mar 12 08:50:50 2024 +0000 +++ b/test-data/test2-mating_vector_output Thu Feb 13 19:37:59 2025 +0000 |
| b |
| @@ -1,10 +1,10 @@ -1 -6 -1 -3 1 1 1 -2 +4 +1 1 1 +1 +1 +4 |
| b |
| diff -r cef64c36c89e -r 9016f67b716f test-data/test2-summary --- a/test-data/test2-summary Tue Mar 12 08:50:50 2024 +0000 +++ b/test-data/test2-summary Thu Feb 13 19:37:59 2025 +0000 |
| b |
| @@ -1,6 +1,6 @@ # @impl: Nonpareil # @ksize: 24 -# @version: 3.10 +# @version: 3.5.5 # @L: 88.496 # @AL: 65.496 # @R: 500 @@ -8,19 +8,19 @@ # @divide: 0.70 0 0.00000 0.00000 0.00000 0.00000 0.00000 2 0.00000 0.00000 0.00000 0.00000 0.00000 -2 0.00098 0.03123 0.00000 0.00000 0.00000 +2 0.00000 0.00000 0.00000 0.00000 0.00000 3 0.00000 0.00000 0.00000 0.00000 0.00000 5 0.00098 0.03123 0.00000 0.00000 0.00000 -7 0.00000 0.00000 0.00000 0.00000 0.00000 -10 0.00293 0.05405 0.00000 0.00000 0.00000 -14 0.00326 0.05502 0.00000 0.00000 0.00000 -20 0.00814 0.08583 0.00000 0.00000 0.00000 -29 0.01904 0.12775 0.00000 0.00000 0.00000 -41 0.03703 0.17284 0.00000 0.00000 0.00000 -59 0.06278 0.21468 0.00000 0.00000 0.00000 -84 0.10171 0.23847 0.00000 0.00000 0.00000 -120 0.12311 0.21945 0.00000 0.00000 0.25000 -171 0.16075 0.20701 0.00000 0.00000 0.25000 -245 0.18669 0.16089 0.00000 0.20000 0.28571 -350 0.22105 0.12209 0.14286 0.22222 0.28571 -500 0.24902 0.06186 0.20000 0.30000 0.30000 +7 0.00293 0.05405 0.00000 0.00000 0.00000 +10 0.00000 0.00000 0.00000 0.00000 0.00000 +14 0.00537 0.06420 0.00000 0.00000 0.00000 +20 0.00293 0.04932 0.00000 0.00000 0.00000 +29 0.01383 0.10667 0.00000 0.00000 0.00000 +41 0.02767 0.14766 0.00000 0.00000 0.00000 +59 0.03882 0.16931 0.00000 0.00000 0.00000 +84 0.06071 0.18962 0.00000 0.00000 0.00000 +120 0.09154 0.20146 0.00000 0.00000 0.00000 +171 0.13727 0.19534 0.00000 0.00000 0.25000 +245 0.15678 0.15529 0.00000 0.00000 0.25000 +350 0.18104 0.10463 0.12500 0.16667 0.25000 +500 0.19092 0.02941 0.20000 0.20000 0.20000 |