--- a/rna_quast.xml	Tue Oct 13 12:35:25 2020 +0000
+++ b/rna_quast.xml	Wed Oct 14 07:03:06 2020 +0000
@@ -1,7 +1,17 @@
-<tool id="rna_quast" name="rnaQUAST" version="@TOOL_VERSION@" python_template_version="3.7">
+<tool id="rna_quast" name="rnaQUAST" version="@TOOL_VERSION@">
     <description>A Quality Assessment Tool for De Novo Transcriptome Assemblies</description>
     <macros>
         <token name="@TOOL_VERSION@">2.1.0</token>
+        <xml name="element_matching_line" token_name="" token_expression="">
+            <element name="@NAME@">
+                <assert_contents><has_line_matching expression="@EXPRESSION@"/></assert_contents>
+            </element>
+        </xml>
+        <xml name="element_has_text" token_name="" token_text="">
+            <element name="@NAME@">
+                <assert_contents><has_text text="@TEXXT@"/></assert_contents>
+            </element>
+        </xml>
     </macros>
     <requirements>
         <requirement type="package" version="@TOOL_VERSION@">rnaquast</requirement>
@@ -82,7 +92,7 @@
                 <option value="false">No</option>
             </param>
             <when value="true">
-                <param name="gtf" argument="--gtf" type="data" format="gtf, gff, gff3" multiple="true" label="GTF/GFF file"/>
+                <param name="gtf" argument="--gtf" type="data" format="gtf,gff,gff3" multiple="true" label="GTF/GFF file"/>
                 <param argument="--disable_infer_genes" type="boolean" truevalue="--disable_infer_genes" falsevalue="" checked="false" label=" GTF file contains genes records?"/>
                 <param argument="--disable_infer_transcripts" type="boolean" truevalue="--disable_infer_transcripts" falsevalue="" checked="false" label="GTF file contains transcripts records?"/>
             </when>
@@ -128,19 +138,19 @@
             <discover_datasets ext="txt" pattern="(?P&lt;name&gt;.+)\.log"  directory="outputdir/logs/" visible="false" />
             <filter>"logs" in out_add</filter>
         </collection>
-        <collection name="list_comparison_png" type="list" label="${tool.name} on ${on_string}: comparison plots" >
+        <collection name="comparison_png" type="list" label="${tool.name} on ${on_string}: comparison plots" >
             <discover_datasets ext="png" pattern="(?P&lt;name&gt;.+)\.png"  directory="outputdir/comparison_output/" visible="false" recurse="true"/>
-            <filter> len(input)>1 and "plots" in out_add </filter>
+            <filter> len(input)>1 and "plots" in out_add</filter>
         </collection>
-        <collection name="list_comparison" type="list" label="${tool.name} on ${on_string}: comparison" >
+        <collection name="comparison" type="list" label="${tool.name} on ${on_string}: comparison" >
             <discover_datasets ext="txt" pattern="(?P&lt;name&gt;.+)\.txt"  directory="outputdir/comparison_output/" visible="false" recurse="true" />
             <filter> len(input)>1 and "comparison" in out_add</filter>
         </collection>
-        <collection name="data_collection" type="list:list" label="${tool.name} on ${on_string}: detailed output">
+        <collection name="details" type="list:list" label="${tool.name} on ${on_string}: detailed output">
             <discover_datasets pattern="(?P&lt;identifier_0&gt;.+)_____(?P&lt;identifier_1&gt;.+)\.(?P&lt;ext&gt;txt)" directory="details/" visible="false"/>
             <filter>"details" in out_add</filter>
         </collection>
-        <collection name="data_collection_png" type="list:list" label="${tool.name} on ${on_string}: detailed output plots">
+        <collection name="details_png" type="list:list" label="${tool.name} on ${on_string}: detailed output plots">
             <discover_datasets pattern="(?P&lt;identifier_0&gt;.+)_____(?P&lt;identifier_1&gt;.+)\.(?P&lt;ext&gt;png)" directory="details/" visible="false"/>
             <filter>"details_plots" in out_add</filter>
         </collection>
@@ -173,44 +183,16 @@
                     <has_line_matching expression="^METRICS/TRANSCRIPTS\tidba\tTrinity$"/>
                 </assert_contents>
             </output>
-            <output_collection name="list_comparison_png" type="list" count="15"/>
-            <output_collection name="list_comparison" type="list" count="19"/>
+            <output_collection name="comparison_png" type="list" count="15"/>
+            <output_collection name="comparison" type="list" count="19"/>
             <output_collection name="list_logs" type="list" count="8"/>
