# HG changeset patch
# User peterjc
# Date 1384533894 18000
# Node ID 6e145e4715a7e9ed2afc2a15e8af834b824b936d
# Parent  6c899e228df3b9fb427cd766b363ca40418320b3
Uploaded v0.0.1b

diff -r 6c899e228df3 -r 6e145e4715a7 tools/clc_assembly_cell/clc_assembler.xml
--- a/tools/clc_assembly_cell/clc_assembler.xml	Thu Oct 31 07:59:32 2013 -0400
+++ b/tools/clc_assembly_cell/clc_assembler.xml	Fri Nov 15 11:44:54 2013 -0500
@@ -23,6 +23,7 @@
 #end if
 ##--------------------------------------
 #end for
+-m $min_contig_len
 -o "$out_fasta"
 --cpus \$GALAXY_SLOTS
 -v | grep -v "^Progress: "</command>
@@ -86,10 +87,10 @@
 		</when>
             </conditional>
         </repeat>
+	<param name="min_contig_len" type="integer" optional="false" min="1" value="200" label="Minimum contig length"/>
 	<!-- Word size? -->
 	<!-- Bubble size? -->
 	<!-- Scaffolding options? -->
-        <!-- Minimum contig length? -->
         <!-- AGP / GFF output? -->
     </inputs>
     <!-- min/max validation? <code file="clc_validator.py" /> -->
@@ -97,7 +98,19 @@
         <data name="out_fasta" format="fasta" label="CLCbio assember contigs (FASTA)" />
     </outputs>
     <tests>
-        <!-- TODO -->
+        <!-- Review this test once Galaxy handles repeat groups better
+        <test>
+            <param name="type" value="interleaved" />
+            <param name="placement" value="fb" />
+            <param name="dist_mode" value="ss" />
+            <param name="min_size" value="1" />
+            <param name="max_size" value="1000" />
+            <param name="dist_mode" value="ss" />
+            <param name="filename" value="SRR639755_mito_pairs.fastq.gz" ftype="fastqsanger" />
+            <param name="min_contig_len" value="200" />
+            <output name="out_fasta" file="SRR639755_mito_pairs.clc4_de_novo.fasta" ftype="fasta" />
+        </test>
+        -->
     </tests>
     <help>
 
diff -r 6c899e228df3 -r 6e145e4715a7 tools/clc_assembly_cell/clc_mapper.xml
--- a/tools/clc_assembly_cell/clc_mapper.xml	Thu Oct 31 07:59:32 2013 -0400
+++ b/tools/clc_assembly_cell/clc_mapper.xml	Fri Nov 15 11:44:54 2013 -0500
@@ -10,7 +10,7 @@
     <command>echo Mapping reads with clc_mapper...
 &amp;&amp; /mnt/apps/clcBio/clc-assembly-cell-4.1.0-linux_64/clc_mapper
 #for $ref in $references
-#if str($ref.type)=="circular"
+#if str($ref.ref_type)=="circular"
 -d -z "$ref.ref_file"
 #else
 -d "$ref.ref_file"
@@ -61,11 +61,11 @@
         <!-- Support linear and circular references (-z) -->
 	<repeat name="references" title="Reference Sequence" min="1">
             <param name="ref_file" type="data" format="fasta" required="true" label="Reference sequence(s) (FASTA)" />
-	    <param name="type" type="select" label="Reference type">
+            <param name="ref_type" type="select" label="Reference type">
                 <option value="linear">Linear (e.g. most chromosomes)</option>
                 <option value="circular">Circular (e.g. bacterial chromosomes, mitochondria)</option>
             </param>
-	</repeat>
+        </repeat>
         <repeat name="read_group" title="Read Group" min="1">
             <conditional name="segments">
                 <param name="type" type="select" label="Are these paired reads?">
@@ -125,13 +125,26 @@
         </repeat>
         <!-- Length fraction (-l), default 0.5 -->
         <!-- Similarity (-s), default 0.8 -->
-	<!-- Option for unmapped reads via clc_unmapped_reads ? -->
+        <!-- Option for unmapped reads via clc_unmapped_reads ? -->
     </inputs>
     <outputs>
         <data name="out_bam" format="bam" label="CLCbio mapping (BAM)" />
     </outputs>
     <tests>
-        <!-- TODO -->
+        <!-- TODO, actually test this... tricky due to single machine licence
+        <test>
+            <param name="ref_file" value="NC_010642.fna" ftype="fasta" />
+            <param name="ref_type" value="circular" />
+            <param name="type" value="interleaved" />
+            <param name="placement" value="fb" />
+            <param name="dist_mode" value="ss" />
+            <param name="min_size" value="1" />
+            <param name="max_size" value="1000" />
+            <param name="dist_mode" value="ss" />
+            <param name="filename" value="SRR639755_mito_pairs.fastq.gz" ftype="fastqsanger" />
+            <output name="out_fasta" file="SRR639755_mito_pairs_vs_NC_010642_clc.bam" ftype="bam" />
+        </test>
+        -->
     </tests>
     <help>