Mercurial > repos > rnateam > graphclust_postprocessing

diff glob_report.xml @ 6:869a6e807d76 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/eteriSokhoyan/galaxytools/tree/branchForIterations/tools/GraphClust/CollectResults commit 057c2fd398055dc86eb2c00d8a74f301d5c231d9-dirty
author rnateam
date Wed, 22 Feb 2017 16:51:06 -0500
parents 4310ac018d05
children 870dfc90473f
line wrap: on
line diff
--- a/glob_report.xml	Sat Jan 21 17:39:21 2017 -0500
+++ b/glob_report.xml	Wed Feb 22 16:51:06 2017 -0500
@@ -1,6 +1,6 @@
 <tool id="glob_report" name="Report_Results" version="0.1">
   <requirements>
-    <requirement type="package" version="0.1.7">graphclust-wrappers</requirement>
+    <requirement type="package" version="0.1.8">graphclust-wrappers</requirement>
     <requirement type="package" version='0.5'>perl-array-utils</requirement>
     <requirement type="package" version='0.18.1'>scikit-learn</requirement>
     <requirement type="package" version='1.8.10'>locarna</requirement>
@@ -29,7 +29,7 @@
             #set $inputFilesTrees += str($mods)+','
         #end for
         #set $inputFilesTrees = $inputFilesTrees[:-1]
-        'glob_res.pl'
+      'glob_res.pl'
                 '$inputFiles'
                 $merge_cluster_ol
                 $merge_overlap
@@ -158,8 +158,8 @@
   <tests>
     <test>
       <param name="FASTA" value="FASTA.zip" ftype="searchgui_archive"/>
-      <param name="cmsearch_results" value="1.tabular,2.tabular"/>
-      <param name="model_tree_files" value="1.1.model.tree.fa,1.2.model.tree.fa"/>
+      <param name="cmsearch_results" value="1.tabular,2.tabular,3.tabular,4.tabular,5.tabular"/>
+      <param name="model_tree_files" value="1.1.model.tree.fa,1.2.model.tree.fa,1.3.model.tree.fa,1.4.model.tree.fa,1.5.model.tree.fa"/>
       <param name="partition_type" value="0"/>
       <param name="cut_type" value="0"/>
       <conditional name="iteration_num">
@@ -175,19 +175,23 @@
       <output_collection name="clusters" type="list">
         <element name="1.cluster.all" file="RESULTS/1.cluster.all" compare="contains"/>
         <element name="2.cluster.all" file="RESULTS/2.cluster.all" compare="contains"/>
+        <element name="3.cluster.all" file="RESULTS/3.cluster.all" compare="contains"/>
+        <element name="4.cluster.all" file="RESULTS/4.cluster.all" compare="contains"/>
       </output_collection>
       <output_collection name="partitions">
         <element name="final_overlap.map" file="RESULTS/partitions/final_overlap.map" compare="contains">
           <assert_contents>
-            <has_text text="1.1  1.1" />
-            <has_text text="1.2  1.2" />
+            <has_text text="1.1  1.1  1.2" />
+            <has_text text="1.3  1.3" />
+            <has_text text="1.4  1.4" />
+            <has_text text="1.5  1.5 " />
           </assert_contents>
         </element>
         <element name="final_overlap.matrix" file="RESULTS/partitions/final_overlap.matrix" compare="contains">
           <assert_contents>
-            <has_text text="MODEL CLASS 0 0" />
-            <has_text text="1.2" />
-            <has_text text="1.1" />
+            <has_text text="MODEL CLASS 0 0 0 0 0" />
+            <!--has_text text="1.2" />
+            <has_text text="1.1" /-->
           </assert_contents>
         </element>
         <element name="final_partition.hard.best" file="RESULTS/partitions/final_partition.hard.best" />
@@ -199,10 +203,14 @@
       <output_collection name="topSecondaryStruct" type="list">
         <element name="1.cluster.top5.alirna.png" file="1.cluster.top5.alirna.png" ftype="png" compare="sim_size" />
         <element name="2.cluster.top5.alirna.png" file="2.cluster.top5.alirna.png" ftype="png" compare="sim_size" />
+        <element name="3.cluster.top5.alirna.png" file="3.cluster.top5.alirna.png" ftype="png" compare="sim_size" />
+        <element name="4.cluster.top5.alirna.png" file="4.cluster.top5.alirna.png" ftype="png" compare="sim_size" />
       </output_collection>
       <output_collection name="topDot" type="list">
         <element name="1.cluster.top5.aln.png" file="1.cluster.top5.aln.png"  ftype="png" compare="sim_size" />
         <element name="2.cluster.top5.aln.png" file="2.cluster.top5.aln.png"  ftype="png" compare="sim_size" />
+        <element name="3.cluster.top5.aln.png" file="3.cluster.top5.aln.png"  ftype="png" compare="sim_size" />
+        <element name="4.cluster.top5.aln.png" file="4.cluster.top5.aln.png"  ftype="png" compare="sim_size" />
       </output_collection>
       <output name="RESULTS_zip" file="RESULTS.zip" ftype="zip" compare="sim_size" />