| Previous changeset 12:85c6121d92a5 (2014-12-16) Next changeset 14:21734680d921 (2015-02-27) |
|
Commit message:
Deleted selected files |
|
removed:
tools/spades_3_1_1/CHANGE tools/spades_3_1_1/test-data/ecoli_1K_1.fq tools/spades_3_1_1/test-data/ecoli_1K_2.fq tools/spades_3_1_1/test-data/reference_1K.fa tools/spades_3_1_1/tools/spades_3_5_0/filter_spades_output.pl tools/spades_3_1_1/tools/spades_3_5_0/filter_spades_output.xml tools/spades_3_1_1/tools/spades_3_5_0/plot_spades_stats.xml tools/spades_3_1_1/tools/spades_3_5_0/r_wrapper.sh tools/spades_3_1_1/tools/spades_3_5_0/spades.pl tools/spades_3_1_1/tools/spades_3_5_0/spades.xml tools/spades_3_1_1/tools/spades_3_5_0/tool_dependencies.xml |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/CHANGE --- a/tools/spades_3_1_1/CHANGE Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,36 +0,0 @@ -1.0 -=== -- Supports SPAdes 3.5.0 -- New MismatchCorrector module. -- Support for Oxford Nanopore long reads. -- Support for Lucigen NxMate mate-pair libraries. -- Possibility to specify coverage cutoff: automatic and manual. -- CHANGE: Better running time. -- CHANGE: Improved RAM consumption. -- CHANGE: High-quality mate-pairs are now assumed to have forward-revers orientation (same as paired-end). - -FIX: Fixed FASTG format. -0.9 -=== -- Supports SPAdes 3.1.1 -- Supports Mate-pair only assembly with high-quality libraries -- Added support for List Paired Collection for files in a library. -- Renaming of contig names in scaffolds and contig files if List Paired Collection given - -0.7 -=== -(thanks to Nicola Soranzo for fixing these bugs) -- spades.pl doesn't die when NODE number is 0 -- removed the --rectangles option (will be deprecated in SPAdes 2.6), because it uses a different seqid format -- switched the --threads parameter to $GALAXY_SLOTS -- a few minor improvements - -0.6 -=== -- Supports SPAdes 2.5.1 -- Disables gzipped output for corrected reads -- Removes the hack that was necessary to accept .dat files (thanks to SPAdes - new input format -- Adds licensing information - -(started at version 0.6) |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/test-data/ecoli_1K_1.fq --- a/tools/spades_3_1_1/test-data/ecoli_1K_1.fq Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| b'@@ -1,8216 +0,0 @@\n-@EAS20_8_6_1_9_1972/1 trim=6\n-ACCACCATTACCACCACCATCACCATTACCACAGGTAACGGTGCGGGCTGACGCGTACAGGAAACACAGAAAAAAGCCCGCACCTGACAGTGCG\n-+\n-HHHHHHGHHHHFHHGGHHFHHHHHFHHFHFHHHHHFHHHHHFHHHHHHHHFHHFHFDHHGG@BGGHCDHE:;3)7.A973A:AA5>AD9G=D<D\n-@EAS20_8_6_1_163_1521/1\n-GCAGAAAACGTTCTGCATTTGCCACTGATGTACCGCCGAACTTCAACACTCGCATGGTTGTTACCTCGTTACCTTTGGTCGAAAAAAAAAGCCCGCACTG\n-+\n-HGHHIHHHDHHHHHIHHIHHHHHHHHHBHHHHHFHCFHHHHHHHGHHHHHEHHFHHHGHHIHHHGHGHHHIHFHHHHHGH?5<<;BD>6>?BGEHHGHFG\n-@EAS20_8_6_1_178_1948/1\n-ATTCGAGGTAATGCCCCACTGCCAGCAGTTTTTCGACCGGATCGATAACAGTAACGTTGTGACCGCGCGCTTCTAATACGCCGGCCATAATGGCGATCGA\n-+\n-GHHHHHHHHHGGHHHHHHGHHHHHHHEHHHHHHHHHHHHHFHHHEHHHHHHHFHFHIHHIHHHIHHHGHIIGGHBGGGHHFFGBHIFFGCIGGEFDG@AG\n-@EAS20_8_6_1_318_1522/1 trim=5\n-AAACGCATTAGCACCACCATTACCACCACCATCACCATTACCACAGGTAACGGTGCGGGCTGACGCGTACAGGAAACACAGAAAAAAGCCCGCAC\n-+\n-HHHHHHHHHHIHHHHHHHHHHHHHHHHHGEHHHHHEHHHHHHIHHHHGHHEHHGHBHDDEHHEGH?HEGGGIHDIGFFFEHE;EE;=AFE;AB/B\n-@EAS20_8_6_1_348_1372/1\n-AAATGCAGAACGTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGGCAGGGGCAGGTGGCCACCGTCCTCTCTGCCCCCGCCAAAATCACCAAC\n-+\n-HHHHHHHHHHHHHHHHHHHEHHGHHIHHHDHHHHHHHHHHFHHHGHHFHHH@HHHFHHHEHH<HH?@D>DHDEBEEGDFDCHECGB:?43CCCFG?90<6\n-@EAS20_8_6_1_389_646/1 trim=2\n-ACAGAGTACACAACATCCATGAAACGCATTAGCACCACCATTACCACCACCATCACCATTACCACAGGTAACGGTGCGGGCTGACGCGTACAGGAAAC\n-+\n-HBHGGHHIGHHHGDHHGHHDHHHGDHFGGHHHHHHHHHHHHIHHGFGHHHHHGHGGHGGDHHEFHDDHGGGHHH=HDDB9FHGGEIEHICEB?DBBAE\n-@EAS20_8_6_1_513_951/1\n-TTTTGACGGGACTCGCCGCCGCCCAGCCGGGGTTCCCGCTGGCGCAATTGAAAACTTTCGTCGATCAGGAATTTGCCCAAATAAAACATGTCCTGCATGG\n-+\n-HHHHHDHHHHHHIHGHGIEEDFHBDDHGGGBC?C?IHD>GFHGHG?DDGEB?;?,DCF=D??F=BDBGE=DDGDG.>76?>EB>54+?;=5;BEBDAGGA\n-@EAS20_8_6_1_530_1080/1 trim=1\n-AAAATTACAGAGTACACAACATCCATGAAACGCATTAGCACCACCATTACCACCACCATCACCATTACCACAGGTAACGGTGCGGGCTGACGCGTACAG\n-+\n-EHHHHHHGHHFEHHHHHGHHHHHHGHH=BHHHEHHHHHHHEHFEEHHFDHHHHHHFGHHHHFHFHHEHFHFEHEEHB>EG=F?E=>FHE@CH5HB:81@\n-@EAS20_8_6_1_546_406/1\n-AAATAAAACATGTCCTGCATGGCATTAGTTTGTTGGGGCAGTGCCCGGATAGCATCAACGCTGCGCTGATTTGCCGTGGCGAGAAAATGTCGATCGCCAT\n-+\n-HHHHHHGGGHHHHHHHHHHHHHIHHHHHHHHHHHHIFHHHHHHHHHHHIFHHHHHHHHHHHHHGHHHHFHHHHFHHHHEHHDH@8GFHHGHEFBHHGG5G\n-@EAS20_8_6_1_553_1132/1 correct\n-CGTTGATGCTATCCGGGCACTGCCCCAACAAACTAATGCCATGCAGGACATGTTTTATTTGGGCAAATTCCTGATCGACGAAAGTTTTCAATTGCGCCAG\n-+\n-HHHHHIHHHHHHGHHHHHHHHHDHHHHHHHHHHHIGHH@HHHHHGHHFHDHHHHHHHHGGGHH=HDHHHFHHHGHHHFHH55445#A@@:55555EGGDE\n-@EAS20_8_6_1_594_142/1 trim=11\n-GGTTGTTACCTCGTTACCTTTGGTCGAAAAAAAAAGCCCGCACTGTCAGGTGCGGGCTTTTTTCTGTGTTTCCTGTACGCGTCAGCCCG\n-+\n-HIHHHHHHHHHHHHHHHHHHHHHIHHFHDHHGEBEEEHHGHIIHHFHHEG@FAFHD;DEFHHH@E.:82=??:=:F5?E6;4<:@B?AE\n-@EAS20_8_6_1_641_1277/1 trim=50\n-GGGCTTTTTTCTGTGTTTCCTGTACGCGTCAGCCCGCACCGTTACCTGTG\n-+\n-HHE=GHHHHHECGHHHG@FDHEFF7@@CAA?FA>FA?9;;>@;5=1AA+D\n-@EAS20_8_6_1_660_979/1 trim=5\n-AGGTGGCCACCGTCCTCTCTGCCCCCGCCAAAATCACCAACCACCTGGTGGCGATGATTGAAAAAACCATTAGCGGCCAGGATGCTTTACCCAAT\n-+\n-HHEGHHHHHHHHHHHHHHHHGFFHHHFEEAHEHHGHHEHDFGHIHHHGGD<9F:FHFHHBC4EEEDEBGHHGE@BCBEDGGFFGACFG=4C39:B\n-@EAS20_8_6_1_763_241/1 trim=42\n-TTGTTACCTCGTTACCTTTGGTCGAAAAAAAAAGCCCGCACTGTCAGGTGCGGGCTTT\n-+\n-GHHHIG@HHHHHHGHGIHHHHHHHEDDFEHCBGGHHHHH@HFFGGAGE;B+>3223;D\n-@EAS20_8_6_1_789_699/1\n-GCGAGTCCCGTCAAAAGTTCGGCAAAAATACGTTCGGCATCGCTGATATTGGGTAAAGCATCCTGGCCGCTAATGGTTTTTTCAATCATCGCCACCAGGT\n-+\n-HGHHHHHHHHGHF@GHHGHHFHF@FD??F>CDHHFHHHHHBEFHHAHCHHHEHH@HHHDFHH;HGHGFHHF>1DDFF?FFEHFEHF0AE.2061585=@/\n-@EAS20_8_6_1_802_355/1 correct\n-AGCAGCTTCTGAACTGGTTACCTGCCGTGAGTAAATTAAAATTTTATTGACTTAGGTCACTAAATACTTTAACCAATATAGGCATAGCGCACAGACAGAT\n-+\n-HIHHHHHHIGHDHHHHH#HHFDFBB?DDA>EFGDFHHFHFHHHHHHHEGFHHHFGHBH=;FF@;FEGHHHHHFHCHHEHDFHEHHFHDH=?HEFEHEHAH\n-@EAS20_8_6_1_807_1707/1 trim=15\n-TCGGCATCGCTGATATTGGGTAAAGCATCCTGGCCGCTAATGGTTTTTTCAATCATCGCCACCAGGTGGTTGGTGATTTTGGCGG\n-+\n-FHCEHGFHHHHGEEHHHHGHHFFHFHGHHHGHGFHH=HFCHHHHHEHEHHDFHHFFHHHHAHHBHA4>C6?@=8>5FBBFE?EEB\n-@EAS20_8_6_1_918_1054/1 correct trim=10\n-AACGTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGGCAGGGGCAGGTGGCCACCGTCCTCTCTGCCCCCGCCAAAATCACCA\n-+\n-HHGHHHHHHHHHHHHHHHHHHHHEHHFHHHHGHHHEHHHFIHGHFHHHFHGGFHC>D1D<AFD:CGGGGAB=FCECE23B/#8>=DD:EC\n-@EAS20_8'..b'<@>@8BG9G9\n-@EAS20_8_6_100_346_1515/1\n-TAATACGCCGGCCATAATGGCGATCGACATTTTCTCGCCACGGCAAATCAGCGCAGCGTTGATGCTATCCGGGCACTGCCCCAACAAACTAATGCCATGC\n-+\n-FGDHEHHHHHHGHHHHHHHHBG?GEHHDDGHHHDH@GEEH?CHHFF?FDFEEFHEEFHGHHFFHEIHHGBGGEGDIGFEDEHBEHGEAFHGFH@HGGA?H\n-@EAS20_8_6_100_434_840/1 trim=47\n-ACCTGCCATCAGCACCATGTGATCAGCCGGAATGCGGCTTGCCGCAATACGGC\n-+\n-HGHHHGHHHHHHGGHHHGHHHEGFHHHFHHDGHHEHGGHE:5=>9-<<.-BGB\n-@EAS20_8_6_100_451_465/1 correct\n-CGCCATTATGGCCGGCGTATTAGAAGCGCGCGGTCACAACGTTACTGTTATCGATCCGGTCGAAAAACTGCTGGCAGTGGGGCATTACCTCGAATCTACC\n-+\n-FHHEHHHGHHHHHGFDHHBHBBDDDHEHHHGHIHHDHHEHHHHHEFHHHHHHI@HE=@FBFFCC#HHDHHEHHHH@HGADFF,=FB@F?F?FB4F?F@BB\n-@EAS20_8_6_100_452_1846/1 correct\n-CGCCAGCGGGAACCCCGGCTGGGCGGCGGCGAGTCCCGTCAAAAGTTCGGCAAAAATACGTTCGGCATCGCTGATATTGGGTAAAGCATCCTGGCCGCTA\n-+\n-HFHHEHHHGHEEFEHHHHHHHGFHHHHHDHFGHFHGHHGH@B5>BAEHEHFF#?;-54457HHFAFACEFFCFAFGGGECGEEG#@@@AAFGGCDBHEE=\n-@EAS20_8_6_100_723_1564/1\n-TCTAATACGCCGGCCATAATGGCGATCGACATTTTCTCGCCACGGCAAATCAGCGCAGCGTTGATGCTATCCGGGCACTGCCCCAACAAACTAATGCCAT\n-+\n-HHHHHHGHGHHHHHHHHDHHHGGHGFFHD=DFHHHFHHGGHHFHHHHHHHHDHGGHHHCHEHHGHGFHHHHGEG3H@HEDHHGHHFGEGGGGFFFGEGAG\n-@EAS20_8_6_100_776_1749/1 trim=5\n-GGATGCTTTACCCAATATCAGCGATGCCGAACGTATTTTTGCCGAACTTTTGACGGGACTCGCCGCCGCCCAGCCGGGGTTCCCGCTGGCGCAAT\n-+\n-H,/E8;GH88;?8AA=CFHFCF/F7FE0EA@1.=;ACFF>C=HFFFD=D=HFBFH1FFFG>@CD;GGFGBGAGGF8HHHHHHEHIHEH8H??,<A\n-@EAS20_8_6_100_779_871/1 trim=20\n-GTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGGCAGGGGCAGGTGGCCACCGTCCTCTCTGCCCCCGCCAAA\n-+\n-GHHGGHGHHHHHHHCHHHFHHHFHHHHDFHHEHGHHEDHF?GG@::FGCDCB6E@F6:F<BFAC?EDF-:FEHFB:226A\n-@EAS20_8_6_100_816_1759/1 correct trim=47\n-AAAAAGCCCGCACTGTCAGGTGCGGGCTTTTTTCTGTGTTTCCTGTACGCGTC\n-+\n-#GGHHHBHCGHHHHB@>DA@0#?8>/:/<=FFF/@,3/444(555<5/?3A,A\n-@EAS20_8_6_100_993_1119/1\n-GTCACTAAATACTTTAACCAATATAGGCATAGCGCACAGACAGATAAAAATTACAGAGTACACAACATCCATGAAACGCATTAGCACCACCATTACCACC\n-+\n-?@FDBEFGF8BFGFGHHHHEHHHHEHBFHHHHGGHHH@HGFHHHDH5HB?GHDGDFDHEHIFHFHFFHFE?HDFCFGEHEGBE=HHGGGGGHFHHGGIEG\n-@EAS20_8_6_100_1153_966/1\n-AGCGGCCAGGATGCTTTACCCAATATCAGCGATGCCGAACGTATTTTTGCCGAACTTTTGACGGGACTCGCCGCCGCCCAGCCGGGGTTCCCGCTGGCGC\n-+\n-HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHDHHCHHHHGBFHHDHDHHHHFCHBHEGEHEHGGEHH@GEG8FFBEHFF:FBFDA+DFC;C3\n-@EAS20_8_6_100_1183_226/1 correct trim=26\n-TTGGGCAAATTCCTGATCGACGAAAGTTTTCAATTGCGCCAGCGGGAACCCCGGCTGGGCGGCGGCGAGTCCCG\n-+\n-CFCCF?DCCDHEGHFHHHHFFFHD@HGEHHHGHHHGHHFHHHHGEEH:H>HHHDCFF#EADA366=A0A+8<AA\n-@EAS20_8_6_100_1263_900/1 correct trim=1\n-AGTGTTGAAGTTCGGCGGTACATCAGTGGCAAATGCAGAACGTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGGCAGGGGCAGGTGGCCAC\n-+\n-HGHHHHHHIHHHIHFBD?BCHHHHHDGHHHHEHHFCHFHHBHEHHHFHHDHHFEHHHGH=HEFFFHH@CFHBHEHHBGHGBCDBGFDH<EAF#9F#?@A\n-@EAS20_8_6_100_1277_357/1 trim=5\n-ACGTTCGGCATCGCTGATATTGGGTAAAGCATCCTGGCCGCTAATGGTTTTTTCAATCATCGCCACCAGGTGGTTGGTGATTTTGGCGGGGGCAG\n-+\n-DEHHHHIEHHHHHHHHGIGHHHHHHHGHHHHEFEHHHHHHHHFEHHHHHHHHH@CGHGCHFHHE@FB<=F=FFFFFFDG;BFDFFGFEG@9B24C\n-@EAS20_8_6_100_1337_252/1 correct trim=16\n-GCGGCCAGGATGCTTTACCCAATATCAGCGATGCCGAACGTATTTTTGCCGAACTTTTGACGGGACTCGCCGCCGCCCAGCCGG\n-+\n-GBHHHHHHGGHHBHEG@BEHHDHAHGBHGHDGDDEH#EBEDBFDHHC2EDF9?@EEHHE?CCH=EHEGAGGGEE4AGA6E1G?F\n-@EAS20_8_6_100_1432_436/1 trim=3\n-GTAGATTCGAGGTAATGCCCCACTGCCAGCAGTTTTTCGACCGGATCGATAACAGTAACGTTGTGACCGCGCGCTTCTAATACGCCGGCCATAATGG\n-+\n-HHHHHIHHGGHDGHHHHHEGHHHGHHDHHHEHHGHHHHGHHFHGDGHHDHECHDEGGFGGFGFFBGGEGEG?GBGHEHB9EGEDGDAEDEDE?DFBF\n-@EAS20_8_6_100_1457_1209/1 correct trim=7\n-TTGGGCAAATTCCTGATCGACGAAAGTTTTCAATTGCGCCAGCGGGAACCCCGGCTGGGCGGCGGCGAGTCCCGTCAAAAGTTCGGCAAAAAT\n-+\n-HGHFFDBCBD#BBFFEDDFCHGHHEHCHHHEHHHHHHEAHHHGHBDGHEHEEGHGEE@GGGGFG?5C;A5:0;A4988-/>8@5>;<-37<?B\n-@EAS20_8_6_100_1609_245/1\n-GGTGGCCACCTGCCCCTGCCTGGCATTGCTTTCCAGAATATCGGCAACACGCAGAAAACGTTCTGCATTTGCCACTGATGTACCGCCGAACTTCAACACT\n-+\n-BCBBDFHHHHHHEHHHHGHHHHHHDHHHHHHHGHHHGIHHHHHEHIDHGGIHHHFGHFHHGHHBGFFHHHHFHHFHHGHHIHHEHGFF=HGFHHBFFGBH\n-@EAS20_8_6_100_1637_1332/1\n-TGGTGCTAATGCGTTTCATGGATGTTGTGTACTCTGTAATTTTTATCTGTCTGTGCGCTATGCCTATATTGGTTAAAGTATTTAGTGACCTAAGTCAATA\n-+\n-FHFHHFGGHGHFHGHHGHHHFEHHHGFFDFHFHHHGEDCGHHHHHG9HDGHFHGHHHEHEFGF=GAHEHHFEGFFGEHFHHHHFHHEBE?HHFHEGFDHH\n' |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/test-data/ecoli_1K_2.fq --- a/tools/spades_3_1_1/test-data/ecoli_1K_2.fq Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| b'@@ -1,8216 +0,0 @@\n-@EAS20_8_6_1_9_1972/2 correct\n-GGTGGCCACCTGCCCCTGCCTGGCATTGCTTTCCAGAATATCGGCAACACGCAGAAAACGTTCTGCATTTGCCACTGATGTACCGCCGAACTTCAACACT\n-+\n-HFHHHGHHHHHHHHHHHHGHHHHHHGHHHHHHHHHHHFHHGHHGHEHHHHHHEH;G?F<F?GDFF/EEFBD:DCHHH7A@?EEH@HH96:4F@#76=C@@\n-@EAS20_8_6_1_163_1521/2\n-GGCATAGCGCACAGACAGATAAAAATTACAGAGTACACAACATCCATGAAACGCATTAGCACCACCATTACCACCACCATCACCATTACCACAGGTAACG\n-+\n-HHGGFHHGHHHHHHHGFHHHHHHHCGHFHFHFHHHHHHGHHGHHDHHIEGEDFEHHCHHHHGCCGF>GFEFEGGFGGEIG1ACBCF?CD1?CADCD.DFB\n-@EAS20_8_6_1_178_1948/2\n-ATTGAAAACTTTCGTCGATCAGGAATTTGCCCAAATAAAACATGTCCTGCATGGCATTAGTTTGTTGGGGCAGTGCCCGGATAGCATCAACGCTGCGCTG\n-+\n-HGHIHHHIHGGHHHHGHHFHHFDHHHHHGHHBHHHHHHGGGHHHHHHHHHFHHHHGHHFHFEDHGDHH>HGEFCHHCHHH=GGHBEGFFHEGGD@HHEEH\n-@EAS20_8_6_1_318_1522/2\n-AGAATATCGGCAACACGCAGAAAACGTTCTGCATTTGCCACTGATGTACCGCCGAACTTCAACACTCGCATGGTTGTTACCTCGTTACCTTTGGTCGAAA\n-+\n-IGHFHHHDEHGHHEHHHEGHDHHHGHHHHHHEHHHHHDHHHHHGHHHHEGFAEHDGHFHHFDHFGHHHIGHIEGHHGGHFGFAHGHGFEHDHEEEB7<3<\n-@EAS20_8_6_1_348_1372/2\n-GGGCGGCGGCGAGTCCCGTCAAAAGTTCGGCAAAAATACGTTCGGCATCGCTGATATTGGGTAAAGCATCCTGGCCGCTAATGGTTTTTTCAATCATCGC\n-+\n-HHHHHH@HGHHEHGHGHHHHDHHHHFHEHDDHHDHHHEEHHDHHHBFHCEGEHGGGDHHE@EFDAHHGHEDFGG:FDB<>=BDG?D=3BB>G?GGEGGD;\n-@EAS20_8_6_1_389_646/2 trim=17\n-TGCCACTGATGTACCGCCGAACTTCAACACTCGCATGGTTGTTACCTCGTTACCTTTGGTCGAAAAAAAAAGCCCGCACTGTC\n-+\n-HGGGDHHHAHGHHHHGHIHHEHHHGHFHHHHHFHHEG=GHEEFEHEHHEEEDGHGHFHDFFFADDHHF:>0&D0A4?,?AE=?\n-@EAS20_8_6_1_513_951/2 correct\n-ATAACAGTAACGTTGTGACCGCGCGCTTCTAATACGCCGGCCATAATGGCGATCGACATTTTCTCGCCACGGCAAATCAGCGCAGCGTTGATGCTATCCG\n-+\n-GHFHGHDHGHHHHHHFHHHEFHHHHHGHFHBHEHHHFDHHGGHHBEHHGHHHFFFBHHHHHGEGDHFIHHHHEEC?GEGDFE;<E+@5@>?E;=?#A)?=\n-@EAS20_8_6_1_530_1080/2\n-GAAAACGTTCTGCATTTGCCACTGATGTACCGCCGAACTTCAACACTCGCATGGTTGTTACCTCGTTACCTTTGGTCGAAAAAAAAAGCCCGCACTGTCA\n-+\n-D?D?DG;FAFFGDGFDF?F:>=DD>GGGGGDAD:D+DD>DDFAFFDGFG4FFFFC<FF>BGCG/CFF59AFBD6DG@BA1.53;-:9:FG::F-:><>96\n-@EAS20_8_6_1_546_406/2\n-CGGGTGGACTCAGCAATATCGACGGTAGATTCGAGGTAATGCCCCACTGCCAGCAGTTTTTCGACCGGATCGATAACAGTAACGTTGTGACCGCGCGCTT\n-+\n-HHHHEHHHHHHHIHHFHHHHHHHHHGHHHIHHHHHFGHHGHHHHHBHHGBHHEHGHCGGGGHAGHEGGGGHEDECGGFE8GGE=EGGC>FGE@DDECGDD\n-@EAS20_8_6_1_553_1132/2 trim=6\n-GGCGATGATTGAAAAAACCATTAGCGGCCAGGATGCTTTACCCAATATCAGCGATGCCGAACGTATTTTTGCCGAACTTTTGACGGGACTCGCC\n-+\n-HHHHHHHHHHHHFHHHHHHHHHHHHHHHHHHHEGHHHHHABGEEHHDHAGHDHGGHFFFGH@HDGGHGHEEFIIBFFFIEGD@EFG<E@EC<6B\n-@EAS20_8_6_1_594_142/2\n-AACCAATATAGGCATAGCGCACAGACAGATAAAAATTACAGAGTACACAACATCCATGAAACGCATTAGCACCACCATTACCACCACCATCACCATTACC\n-+\n-GGHHHHHHHHHFGHHHHHGHHHDGDHHHHHHHFH?EHHHHGDGEHHHHDHHHIHHGIHHEFFHHHHFGFHGEHCGGGEGA;HFH@DEFEBEEAHE??=?C\n-@EAS20_8_6_1_641_1277/2\n-GGTTACCTGCCGTGAGTAAATTAAAATTTTATTGACTTAGGTCACTAAATACTTTAACCAATATAGGCATAGCGCACAGACAGATAAAAATTACAGAGTA\n-+\n-FFE?FEBFG?EHFHDHDFHDEHGAEEFGFHHH?GH;HAGGFF7AEHCCBH?0FG=2FAB4EHGB>BC0<?EE=9C=E;F;:;AAAA+,=,6E@2AC3?<>\n-@EAS20_8_6_1_660_979/2\n-CCATGCAGGACATGTTTTATTTGGGCAAATTCCTGATCGACGAAAGTTTTCAATTGCGCCAGCGGGAACCCCGGCTGGGCGGCGGCGAGTCCCGTCAAAA\n-+\n-HDHHEFHH@FHHHEHHGGGGEEEHFFHHFGHHHHHGGHHDBFBF;FFFGFDFGGHHHHG<FHCHHA9=B?=G@@?EHED9F8DHEDD3EBC&GD3)-000\n-@EAS20_8_6_1_763_241/2\n-TATAGGCATAGCGCACAGACAGATAAAAATTACAGAGTACACAACATCCATGAAACGCATTAGCACCACCATTACCACCACCATCACCATTACCACAGGT\n-+\n-HHFDFGHHHHHEHHCHHFGHBEEAGHBCGEGHHEHDHEHH=HHHHHHHHGHHDBFGHHDGBIHHHHCHEHBE>HHGHBHHFHEGEHGHBDEHEH=F:E??\n-@EAS20_8_6_1_789_699/2 correct trim=20\n-TGCAGAACGTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGGCAGGGGCAGGTGGCCACCGTCCTCTCTGCCC\n-+\n-H=BHHFAECGAHHHF<AF@FFEEEEHHHHFCHHHHHGHH=FEHHHEHH4E1DAA=FEG?AHDEH#*F;1/AA7(D<?)FF\n-@EAS20_8_6_1_802_355/2 correct\n-CTGTACGCGTCAGCCCGCACCGTTACCTGTGGTAATGGTGATGGTGGTGGTAATGGTGGTGCTAATGCGTTTCATGGATGTTGTGTACTCTGTAATTTTT\n-+\n-HHHHHHHHHHHGGGGHHHHIHGGIHHHHGHHEAEBFFBCF=GGD?D@2C;?<6?BFBFF>BCCE?BBDGDBD>2HF?8?C?:19?0&5-#=:/;6DHGD>\n-@EAS20_8_6_1_807_1707/2 trim=1\n-GAGGTAACAACCATGCGAGTGTTGAAGTTCGGCGGTACATCAGTGGCAAATGCAGAACGTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGG\n-+\n-FCFF2FBBFBEHGHH?D=AAFDGGCCHHHHBHEEHDEFAFFGGGDGGABIGECHEBBBHFHHHDDFEGGEEFD=1=BDDDCCGEEDDJCBBDDE;BEAG\n-@EAS20_8_6_1_918_1054/2 correct\n-GCCAGCGGGAACCCCGGCTGGGCGGCGGCGAGTCCCGT'..b'6_100_346_1515/2\n-TGCCGAACTTTTGACGGGACTCGCCGCCGCCCAGCCGGGGTTCCCGCTGGCGCAATTGAAAACTTTCGTCGATCAGGAATTTGCCCAAATAAAACATGTC\n-+\n-AADA@BBFBDHCGGBHHHGHH=HEHFHHH@HFHHFFDHFE;HHEHGF<CGHHH@FGGG1F<B9BDHHHH=H?HE6GFADFEBHBDFD/BGF1F??HGHGF\n-@EAS20_8_6_100_434_840/2\n-AGTGCCCGGATAGCATCAACGCTGCGCTGATTTGCCGTGGCGAGAAAATGTCGATCGCCATTATGGCCGGCGTATTAGAAGCGCGCGGTCACAACGTTAC\n-+\n-HHHGHHFHGGHHEFHHH>FHHHHHFHFHHEHHHFFHHHHDHHGHHBAHHHFHHEHFHHGBIHHEFIFGEDGGC;FE80>ABC4CAEGG;A182;916>98\n-@EAS20_8_6_100_451_465/2 correct trim=22\n-GTTGCGTCCAAGCACCACCAGTTCGCCTTTTTCATTACCGGCGGTGAAACCTGCCATCAGCACCATGTGATCAGCCGG\n-+\n-HIHHDHHHHGHIGHHHHGHHHFHHIHIHHHHHIHHHHHGIH@HH>A;AD95#+43=?C:35:6865/9;13=<:?B?C\n-@EAS20_8_6_100_452_1846/2 correct\n-CTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGGCAGGGGCAGGTGGCCACCGTCCTCTCTGCCCCCGCCAAAATCACCAACCACCTGGTGGCGATGA\n-+\n-HHHHHGHHHHGHHHFHHHHGHGHDHHFHBEHHHFHFGHHGHHHDHE#HEDF?CF?DFD:E252+7CBF?14:*:AA;:C9;9;+ABAD8#64<::;3+<7\n-@EAS20_8_6_100_723_1564/2 correct trim=2\n-TGCCGAACGTATTTTTGCCGAACTTTTGACGGGACTCGCCGCCGCCCAGCCGGGGTTCCCGCTGGCGCAATTGAAAACTTTCGTCGATCAGGAATTTG\n-+\n-HHHEHEHEH?HHEEHEEGHHBEFEEHHHFHHHHHHFHEHFEHHFHGHHGHED/EHDHEH@A88D@C(E6BEEHD@5?CE:AG;D@C;;2@>#8.95?C\n-@EAS20_8_6_100_776_1749/2\n-TCTCGCCACGGCAAATCAGCGCAGCGTTGATGCTATCCGGGCACTGCCCCAACAAACTAATGCCATGCAGGACATGTTTTATTTGGGCAAATTCCTGATC\n-+\n-F3G30CEG?GDD4D=H<8BFEF8HDGHHH1HHFFEHDHB1;5>;<8EDC8??@ADEHH@HEEEHFHHHHHHEHHHG:@FFFGA6AEHH@=EHH;HFC/FF\n-@EAS20_8_6_100_779_871/2\n-AAAGTTTTCAATTGCGCCAGCGGGAACCCCGGCTGGGCGGCGGCGAGTCCCGTCAAAAGTTCGGCAAAAATACGTTCGGCATCGCTGATATTGGGTAAAG\n-+\n-FGEFCEHFFFBHHFHHHHEEHHHBCFAFEHGHGHH7B@:EDFHDE5CAABBHCB7@8?A8?FB3BBADBDG>;;CF=FGGD52B0?A2A?;;=;BA5DAE\n-@EAS20_8_6_100_816_1759/2\n-AAATTAAAATTTTATTGACTTAGGTCACTAAATACTTTAACCAATATAGGCATAGCGCACAGACAGATAAAAATTACAGAGTACACAACATCCATGAAAC\n-+\n-63;=>>3>>?DECADBBDCG?@7?5DCEEEGGGECGGGCGGGDCGGFCG6FGBCGGGGG>DGCGGBEGG>4E7?GFGG<GGGGEG;,GBADD8ADG>2EF\n-@EAS20_8_6_100_993_1119/2 trim=60\n-TGGTTGTTACCTCGTTACCTTTGGTCGAAAAAAAAAGCCC\n-+\n-B>BBB=F:FGFHFBHHHHHHHDHDGHEH=HHHHGE>8DC=\n-@EAS20_8_6_100_1153_966/2\n-TCGCCACGGCAAATCAGCGCAGCGTTGATGCTATCCGGGCACTGCCCCAACAAACTAATGCCATGCAGGACATGTTTTATTTGGGCAAATTCCTGATCGA\n-+\n-HHGHHHHHHGHHHHHGHHHHHHHHHHGHHHHHHHHHGHGHHHHH;HFDEHFDHDHHHHHGDHHHHDGHFGBGHHCGGHFH>ECGGHGECFFDFFD?DDDB\n-@EAS20_8_6_100_1183_226/2 correct trim=40\n-AATGCCAGGCAGGGGCAGGTGGCCACCGTCCTCTCTGCCCCCGCCAAAATCACCAACCAC\n-+\n-DDBBD@EEEGDHHEHBCBB0=GCGC4?.6=D8CF89:DFBGG5==*83<#?/:;+E@ABB\n-@EAS20_8_6_100_1263_900/2\n-AAGTTCGGCAAAAATACGTTCGGCATCGCTGATATTGGGTAAAGCATCCTGGCCGCTAATGGTTTTTTCAATCATCGCCACCAGGTGGTTGGTGATTTTG\n-+\n-HHHEHHHEGIHHHGHGGHHHHHHHHHHHHHH=HFHHHHHFHHHGEHHFHHHGEBHHHBCHHDEGHGGF@G@HGEE=F;C9H39H=FEHFHHEFH?=AEFE\n-@EAS20_8_6_100_1277_357/2 trim=5\n-GCGAGTGTTGAAGTTCGGCGGTACATCAGTGGCAAATGCAGAACGTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCCAGGCAGGGGCAGG\n-+\n-FFFHFHHHHHHHHGHHDHHBBHHHHHHEEEH<GHGH@FHHHHGGHGHHHFGHHGGHGGHHHFBEFFEHHHECGIIFHEGEEDFEEH//EBD4=EF\n-@EAS20_8_6_100_1337_252/2 correct\n-CATAATGGCGATCGACATTTTCTCGCCACGGCAAATCAGCGCAGCGTTGATGCTATCCGGGCACTGCCCCAACAAACTAATGCCATGCAGGACATGTTTT\n-+\n-HHHHBHEECG=FEEFH.HHH=GEGE@HEF<BFHHBHHAHHBBBB>DGHH8HDF/=F=FF==;/FFCGGHDGBHG-B<@BFE=:FE5=E98E=E-H=@C#C\n-@EAS20_8_6_100_1432_436/2\n-CAATTGAAAACTTTCGTCGATCAGGAATTTGCCCAAATAAAACATGTCCTGCATGGCATTAGTTTGTTGGGGCAGTGCCCGGATAGCATCAACGCTGCGC\n-+\n-HHHHHFHHGHHHHHGGHHHHGHHHHHHHHGHHHGHHHGGGEEEHHHHHHFHEDGGGHHFHHHDGHBFGFF>BHH8FBF0F@>DFGHHBBEH>FBD@DHEG\n-@EAS20_8_6_100_1457_1209/2 correct trim=11\n-GCAGGGGCAGGTGGCCACCGTCCTCTCTGCCCCCGCCAAAATCACCAACCACCTGGTGGCGATGATTGAAAAAACCATTAGCGGCCAGG\n-+\n-HHHHBGHHHFH?HHHHCCFDB=?D=HHEEAEFEHGEB=HHC68C5??B==B=F<;C7=ECH=HE:?CE>@?<EB1.-87<<#3C9@>??\n-@EAS20_8_6_100_1609_245/2 correct trim=16\n-TCACCATTACCACAGGTAACGGTGCGGGCTGACGCGTACAGGAAACACAGAAAAAAGCCCGCACCTGACAGTGCGGGCTTTTTT\n-+\n-HHEHHHGHHGHHHHDIHHHHHHHHHFHAFHFHHEIFDHFH8HHHFHHHGHHHEEB<8FFFCG>FE==9D9#0:?45/<#;B8=D\n-@EAS20_8_6_100_1637_1332/2\n-ATTCTGACTGCAACGGGCAATATGTCTCTGTGTGGATTAAAAAAAGAGTGTCTGATAGCAGCTTCTGAACTGGTTACCTGCCGTGAGTAAATTAAAATTT\n-+\n-HHGEHGHHHHGHIGHAHEHEHEIHGGHHHHHHHGGHHHHFHEGDGCCCHHHGHHDHHIHFEEHHHHHGHIHHHFHHIEIHHHHFAEEEHHIEHDHFFHFH\n' |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/test-data/reference_1K.fa --- a/tools/spades_3_1_1/test-data/reference_1K.fa Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,18 +0,0 @@ ->NODE_0_length_1000_cov_140.62 -AGCTTTTCATTCTGACTGCAACGGGCAATATGTCTCTGTGTGGATTAAAAAAAGAGTGTC -TGATAGCAGCTTCTGAACTGGTTACCTGCCGTGAGTAAATTAAAATTTTATTGACTTAGG -TCACTAAATACTTTAACCAATATAGGCATAGCGCACAGACAGATAAAAATTACAGAGTAC -ACAACATCCATGAAACGCATTAGCACCACCATTACCACCACCATCACCATTACCACAGGT -AACGGTGCGGGCTGACGCGTACAGGAAACACAGAAAAAAGCCCGCACCTGACAGTGCGGG -CTTTTTTTTTCGACCAAAGGTAACGAGGTAACAACCATGCGAGTGTTGAAGTTCGGCGGT -ACATCAGTGGCAAATGCAGAACGTTTTCTGCGTGTTGCCGATATTCTGGAAAGCAATGCC -AGGCAGGGGCAGGTGGCCACCGTCCTCTCTGCCCCCGCCAAAATCACCAACCACCTGGTG -GCGATGATTGAAAAAACCATTAGCGGCCAGGATGCTTTACCCAATATCAGCGATGCCGAA -CGTATTTTTGCCGAACTTTTGACGGGACTCGCCGCCGCCCAGCCGGGGTTCCCGCTGGCG -CAATTGAAAACTTTCGTCGATCAGGAATTTGCCCAAATAAAACATGTCCTGCATGGCATT -AGTTTGTTGGGGCAGTGCCCGGATAGCATCAACGCTGCGCTGATTTGCCGTGGCGAGAAA -ATGTCGATCGCCATTATGGCCGGCGTATTAGAAGCGCGCGGTCACAACGTTACTGTTATC -GATCCGGTCGAAAAACTGCTGGCAGTGGGGCATTACCTCGAATCTACCGTCGATATTGCT -GAGTCCACCCGCCGTATTGCGGCAAGCCGCATTCCGGCTGATCACATGGTGCTGATGGCA -GGTTTCACCGCCGGTAATGAAAAAGGCGAACTGGTGGTGCTTGGACGCAACGGTTCCGAC -TACTCTGCTGCGGTGCTGGCTGCCTGTTTACGCGCCGATT |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/tools/spades_3_5_0/filter_spades_output.pl --- a/tools/spades_3_1_1/tools/spades_3_5_0/filter_spades_output.pl Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| [ |
| @@ -1,106 +0,0 @@ -#!/usr/bin/env perl -w - -=head1 SYNOPSIS - -filter_spades_output.pl - Filters contigs or scaffolds based on contig length and coverage. - -=head1 USAGE - -filter_spades_output.pl [-c|--coverage-cutoff] [-l|--length-cutoff] [-o|--filtered-out out.fasta] -t|--tab stats.tab seqs.fasta - -=head1 INPUT - -=head2 [-c|--coverage-cutoff] - -Mininum coverage. Contigs with lower coverage will be discarded. Default 10. - -=head2 [-l|--length-cutoff] - -Mininum coverage. Smaller ontigs will be discarded. Default 500. - -=head2 -t|--tab stats.tab - -A tabular file, with three columns: contig name, length, and coverage: - -NODE_1 31438 24.5116 -NODE_2 31354 2316.96 -NODE_3 26948 82.3294 - -Such a file is produced by spades.xml. Contigs should be in the same order as in the fasta file. - -=head2 [-o|--filtered-out out.fasta] - -If specified, filtered out sequences will be written to this file. - -=head2 seqs.fasta - -Sequences in fasta format. Start of IDs must match ids in the tabular file. - -=head1 OUTPUT - -A fasta file on stdout. - -=head1 AUTHOR - -Lionel Guy (lionel.guy@icm.uu.se) - -=head1 DATE - -Thu Aug 29 13:51:13 CEST 2013 - -=cut - -# libraries -use strict; -use Getopt::Long; -use Bio::SeqIO; - -my $coverage_co = 10; -my $length_co = 500; -my $out_filtered; -my $tab_file; - -GetOptions( - 'c|coverage-cutoff=s' => \$coverage_co, - 'l|length-cutoff=s' => \$length_co, - 'o|filtered-out=s' => \$out_filtered, - 't|tab=s' => \$tab_file, -); -my $fasta_file = shift(@ARGV); -die ("No tab file specified") unless ($tab_file); -die ("No fasta file specified") unless ($fasta_file); - -## Read tab file, discard rows with comments -open TAB, '<', $tab_file or die "$?"; -my @stats; -while (<TAB>){ - chomp; - push @stats, $_ unless (/^#/); -} - -## Read fasta -my $seq_in = Bio::SeqIO->new(-file => $fasta_file, - -format => 'fasta'); -my $seq_out = Bio::SeqIO->new(-fh => \*STDOUT, - -format => 'fasta'); -my $seq_out_filt = Bio::SeqIO->new(-file => ">$out_filtered", - -format => 'fasta') if ($out_filtered); -while (my $seq = $seq_in->next_seq){ - my $stat = shift @stats; - die "Less rows in tab than sequences in seq file" unless $stat; - my ($id_tab, $length, $coverage) = split(/\t+/, $stat); - die "id, length or coverate not defined at $stat\n" - unless ($id_tab && $length && $coverage); - my $id_seq = $seq->id; - die "Unmatched ids $id_seq and $id_tab\n" unless ($id_seq =~ /^$id_tab/i); - if ($length >= $length_co && $coverage >= $coverage_co){ - $seq_out->write_seq($seq); - } elsif ($out_filtered){ - $seq_out_filt->write_seq($seq); - } else { - # do nothing - } -} -die "More rows in tab than sequences in seq file" if (scalar(@stats) > 0); -exit 0; - |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/tools/spades_3_5_0/filter_spades_output.xml --- a/tools/spades_3_1_1/tools/spades_3_5_0/filter_spades_output.xml Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,33 +0,0 @@ -<tool id="filter_spades_output" name="Filter SPAdes output" version="0.1"> - <description>remove low coverage and short contigs/scaffolds</description> - <command interpreter="perl">filter_spades_output.pl - --coverage-cutoff $coverage_co - --length-cutoff $length_co - #if $keep_leftover - --filtered-out $filtered_out - #end if - --tab $stats_in - $fasta_in > $fasta_output - </command> - - <inputs> - <param name="fasta_in" type="data" format="fasta" label="Sequences" help="Contigs or scaffolds. Make sure you input the corresponding stat file" /> - <param name="stats_in" type="data" format="tabular" label="Contig stats" /> - <param name="length_co" type="integer" value="1000" min="0" label="Length cut-off" help="Contigs with length under that value are shown in red" /> - <param name="coverage_co" type="integer" value="10" min="0" label="Coverage cut-off" help="Contigs with length under that value are shown in red" /> - <param name="keep_leftover" type="boolean" checked="false" label="Save filtered-out sequences?" /> - </inputs> - <outputs> - <data format="fasta" name="fasta_output" label="Filtered sequences" /> - <data format="fasta" name="filtered_out" label="Discarded sequences"> - <filter>keep_leftover == "true"</filter> - </data> - </outputs> - <help> -**What it does** - -Using the output of SPAdes (a fasta and a stats file, either from contigs or scaffolds), it filters the fasta files, discarding all sequences that are under a given length or under a given coverage. - -Typically, this is used to discard short contigs, or contaminations. To display a coverage vs. length plot, use the "SPAdes stats" tool in the same package. - </help> -</tool> |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/tools/spades_3_5_0/plot_spades_stats.xml --- a/tools/spades_3_1_1/tools/spades_3_5_0/plot_spades_stats.xml Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| [ |
| @@ -1,80 +0,0 @@ -<tool id="plot_spades_stats" name="SPAdes stats" version="0.1"> - <description>coverage vs. length plot</description> - <requirements> - <requirement type="package">R</requirement> - </requirements> - <command interpreter="bash">r_wrapper.sh $script_file</command> - - <inputs> - <param name="input_scaffolds" type="data" format="tabular" label="Scaffold stats"/> - <param name="input_contigs" type="data" format="tabular" label="Contig stats"/> - <param name="length_co" type="integer" value="1000" min="0" label="Length cut-off" help="Contigs with length under that value are shown in red"/> - <param name="coverage_co" type="integer" value="10" min="0" label="Coverage cut-off" help="Contigs with length under that value are shown in red"/> - </inputs> - <configfiles> - <configfile name="script_file"> -## Setup R error handling to go to stderr -options( show.error.messages=F, - error = function () { - cat( geterrmessage(), file=stderr() ); q( "no", 1, F ) -} ) -files = c("${input_contigs}", "${input_scaffolds}") -types = c("Contigs", "Scaffolds") - -## Start plotting device -png("${out_file}", w=500, h=1000) -par(mfrow=c(2,1)) - -## Loop over the two files -for (i in 1:length(types)){ - seqs = read.table(files[i], header=FALSE, comment.char="#") - colnames = c("name", "length", "coverage") - names(seqs) = colnames - - ## Stats over all sequences - sl_all = sort(seqs\$length, decreasing=TRUE) - cs_all = cumsum(sl_all) - s_all = sum(seqs\$length) - n50_idx_all = which.min(sl_all[cs_all < 0.5*s_all]) - n90_idx_all = which.min(sl_all[cs_all < 0.9*s_all]) - n50_all = sl_all[n50_idx_all] - n90_all = sl_all[n90_idx_all] - - ## Filter short seqs, redo stats - seqs_filt = seqs[seqs\$length >= ${length_co} & seqs\$coverage >= ${coverage_co},] - if (nrow(seqs_filt) > 0){ - sl_filt = sort(seqs_filt\$length, decreasing=TRUE) - cs_filt = cumsum(sl_filt) - s_filt = sum(seqs_filt\$length) - n50_idx_filt = which.min(sl_filt[cs_filt < 0.5*s_filt]) - n90_idx_filt = which.min(sl_filt[cs_filt < 0.9*s_filt]) - n50_filt = sl_filt[n50_idx_filt] - n90_filt = sl_filt[n90_idx_filt] - } - seqs_bad = seqs[seqs\$length < ${length_co} | seqs\$coverage < ${coverage_co},] - - ## Length vs coverage - plot(length~coverage, data=seqs, log="xy", type="n", main=paste(types[i], ": coverage vs. length", sep=""), xlab="Coverage", ylab="Length") - if (nrow(seqs_bad) > 0){ - points(length~coverage, data=seqs_bad, cex=0.5, col="red") - } - if (nrow(seqs_filt) > 0){ - points(length~coverage, data=seqs_filt, cex=0.5, col="black") - } - abline(v=${coverage_co}, h=${length_co}, lty=2, col=grey(0.3)) - legend(x="topleft", legend=c("Before/after filtering", paste(c("N50: ", "N90: ", "Median cov.: "), c(n50_all, n90_all, round(median(seqs\$coverage))), rep("/", 3), c(n50_filt, n90_filt, round(median(seqs_filt\$coverage))), sep="")), cex=0.8) -} -dev.off() - </configfile> - </configfiles> - <outputs> - <data format="png" name="out_file" /> - </outputs> - <help> -**What it does** - -Using the output of SPAdes (a pair of fasta file and stat file for each of the contigs and scaffolds), it produces a coverage vs. contig plot. Each dot represent a contig/scaffold. Given a coverage and a length cutoff, sequences that do not meet those criteria are shown in red. Some statistics are also given (N50, N90, median contig/scaffold length) both before and after filtering. - -Use the "filter SPAdes output" tool to actually filter sequences. - </help> -</tool> \ No newline at end of file |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/tools/spades_3_5_0/r_wrapper.sh --- a/tools/spades_3_1_1/tools/spades_3_5_0/r_wrapper.sh Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,23 +0,0 @@ -#!/bin/sh - -### Run R providing the R script in $1 as standard input and passing -### the remaining arguments on the command line - -# Function that writes a message to stderr and exits -function fail -{ - echo "$@" >&2 - exit 1 -} - -# Ensure R executable is found -which R > /dev/null || fail "'R' is required by this tool but was not found on path" - -# Extract first argument -infile=$1; shift - -# Ensure the file exists -test -f $infile || fail "R input file '$infile' does not exist" - -# Invoke R passing file named by first argument to stdin -R --vanilla --slave $* < $infile |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/tools/spades_3_5_0/spades.pl --- a/tools/spades_3_1_1/tools/spades_3_5_0/spades.pl Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,139 +0,0 @@ -#!/usr/bin/env perl -## A wrapper script to call spades.py and collect its output -use strict; -use warnings; -use File::Temp qw/ tempfile tempdir /; -use File::Copy; -use Getopt::Long; - -# Parse arguments -my ($out_contigs_file, - $out_contigs_stats, - $out_scaffolds_file, - $out_scaffolds_stats, - $out_log_file, - $new_name, - @sysargs) = @ARGV; - -## GetOptions not compatible with parsing the rest of the arguments in an array. -## Keeping the not-so-nice parse-in-one-go method, without named arguments. -# GetOptions( -# 'contigs-file=s' => \$out_contigs_file, -# 'contigs-stats=s' => \$out_contigs_stats, -# 'scaffolds-file=s' => \$out_scaffolds_file, -# 'scaffolds-stats=s' => \$out_scaffolds_stats, -# 'out_log_file=s' => \$out_log_file, -# ); - -# my @sysargs = @ARGV; - -# Create temporary folder to store files, delete after use -#my $output_dir = tempdir( CLEANUP => 0 ); -my $output_dir = 'output_dir'; -# Link "dat" files as fastq, otherwise spades complains about file format - -# Create log handle -open my $log, '>', $out_log_file or die "Cannot write to $out_log_file: $?\n"; - -# Run program -# To do: record time -runSpades(@sysargs); -collectOutput($new_name); -extractCoverageLength($out_contigs_file, $out_contigs_stats); -extractCoverageLength($out_scaffolds_file, $out_scaffolds_stats); -print $log "Done\n"; -close $log; -exit 0; - -# Run spades -sub runSpades { - my $cmd = join(" ", @_) . " -o $output_dir"; - my $return_code = system($cmd); - if ($return_code) { - print $log "Failed with code $return_code\nCommand $cmd\nMessage: $?\n"; - die "Failed with code $return_code\nCommand $cmd\nMessage: $?\n"; - } - return 0; -} - -# Collect output -sub collectOutput{ - my ($new_name) = @_; - - # To do: check that the files are there - # Collects output - if ( not -e "$output_dir/contigs.fasta") { - die "Could not find contigs.fasta file\n"; - } - if ( not -e "$output_dir/scaffolds.fasta") { - die "Could not find scaffolds.fasta file\n"; - } - - #if a new name is given for the contigs and scaffolds, change them before moving them - if ( $new_name ne 'NODE') { - renameContigs($new_name); - } - else { - move "$output_dir/contigs.fasta", $out_contigs_file; - move "$output_dir/scaffolds.fasta", $out_scaffolds_file; - } - - - - open LOG, '<', "$output_dir/spades.log" - or die "Cannot open log file $output_dir/spades.log: $?"; - print $log $_ while (<LOG>); - return 0; -} - -#Change name in contig and scaffolds file -sub renameContigs{ - my ($name) = @_; - - open my $in, '<',"$output_dir/contigs.fasta" or die $!; - open my $out,'>', $out_contigs_file; - - while ( my $line = <$in>) { - #remove the NODE_ so we can rebuilt the display_id with our contig name with the contig number. - #also move the remainder of the length - if ( $line =~ />NODE_(\d+)_(.+)/) { - $line = ">$name" . "_$1 $2\n"; - } - print $out $line; - } - close $in; - close $out; - - - open $in, '<',"$output_dir/scaffolds.fasta" or die $!; - open $out,'>', $out_scaffolds_file; - - while ( my $line = <$in>) { - #remove the NODE_ so we can rebuilt the display_id with our contig name with the contig number. - #also move the remainder of the length - if ( $line =~ />NODE_(\d+)_(.+)/) { - $line = ">$name" . "_$1 $2\n"; - } - print $out $line; - } - close $in; - close $out; - -} - - -# Extract -sub extractCoverageLength{ - my ($in, $out) = @_; - open FASTA, '<', $in or die $!; - open TAB, '>', $out or die $!; - print TAB "#name\tlength\tcoverage\n"; - while (<FASTA>){ - next unless /^>/; - chomp; - die "Not all elements found in $_\n" if (! m/^>(NODE|\S+)_(\d+)(?:_|\s)length_(\d+)_cov_(\d+\.*\d*)/); - my ($name,$n, $l, $cov) = ($1,$2, $3, $4); - print TAB "$name" . "_$n\t$l\t$cov\n"; - } - close TAB; -} |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/tools/spades_3_5_0/spades.xml --- a/tools/spades_3_1_1/tools/spades_3_5_0/spades.xml Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| [ |
| b'@@ -1,247 +0,0 @@\n-<tool id="spades" name="spades" version="1.0">\n- <description>SPAdes genome assembler for regular and single-cell projects</description>\n- <requirements>\n- <requirement type="package" version="3.5.0">spades</requirement>\n- </requirements>\n- <command interpreter="perl">spades.pl \n- $out_contigs \n- $out_contig_stats \n- $out_scaffolds \n- $out_scaffold_stats \n- $out_log\n-\n- ## if the first library file is a paired-collection, use the key as the name\n- #if $libraries[0].files[0].file_type.type == "paired-collection":\n- $libraries[0].files[0].file_type.fastq_collection.name\n- #else:\n- NODE\n- #end if\n- ## A real command looks like: spades.py -k 21,33,55,77,99,127 --careful -1 Y.fastq.gz -2 X.fastq.gz -t 24 -o output\n- spades.py\n- ## Forces unzipped output, faster\n- --disable-gzip-output\n- $sc\n- $onlyassembler\n- $careful\n- -t \\${GALAXY_SLOTS:-16}\n- -k "$kmers"\n-\n- #if $cov.state == "auto":\n- --cov-cutoff \'auto\'\n- #elif $cov.state == "value":\n- --cov-cutoff \'$cov.cutoff\'\n- #end if\n- \n- $iontorrent\n- \n- ## Sequence files, libraries\n- #for $i, $library in enumerate( $libraries )\n- #set num=$i+1\n- #if str( $library.lib_type ) == "paired_end":\n- #set prefix = \'pe\'\n- #elif str( $library.lib_type ) == "mate_paired":\n- #set prefix = \'mp\'\n- #elif str( $library.lib_type ) == "nxmate_paired":\n- #set prefix = \'nxmate\'\n- #else:\n- #$set prefix = \'hqmp\'\n- #end if\n- --$prefix$num-$library.orientation \n- #for $file in $library.files\n-\t#if $file.file_type.type == "separate"\n- --$prefix$num-1 fastq:$file.file_type.fwd_reads\n- --$prefix$num-2 fastq:$file.file_type.rev_reads\n- #elif $file.file_type.type == "interleaved"\n- --$prefix$num-12 fastq:$file.file_type.interleaved_reads\n- #elif $file.file_type.type == "unpaired"\n- --$prefix$num-s fastq:$file.file_type.unpaired_reads\n- #elif $file.file_type.type == "paired-collection"\n- --$prefix$num-1 fastq:$file.file_type.fastq_collection.forward\n- --$prefix$num-2 fastq:$file.file_type.fastq_collection.reverse\n- #end if\n- #end for\n- #end for\n- ## PacBio reads\n- #for $i, $pacbiolib in enumerate( $pacbio )\n- --pacbio fastq:$pacbiolib.pacbio_reads\n- #end for\n- ## Nanopore\n- #for $i, $nanoporelib in enumerate( $nanopore )\n- --nanopore fastq:$nanoporelib.nanopore_reads\n- #end for\n- ## Sanger\n- #for $i, $sangerlib in enumerate( $sanger )\n- --sanger $sangerlib.file_type.type:$sangerlib.file_type.sanger_reads\n- #end for \n- ## Contigs\n- #for $i, $trustedcontigs in enumerate( $trustedcontigs )\n- --trusted-contigs $trustedcontigs.file_type.type:$trustedcontigs.file_type.trusted_contigs\n- #end for\n- #for $i, $untrustedcontigs in enumerate( $untrustedcontigs )\n- --untrusted-contigs $untrustedcontigs.file_type.type:$untrustedcontigs.file_type.untrusted_contigs\n- #end for\n- </command>\n- <inputs>\n- <param name="sc" type="boolean" truevalue="--sc" falsevalue="" label="Single-cell?" help="This option is required for MDA (single-cell) data.">\n- <option value="false">No</option>\n- <option value="true">Yes</option>\n- </param>\n- <param name="onlyassembler" type="boolean" truevalue="--only-assembler" falsevalue="" checked="False" label="Run only assembly? (without read error correction)" />\n- <param name="careful" type="boolean" truevalue="--careful" falsevalue="" checked="True" label="Careful correction?" help="Tries to reduce number of mismatches and short indels. Also runs MismatchCorrector \xe2\x80\x93 a post processing tool, which uses BWA tool (comes with SPAdes)." />\n- <param name="kmers" type="text" label="K-mers to use, separated by commas" value="21,33,55" help="Comma-separated list of k-mer sizes to be used (all values must be odd, less than 128, listed in asce'..b'onal name="file_type">\n-\t<param name="type" type="select" label="Select file format">\n-\t <option value="fasta">fasta</option>\n-\t <option value="fastq">fastq</option>\n-\t</param>\n-\t<when value="fasta">\n-\t <param name="trusted_contigs" type="data" format="fasta" label="Trusted contigs" help="FASTA format" />\n-\t</when>\n-\t<when value="fastq">\n-\t <param name="trusted_contigs" type="data" format="fastq" label="Trusted contigs" help="FASTQ format" />\n-\t</when>\n- </conditional>\n- </repeat>\n- <repeat name="untrustedcontigs" title="Untrusted contigs" help="Contigs of the same genome, quality of which is average or unknown. Contigs of poor quality can be used but may introduce errors in the assembly. This option is also not intended for contigs of the related species.">\n- <conditional name="file_type">\n-\t<param name="type" type="select" label="Select file format">\n-\t <option value="fasta">fasta</option>\n-\t <option value="fastq">fastq</option>\n-\t</param>\n-\t<when value="fasta">\n-\t <param name="untrusted_contigs" type="data" format="fasta" label="Untrusted contigs" help="FASTA format" />\n-\t</when>\n-\t<when value="fastq">\n-\t <param name="untrusted_contigs" type="data" format="fastq" label="Untrusted contigsz" help="FASTQ format" />\n-\t</when>\n- </conditional>\n- </repeat>\n- </inputs>\n- <outputs>\n- <data name="out_contigs" format="fasta" label="SPAdes contigs (fasta)" />\n- <data name="out_contig_stats" format="tabular" label="SPAdes contig stats" />\n- <data name="out_scaffolds" format="fasta" label="SPAdes scaffolds (fasta)" />\n- <data name="out_scaffold_stats" format="tabular" label="SPAdes scaffold stats" />\n- <data name="out_log" format="txt" label="SPAdes log" />\n- </outputs>\n- <!-- <tests>\n- <test>\n- <param name="sc" value="false" />\n- <param name="careful" value="false" />\n- <param name="kmers" value="33,55" />\n- <param name="type" value="pairedend" />\n- <param name="fwd_reads" value="ecoli_1K_1.fq" ftype="fastq" />\n- <param name="rev_reads" value="ecoli_1K_2.fq" ftype="fastq" />\n- <output name="out_contigs" file="reference_1K.fa" ftype="fasta" compare="re_match" lines_diff="1" />\n- </test>\n- </tests> -->\n- <help>\n-**What it does**\n-\n-SPAdes \xe2\x80\x93 St. Petersburg genome assembler \xe2\x80\x93 is intended for both standard isolates and single-cell MDA bacteria assemblies. See http://bioinf.spbau.ru/en/spades for more details on SPAdes.\n-\n-This wrapper runs SPAdes 3.5.0, collects the output, and throws away all the temporary files. It also produces a tab file with contig names, length and coverage. \n-\n-**SPAdes citation**\n-\n-Anton Bankevich, Sergey Nurk, Dmitry Antipov, Alexey A. Gurevich, Mikhail Dvorkin, Alexander S. Kulikov, Valery M. Lesin, Sergey I. Nikolenko, Son Pham, Andrey D. Prjibelski, Alexey V. Pyshkin, Alexander V. Sirotkin, Nikolay Vyahhi, Glenn Tesler, Max A. Alekseyev, and Pavel A. Pevzner. Journal of Computational Biology. May 2012, 19(5): 455-477. doi:10.1089/cmb.2012.0021. \n- \n-**License**\n-\n-SPAdes is developed by and copyrighted to Saint-Petersburg Academic University, and is released under GPLv2.\n-\n-This wrapper is copyrighted by Lionel Guy,Philip Mabon and is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n-\n-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n-\n-You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.\n-\n-** Acknowledgments **\n-\n-Anton Korobeynikov greatlty helped understanding how SPAdes work, and integrated handy features into SPAdes.\n-\n-Nicola Soranzo fixed various bugs.\n- </help>\n-</tool>\n' |
| b |
| diff -r 85c6121d92a5 -r 89004d4f8dd3 tools/spades_3_1_1/tools/spades_3_5_0/tool_dependencies.xml --- a/tools/spades_3_1_1/tools/spades_3_5_0/tool_dependencies.xml Tue Dec 16 12:57:49 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<tool_dependency> - <package name="spades" version="3.5.0"> - <install version="1.0"> - <actions> - <action type="download_by_url">http://spades.bioinf.spbau.ru/release3.5.0/SPAdes-3.5.0-Linux.tar.gz</action> - <!-- Copying the whole bin folder --> - <action type="make_directory">$INSTALL_DIR/bin</action> - <action type="make_directory">$INSTALL_DIR/share</action> - <action type="move_directory_files"> - <source_directory>bin</source_directory> - <destination_directory>$INSTALL_DIR/bin</destination_directory> - </action> - <action type="move_directory_files"> - <source_directory>share</source_directory> - <destination_directory>$INSTALL_DIR/share</destination_directory> - </action> - <!-- This is required to have spades accept .dat files --> - <!-- <action type="shell_command">sed -i -e "s/\('\.fa', '\.fasta', '\.fq', '\.fastq', '\.gz'\)/\\1, '.dat'/" $INSTALL_DIR/share/spades/spades_pipeline/support.py</action> --> - <!-- <action type="set_environment"> --> - <!-- <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable> --> - <!-- </action> --> - </actions> - </install> - <readme> -This installs SPAdes 3.5.0. - -See manual here http://spades.bioinf.spbau.ru/release3.5.0/manual.html -See also here http://bioinf.spbau.ru/en/spades - </readme> - </package> -</tool_dependency> - |