-            <output_collection name="data_collection" type="list:list" count="2">
-                <element name="Trinity">
-                    <element name="alignment_metrics">
-                        <assert_contents><has_line_matching expression="^METRICS/TRANSCRIPTS\s+Trinity\s+$"/></assert_contents>
-                    </element>
-                    <element name="alignment_multiplicity"/>
-                    <element name="alignments_per_isoform"/>
-                    <element name="basic_metrics"/>
-                    <element name="block_length"/>
-                    <element name="blocks_per_alignment"/>
-                    <element name="database_metrics"/>
-                    <element name="misassemblies"/>
-                    <element name="mismatch_rate"/>
-                    <element name="sensitivity"/>
-                    <element name="specificity"/>
-                    <element name="transcript_length"/>
-                    <element name="x-aligned"/>
-                    <element name="x-assembled_exons"/>
-                    <element name="x-assembled"/>
-                    <element name="x-covered_exons"/>
-                    <element name="x-covered"/>
-                    <element name="x-matched_blocks"/>
-                    <element name="x-matched"/>
-                </element>
-                <element name="idba">
-                    <element name="alignment_metrics">
-                        <assert_contents>
-                            <has_line_matching expression="^METRICS/TRANSCRIPTS\s+idba\s+$"/>
-                        </assert_contents>
-                    </element>
-                </element>
+            <output_collection name="details" type="list:list" count="2">
+                <output_collection name="Trinity" type="list" count="21"/>
+		        <output_collection name="idba" type="list" count="21"/>
             </output_collection>
         </test>
         <test expect_num_outputs="8">
-            <param name="input" value="spades.311.fasta" ftype="fasta" />
+            <param name="input" value="Trinity.fasta" ftype="fasta" />
             <conditional name="gene_coordinates">
                 <param name="use_gtf" value="false" />
             </conditional>
@@ -218,210 +200,74 @@
             <param name="lower_threshold" value="45" />
             <param name="upper_threshold" value="95"/>
             <param name="out_sr" value="txt,tex,tsv,pdf" />
-            <param name="out_add" value="logs" />
+            <param name="out_add" value="logs,details_plots" />
             <output name="short_report_pdf" file="short_report.pdf" compare="sim_size"/>
             <output name="short_report_txt" file="short_report.txt" compare="sim_size"/>
             <output name="short_report_tex" file="short_report.tex" compare="sim_size"/>
             <output name="short_report_tsv" file="short_report.tsv" compare="sim_size"/>
             <output_collection name="list_logs" type="list">
                 <element name="rnaQUAST" file="rnaQUAST"/>
-                <element name="spades.311.GeneMarkS_T.err" file="spades.311.GeneMarkS_T.err"/>
+                <element name="Trinity.GeneMarkS_T.err" file="spades.311.GeneMarkS_T.err"/>
             </output_collection>
