diff Marea/marea_cluster.xml @ 28:e6831924df01 draft

small fixes (elbow plot and output managment)

--- a/Marea/marea_cluster.xml	Mon Oct 07 13:48:01 2019 -0400
+++ b/Marea/marea_cluster.xml	Mon Oct 14 05:01:08 2019 -0400
@@ -17,6 +17,7 @@
         --input $input
       	--tool_dir $__tool_directory__
         --out_log $log
+        --best_cluster $best_cluster
         --cluster_type ${data.clust_type}
         #if $data.clust_type == 'kmeans':
         	--k_min ${data.k_min}
@@ -46,7 +47,7 @@
                 	<option value="hierarchy">Agglomerative Hierarchical</option>
         	</param>
         	<when value="kmeans">
-        		<param name="k_min" argument="--k_min" type="integer" min="2" max="99" value="3" label="Min number of clusters (k) to be tested" />
+        		<param name="k_min" argument="--k_min" type="integer" min="1" max="99" value="3" label="Min number of clusters (k) to be tested" />
         		<param name="k_max" argument="--k_max" type="integer" min="3" max="99" value="5" label="Max number of clusters (k) to be tested" />
         		<param name="elbow" argument="--elbow" type="boolean" value="true" label="Draw the elbow plot from k-min to k-max"/>
         		<param name="silhouette" argument="--silhouette" type="boolean" value="true" label="Draw the Silhouette plot from k-min to k-max"/>
@@ -74,7 +75,8 @@
 
     <outputs>
         <data format="txt" name="log" label="${tool.name} - Log" />
-        <collection name="results" type="list" label="${tool.name} - Results">
+        <data format="tabular" name="best_cluster" label="${tool.name} - Best cluster" />
+        <collection name="results" type="list" label="${tool.name} - Plots and results">
             <discover_datasets pattern="__name_and_ext__" directory="clustering"/>
         </collection>
     </outputs>