Previous changeset 7:0d88631bb7de (2019-05-07) Next changeset 9:97899048dfa1 (2019-09-10) |
Commit message:
"planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/chemicaltoolbox/chemfp commit e78367b77f2294891914151f642685644d43a5b7" |
modified:
nxn_clustering.py nxn_clustering.xml |
removed:
test-data/NxN_Clustering_on_q.svg |
b |
diff -r 0d88631bb7de -r 198b1e30c739 nxn_clustering.py --- a/nxn_clustering.py Tue May 07 13:32:50 2019 -0400 +++ b/nxn_clustering.py Tue Sep 10 08:16:29 2019 -0400 |
b |
@@ -6,6 +6,8 @@ """ import matplotlib matplotlib.use('Agg') +from matplotlib import rcParams +rcParams.update({'figure.autolayout': True}) import argparse import os import chemfp |
b |
diff -r 0d88631bb7de -r 198b1e30c739 nxn_clustering.xml --- a/nxn_clustering.xml Tue May 07 13:32:50 2019 -0400 +++ b/nxn_clustering.xml Tue Sep 10 08:16:29 2019 -0400 |
b |
@@ -50,8 +50,7 @@ <param name="infile" ftype="fps" value="targets.fps" /> <param name='threshold' value='0.75' /> <param name='oformat' value='svg' /> - <param name='output_files' value='both' /> - <output name="image" file='NxN_Clustering_on_q.svg' ftype="svg"/> + <param name='output_files' value='matrix' /> <output name="similarity_matrix" file='NxN_Clustering_on_q.txt' ftype="txt"/> </test> </tests> |
b |
diff -r 0d88631bb7de -r 198b1e30c739 test-data/NxN_Clustering_on_q.svg --- a/test-data/NxN_Clustering_on_q.svg Tue May 07 13:32:50 2019 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
b |
b'@@ -1,707 +0,0 @@\n-<?xml version="1.0" encoding="utf-8" standalone="no"?>\n-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"\n- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n-<!-- Created with matplotlib (http://matplotlib.org/) -->\n-<svg height="345.6pt" version="1.1" viewBox="0 0 460.8 345.6" width="460.8pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">\n- <defs>\n- <style type="text/css">\n-*{stroke-linecap:butt;stroke-linejoin:round;}\n- </style>\n- </defs>\n- <g id="figure_1">\n- <g id="patch_1">\n- <path d="M 0 345.6 \n-L 460.8 345.6 \n-L 460.8 0 \n-L 0 0 \n-z\n-" style="fill:#ffffff;"/>\n- </g>\n- <g id="axes_1">\n- <g id="patch_2">\n- <path d="M 57.6 307.584 \n-L 414.72 307.584 \n-L 414.72 41.472 \n-L 57.6 41.472 \n-z\n-" style="fill:#ffffff;"/>\n- </g>\n- <g id="matplotlib.axis_1">\n- <g id="xtick_1">\n- <g id="text_1">\n- <!-- 55079807 -->\n- <defs>\n- <path d="M 10.796875 72.90625 \n-L 49.515625 72.90625 \n-L 49.515625 64.59375 \n-L 19.828125 64.59375 \n-L 19.828125 46.734375 \n-Q 21.96875 47.46875 24.109375 47.828125 \n-Q 26.265625 48.1875 28.421875 48.1875 \n-Q 40.625 48.1875 47.75 41.5 \n-Q 54.890625 34.8125 54.890625 23.390625 \n-Q 54.890625 11.625 47.5625 5.09375 \n-Q 40.234375 -1.421875 26.90625 -1.421875 \n-Q 22.3125 -1.421875 17.546875 -0.640625 \n-Q 12.796875 0.140625 7.71875 1.703125 \n-L 7.71875 11.625 \n-Q 12.109375 9.234375 16.796875 8.0625 \n-Q 21.484375 6.890625 26.703125 6.890625 \n-Q 35.15625 6.890625 40.078125 11.328125 \n-Q 45.015625 15.765625 45.015625 23.390625 \n-Q 45.015625 31 40.078125 35.4375 \n-Q 35.15625 39.890625 26.703125 39.890625 \n-Q 22.75 39.890625 18.8125 39.015625 \n-Q 14.890625 38.140625 10.796875 36.28125 \n-z\n-" id="DejaVuSans-35"/>\n- <path d="M 31.78125 66.40625 \n-Q 24.171875 66.40625 20.328125 58.90625 \n-Q 16.5 51.421875 16.5 36.375 \n-Q 16.5 21.390625 20.328125 13.890625 \n-Q 24.171875 6.390625 31.78125 6.390625 \n-Q 39.453125 6.390625 43.28125 13.890625 \n-Q 47.125 21.390625 47.125 36.375 \n-Q 47.125 51.421875 43.28125 58.90625 \n-Q 39.453125 66.40625 31.78125 66.40625 \n-z\n-M 31.78125 74.21875 \n-Q 44.046875 74.21875 50.515625 64.515625 \n-Q 56.984375 54.828125 56.984375 36.375 \n-Q 56.984375 17.96875 50.515625 8.265625 \n-Q 44.046875 -1.421875 31.78125 -1.421875 \n-Q 19.53125 -1.421875 13.0625 8.265625 \n-Q 6.59375 17.96875 6.59375 36.375 \n-Q 6.59375 54.828125 13.0625 64.515625 \n-Q 19.53125 74.21875 31.78125 74.21875 \n-z\n-" id="DejaVuSans-30"/>\n- <path d="M 8.203125 72.90625 \n-L 55.078125 72.90625 \n-L 55.078125 68.703125 \n-L 28.609375 0 \n-L 18.3125 0 \n-L 43.21875 64.59375 \n-L 8.203125 64.59375 \n-z\n-" id="DejaVuSans-37"/>\n- <path d="M 10.984375 1.515625 \n-L 10.984375 10.5 \n-Q 14.703125 8.734375 18.5 7.8125 \n-Q 22.3125 6.890625 25.984375 6.890625 \n-Q 35.75 6.890625 40.890625 13.453125 \n-Q 46.046875 20.015625 46.78125 33.40625 \n-Q 43.953125 29.203125 39.59375 26.953125 \n-Q 35.25 24.703125 29.984375 24.703125 \n-Q 19.046875 24.703125 12.671875 31.3125 \n-Q 6.296875 37.9375 6.296875 49.421875 \n-Q 6.296875 60.640625 12.9375 67.421875 \n-Q 19.578125 74.21875 30.609375 74.21875 \n-Q 43.265625 74.21875 49.921875 64.515625 \n-Q 56.59375 54.828125 56.59375 36.375 \n-Q 56.59375 19.140625 48.40625 8.859375 \n-Q 40.234375 -1.421875 26.421875 -1.421875 \n-Q 22.703125 -1.421875 18.890625 -0.6875 \n-Q 15.09375 0.046875 10.984375 1.515625 \n-z\n-M 30.609375 32.421875 \n-Q 37.25 32.421875 41.125 36.953125 \n-Q 45.015625 41.5 45.015625 49.421875 \n-Q 45.015625 57.28125 41.125 61.84375 \n-Q 37.25 66.40625 30.609375 66.40625 \n-Q 23.96875 66.40625 20.09375 61.84375 \n-Q 16.21875 57.28125 16.21875 49.421875 \n-Q 16.21875 41.5 20.09375 36.953125 \n-Q 23.96875 32.421875 30.609375 32.421875 \n-z\n-" id="DejaVuSans-39"/>\n- <path d="M 31.78125 34.625 \n-Q 24.75 34.625 20.71875 30.859375 \n-Q 16.703125 27.09375 16.703125 20.515625 \n-Q 16.703125 13.921875 20.71875 10.15625 \n-Q 24.75 6.390625 31.78125 6.390625 \n-Q 38.8125 6.390625 42.859375 10.171875 \n-Q 46.921875 13.96875 46.921875 20.5156'..b'59.033203" xlink:href="#DejaVuSans-36"/>\n- </g>\n- </g>\n- </g>\n- <g id="ytick_8">\n- <g id="line2d_8">\n- <g>\n- <use style="stroke:#000000;stroke-width:0.8;" x="57.6" xlink:href="#mccd7e1f0e4" y="53.313113"/>\n- </g>\n- </g>\n- <g id="text_21">\n- <!-- 0.07 -->\n- <g transform="translate(28.334375 57.112332)scale(0.1 -0.1)">\n- <use xlink:href="#DejaVuSans-30"/>\n- <use x="63.623047" xlink:href="#DejaVuSans-2e"/>\n- <use x="95.410156" xlink:href="#DejaVuSans-30"/>\n- <use x="159.033203" xlink:href="#DejaVuSans-37"/>\n- </g>\n- </g>\n- </g>\n- </g>\n- <g id="LineCollection_1">\n- <path clip-path="url(#p31abe51ef7)" d="M 98.806154 307.584 \n-L 98.806154 160.244138 \n-L 126.276923 160.244138 \n-L 126.276923 307.584 \n-" style="fill:none;stroke:#008000;stroke-width:1.5;"/>\n- </g>\n- <g id="LineCollection_2">\n- <path clip-path="url(#p31abe51ef7)" d="M 208.689231 307.584 \n-L 208.689231 307.584 \n-L 236.16 307.584 \n-L 236.16 307.584 \n-" style="fill:none;stroke:#ff0000;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 181.218462 307.584 \n-L 181.218462 307.584 \n-L 222.424615 307.584 \n-L 222.424615 307.584 \n-" style="fill:none;stroke:#ff0000;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 263.630769 307.584 \n-L 263.630769 224.047744 \n-L 291.101538 224.047744 \n-L 291.101538 307.584 \n-" style="fill:none;stroke:#ff0000;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 201.821538 307.584 \n-L 201.821538 202.211048 \n-L 277.366154 202.211048 \n-L 277.366154 224.047744 \n-" style="fill:none;stroke:#ff0000;stroke-width:1.5;"/>\n- </g>\n- <g id="LineCollection_3">\n- <path clip-path="url(#p31abe51ef7)" d="M 318.572308 307.584 \n-L 318.572308 227.498079 \n-L 346.043077 227.498079 \n-L 346.043077 307.584 \n-" style="fill:none;stroke:#00bfbf;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 373.513846 307.584 \n-L 373.513846 225.958341 \n-L 400.984615 225.958341 \n-L 400.984615 307.584 \n-" style="fill:none;stroke:#00bfbf;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 332.307692 227.498079 \n-L 332.307692 178.92987 \n-L 387.249231 178.92987 \n-L 387.249231 225.958341 \n-" style="fill:none;stroke:#00bfbf;stroke-width:1.5;"/>\n- </g>\n- <g id="LineCollection_4">\n- <path clip-path="url(#p31abe51ef7)" d="M 239.593846 202.211048 \n-L 239.593846 126.040908 \n-L 359.778462 126.040908 \n-L 359.778462 178.92987 \n-" style="fill:none;stroke:#0000ff;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 153.747692 307.584 \n-L 153.747692 98.265487 \n-L 299.686154 98.265487 \n-L 299.686154 126.040908 \n-" style="fill:none;stroke:#0000ff;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 112.541538 160.244138 \n-L 112.541538 92.745033 \n-L 226.716923 92.745033 \n-L 226.716923 98.265487 \n-" style="fill:none;stroke:#0000ff;stroke-width:1.5;"/>\n- <path clip-path="url(#p31abe51ef7)" d="M 71.335385 307.584 \n-L 71.335385 54.144 \n-L 169.629231 54.144 \n-L 169.629231 92.745033 \n-" style="fill:none;stroke:#0000ff;stroke-width:1.5;"/>\n- </g>\n- <g id="patch_3">\n- <path d="M 57.6 307.584 \n-L 57.6 41.472 \n-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>\n- </g>\n- <g id="patch_4">\n- <path d="M 414.72 307.584 \n-L 414.72 41.472 \n-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>\n- </g>\n- <g id="patch_5">\n- <path d="M 57.6 307.584 \n-L 414.72 307.584 \n-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>\n- </g>\n- <g id="patch_6">\n- <path d="M 57.6 41.472 \n-L 414.72 41.472 \n-" style="fill:none;stroke:#000000;stroke-linecap:square;stroke-linejoin:miter;stroke-width:0.8;"/>\n- </g>\n- </g>\n- </g>\n- <defs>\n- <clipPath id="p31abe51ef7">\n- <rect height="266.112" width="357.12" x="57.6" y="41.472"/>\n- </clipPath>\n- </defs>\n-</svg>\n' |