-            <output_collection name="data_collection" type="list:list">
-                <element name="spades.311">
-                    <element name="alignment_metrics" file="spades.311/alignment_metrics.txt"/>
-                </element>
+            <output_collection name="details_png" type="list:list" count="1">
+                <output_collection name="Trinity" type="list" count="11"/>
             </output_collection>
         </test>
     </tests>
     <help><![CDATA[
-**What it does**
-rnaQUAST: a quality assessment tool for de novo transcriptome assemblies
-rnaQUAST—a tool for evaluating RNA-Seq assembly quality and benchmarking transcriptome assemblers using reference genome and gene database. rnaQUAST calculates various metrics that demonstrate completeness and correctness levels of the assembled transcripts, and outputs them in a user-friendly report.
+**What is rnaQUAST**
+- a quality assessment tool for de novo transcriptome assemblies
+- evaluating RNA-Seq assembly quality and benchmarking transcriptome assemblers using reference genome and gene database
+- calculates various metrics that demonstrate completeness and correctness levels of the assembled transcripts
     
-**Using rnaQuast without reference** you wont get: 
-- x_assebled PNG & Txt
-- x_assembled Exons PNG & Txt
-- Alignments per Isoform PNG & Txt
-- x_covered PNG & Txt
-- x_covered Exons PNG & Txt
-- x_matched PNG & Txt
-- x_matched PNG & Txt
-- x_matched Blocks PNG & Txt
-- gmap build out log
-- gmap build err log
+**Using rnaQuast without reference** you wont get:  
+  
+- x-assembled (Exons) 
+- Alignments per Isoform 
+- x-covered (Exons)
+- x-matched (Blocks)
+- gmap build logs
     
 **Using rnaQuast with reference** you will get:
-- PDF report
-- TXT report
-- TSV report
-- Log
-- Alignement Metrics
-- Basic Metrics
-- Misassemblies
-- Specificity
-- Sensitivity
+- Reports
+- Logs
+- Alignement/Basic Metrics
+- Misassemblies/ Specificity/ Sensitivity
 - Alignment multiplicity
-- Block lentgh
-- Blocks per alignment
-- Mismatch rate
-- Transcript length
-- x_aligned
-- Transcript Length PNG
-- Nx PNG
-- Block length PNG
-- Blocks per alignment PNG
-- gmap build out log
-- gmap build err log
-    
-**Using rnaQuast without gene coordinates** you wont get:
-- x_assebled PNG & Txt
-- x_assembled Exons PNG & Txt
-- Alignments per Isoform PNG & Txt
-- x_covered PNG & Txt
-- x_covered Exons PNG & Txt
-- x_matched PNG & Txt
-- x_matched PNG & Txt
-- x_matched Blocks PNG & Txt
-- gmap build out log
-- gmap build err log
-- Database Metrics
-- Alignment multiplicity PNG
-- Mismatch rate PNG
-- NAx PNG
-- x_aligned PNG
-**Using rnaQuast with gene coordinates** you will get: 
-- PDF report
-- TXT report
-- TSV report
-- Log
-- Alignement Metrics
-- Basic Metrics
-- Misassemblies
-- Specificity
-- Sensitivity
-- Alignment multiplicity
-- Block lentgh
+- Block/ Transcript Lentgh 
 - Blocks per alignment
 - Mismatch rate
-- Transcript length
-- x_aligned
-- Transcript Length PNG
-- Nx PNG
-- Block length PNG
-- Blocks per alignment PNG
-- gmap build out log
-- gmap build err log
+- x-aligned
+- Nx 
+- Blocks per alignment
+- gmap build logs
+    
+**Using rnaQuast without gene coordinates** you wont get:
+- x-assembled (Exons)
+- Alignments per Isoform
+- x-covered (Exons)
+- x-matched (Blocks)
+- gmap build logs
 - Database Metrics
-- Alignment multiplicity PNG
-- Mismatch rate PNG
-- NAx PNG
-- x_aligned PNG    
-**Using rnaQuast without drawing plots** you wont get any PNG's and txt-files of these + the PDF report
-*Output*
-**Reports**
-The following text files with reports are contained in comparison_output directory and include results for all input assemblies. In addition, these reports are contained in <assembly_label>_output directories for each assembly separately.
-database_metrics.txt
-Gene database metrics.
-- Genes / Protein coding genes – number of genes / protein coding genes
-- Isoforms / Protein coding isoforms – number of isoforms / protein coding isoforms
-- Exons / Introns – total number of exons / introns
-- Total / Average length of all isoforms, bp
-- Average exon length, bp
-- Average intron length, bp
-- Average / Maximum number of exons per isoform
-Database coverage – the total number of bases covered by reads (in all isoforms) divided by the total length of all isoforms.
-x%-covered genes / isoforms / exons – number of genes / isoforms / exons from the database that have at least x% of bases covered by all reads, where x is specified with lower_threshold /upper_threshold options (50% / 95% by default).
-basic_mertics.txt
-Basic transcripts metrics are calculated without reference genome and gene database.
-- Transcripts – total number of assembled transcripts.
-- Transcripts > 500 bp
-- Transcripts > 1000 bp
-- Average length of assembled transcripts
-- Longest transcript
-- Total length
-- Transcript N50 – a maximal number N, such that the total length of all transcripts longer than N bp is at least 50% of the total length of all transcripts.
-alignment_metrics.txt
-Alignment metrics are calculated with reference genome but without using gene database. To calculate the following metrics rnaQUAST filters all short partial alignments (see min_alignment option) and attempts to select the best hits for each transcript.
-- Transcripts – total number of assembled transcripts.
-- Aligned – the number of transcripts having at least 1 significant alignment.
-- Uniquely aligned – the number of transcripts having a single significant alignment.
-- Multiply aligned – the number of transcripts having 2 or more significant alignments. Multiply aligned transcripts are stored in <assembly_label>.paralogs.fasta file.
-- Misassembly candidates reported by GMAP (or BLAT) – transcripts that have discordant best-scored alignment (partial alignments that are either mapped to different strands / different chromosomes / in reverse order / too far away).
-- Unaligned – the number of transcripts without any significant alignments. Unaligned transcripts are stored in <assembly_label>.unaligned.fasta file.
-Number of assembled transcripts = Unaligned + Aligned = Unaligned + (Uniquely aligned + Multiply aligned + Misassembly candidates reported by GMAP (or BLAT)).
-Alignment metrics for non-misassembled transcripts
-- Average aligned fraction. Aligned fraction for a single transcript is defined as total number of aligned bases in the transcript divided by the total transcript length.
-- Average alignment length. Aligned length for a single transcript is defined as total number of aligned bases in the transcript.
-- Average blocks per alignment. A block is defined as a continuous alignment fragment without indels.
-- Average block length (see above).
-- Average mismatches per transcript – average number of single nucleotide differences with reference genome per transcript.
-- NA50 – N50 for alignments.
-misassemblies.txt
-- Transcripts – total number of assembled transcripts.
-- Misassembly candidates reported by GMAP (or BLAT) – transcripts that have discordant best-scored alignment (partial alignments that are either mapped to different strands / different chromosomes / in reverse order / too far away).
-- Misassembly candidates reported by BLASTN – transcripts are aligned to the isoform sequences extracted from the genome using gene database with BLASTN and then transcripts that have partial alignments to multiple isoforms are selected.
-- Misassemblies – misassembly candidates confirmed by both methods described above. Using both methods simultaneously allows to avoid considering misalignments that can be caused, for example, by paralogous genes or genomic repeats. Misassembled transcripts are stored in <assembly_label>.misassembled.fasta file.
-sensitivity.txt
-Assembly completeness (sensitivity). For the following metrics (calculated with reference genome and gene database) rnaQUAST attempts to select best-matching database isoforms for every transcript. Note that a single transcript can contribute to multiple isoforms in the case of, for example, paralogous genes or genomic repeats. At the same time, an isoform can be covered by multiple transcripts in the case of fragmented assembly or duplicated transcripts in the assembly.
-- Database coverage – the total number of bases covered by transcripts (in all isoforms) divided by the total length of all isoforms.
-- Duplication ratio – total number of aligned bases in assembled transcripts divided by the total number of isoform covered bases. This metric does not count neither paralogous genes nor shared exons, only real overlaps of the assembled sequences that are mapped to the same isoform.
-- Average number of transcripts mapped to one isoform.
-- x%-assembled genes / isoforms/ exons – number of genes / isoforms / exons from the database that have at least x% captured by a single assembled transcript, where x is specified with lower_threshold / upper_threshold options (50% / 95% by default). 95%-assembled isoforms are stored in <assembly_label>.95%assembled.fasta file.
-- x%-covered genes / isoforms– number of genes / isoforms from the database that have at least x% of bases covered by all alignments, where x is specified with lower_threshold / upper_threshold options (50% / 95% by default).
-- Mean isoform assembly – assembled fraction of a single isoform is calculated as the largest number of its bases captured by a single assembled transcript divided by its length; average value is computed for isoforms with > 0 bases covered.
-- Mean isoform coverage – coverage of a single isoform is calculated as the number of its bases covered by all assembled transcripts divided by its length; average value is computed for isoforms with > 0 bases covered.
-- Mean exon coverage – coverage of a single exon is calculated as the number of its bases covered by all assembled transcripts divided by its length; average value is computed for exons with > 0 bases covered.
-- Average percentage of isoform x%-covered exons, where x is specified with lower_threshold / upper_threshold options (50% / 95% by default). For each isoform rnaQUAST calculates the number of x%-covered exons divided by the total number of exons. Afterwards it computes average value for all covered isoforms.
-BUSCO metrics. The following metrics are calculated only when busco_lineage option is used (see options for details).
-- Complete – percentage of completely recovered genes.
-- Partial – percentage of partially recovered genes.
-GeneMarkS-T metrics. The following metrics are calculated when reference and gene database are not provided or gene_mark option is used (see options for details).
-- Genes – number of predicted genes in transcripts.
-specificity.txt
-Assembly specificity. To compute the following metrics we use only transcripts that have at least one significant alignment and are not misassembled.
-- Unannotated – total number of transcripts that do not cover any isoform from the database. Unannotated transcripts are stored in <assembly_label>.unannotated.fasta file.
-- x%-matched – total number of transcripts that have at least x% covering an isoform from the database, where x is specified with lower_threshold / upper_threshold options (50% / 95% by default).
-- Mean fraction of transcript matched – matched fraction of a single transcript is calculated as the number of its bases covering an isoform divided by the transcript length; average value is computed for transcripts with > 0 bases matched.
-- Mean fraction of block matched – matched fraction of a single block is calculated as the number of its bases covering an isoform divided by the block length; average value is computed for blocks with > 0 bases matched.
-- x%-matched blocks – percentage of blocks that have at least x% covering an isoform from the database, where x is specified with lower_threshold / upper_threshold options (50% / 95% by default).
-- Matched length – total number of transcript bases covering isoforms from the database.
-- Unmatched length – total alignment length - Matched length.
-relative_database_coverage.txt
-Relative database coverage metrics are calculated only when raw reads (or read alignments) are provided. rnaQUAST uses read alignments to estimate the upper bound of the database coverage and the number of x-covered genes / isoforms / exons (see read coverage) and computes the following metrics:
-- Relative database coverage – ratio between transcripts database coverage and reads database coverage.
-- Relative x%-assembled genes / isoforms / exons – ratio between transcripts x%-assembled and reads x%-covered genes / isoforms / exons.
-- Relative x%-covered genes / isoforms / exons – ratio between transcripts x%-covered and reads x%-covered genes / isoforms / exons.
-**Detailed output**
-These files are contained in <assembly_label>_output directories for each assembly separately.
-   - <assembly_label>.unaligned.fasta – transcripts without any significant alignments.
-   - <assembly_label>.paralogs.fasta – transcripts having 2 or more significant alignments.
-   - <assembly_label>.misassembled.fasta – misassembly candidates detected by methods described above. See misassemblies.txt description for details.
-   - <assembly_label>.correct.fasta – transcripts with exactly 1 significant alignment that do not contain misassemblies.
-   - <assembly_label>.x%-assembled.list – IDs of the isoforms from the database that have at least x% captured by a single assembled transcript, where x is specified by the user with an option upper_threshold (95% by default).
-   - <assembly_label>.unannotated.fasta – transcripts that do not cover any isoform from the database.
-The following text file is contained in comparison_output directory and <assembly_label>_output directories for each assembly separately.
-reads.x%-covered.list – IDs of the isoforms from the database that have at least x% bases covered by all reads, where x is specified with lower_threshold / upper_threshold options (50% / 95% by default).
-**Plots**
-The following plots are similarly contained in both comparison_output directory and <assembly_label>_output directories. Please note, that most of the plots represent cumulative distributions and some plots are given in logarithmic scale.
-Basic
-- transcript_length.png – assembled transcripts length distribution (+ database isoforms length distribution).
-- block_length.png – alignment blocks length distribution (+ database exons length distribution).
-- x-aligned.png – transcript aligned fraction distribution.
-- blocks_per_alignment.png – distribution of number of blocks per alignment (+ distribution of number of database exons per isoform).
-- alignment_multiplicity.png – distribution for the number of significant alignment for each multiply-aligned transcript.
-- mismatch_rate.png – substitution errors per alignment distribution.
-- Nx.png – Nx plot for transcripts. Nx is a maximal number N, such that the total length of all transcripts longer than N bp is at least x% of the total length of all transcripts.
-- NAx.png – Nx plot for alignments.
-**Sensitivity**
-- x-assembled.png – a histogram in which each bar represents the number of isoforms from the database that have at least x% captured by a single assembled transcript.
-- x-covered.png – a histogram in which each bar represents the number of isoforms from the database that have at least x% of bases covered by all alignments.
-- x-assembled_exons.png – a histogram in which each bar represents the number of exons from the database that have at least x% captured by a single assembled transcript.
-- x-covered_exons.png – a histogram in which each bar represents the number of exons from the database that have at least x% of bases covered by all alignments.
-- alignments_per_isoform.png – plot showing number of transcript alignments per isoform
-**Specificity**
-- x-matched.png – a histogram in which each bar represents the number of transcripts that have at least x% matched to an isoform from the database.
-- x-matched_blocks.png – a histogram in which each bar represents the number of all blocks from all transcript alignments that have at least x% matched to an isoform from the database.
+- Alignment multiplicity
+- Mismatch rate
+- NAx
+- x-aligned 
+**Using rnaQuast with gene coordinates** you will get:
+- Reports
+- Logs
+- Alignement/Basic Metrics
+- Misassemblies/Specificity/Sensitivity
+- Alignment multiplicity
+- Block/Transcript length
+- Blocks per alignment
+- Mismatch rate
+- x-aligned
+- Nx/NAx
+- gmap build logs
+- Database Metrics
+- Alignment multiplicity
+More informations, see citations.
     ]]></help>
     <citations>
         <citation type="doi">10.1093/bioinformatics/btw218 </citation>