comparison Marea/marea_cluster.xml @ 28:e6831924df01 draft

small fixes (elbow plot and output managment)
author bimib
date Mon, 14 Oct 2019 05:01:08 -0400
parents 8c480c977a12
children 9fcb0e8d6d47
comparison
equal deleted inserted replaced
27:8c480c977a12 28:e6831924df01
15 <![CDATA[ 15 <![CDATA[
16 python $__tool_directory__/marea_cluster.py 16 python $__tool_directory__/marea_cluster.py
17 --input $input 17 --input $input
18 --tool_dir $__tool_directory__ 18 --tool_dir $__tool_directory__
19 --out_log $log 19 --out_log $log
20 --best_cluster $best_cluster
20 --cluster_type ${data.clust_type} 21 --cluster_type ${data.clust_type}
21 #if $data.clust_type == 'kmeans': 22 #if $data.clust_type == 'kmeans':
22 --k_min ${data.k_min} 23 --k_min ${data.k_min}
23 --k_max ${data.k_max} 24 --k_max ${data.k_max}
24 --elbow ${data.elbow} 25 --elbow ${data.elbow}
44 <option value="kmeans" selected="true">KMeans</option> 45 <option value="kmeans" selected="true">KMeans</option>
45 <option value="dbscan">DBSCAN</option> 46 <option value="dbscan">DBSCAN</option>
46 <option value="hierarchy">Agglomerative Hierarchical</option> 47 <option value="hierarchy">Agglomerative Hierarchical</option>
47 </param> 48 </param>
48 <when value="kmeans"> 49 <when value="kmeans">
49 <param name="k_min" argument="--k_min" type="integer" min="2" max="99" value="3" label="Min number of clusters (k) to be tested" /> 50 <param name="k_min" argument="--k_min" type="integer" min="1" max="99" value="3" label="Min number of clusters (k) to be tested" />
50 <param name="k_max" argument="--k_max" type="integer" min="3" max="99" value="5" label="Max number of clusters (k) to be tested" /> 51 <param name="k_max" argument="--k_max" type="integer" min="3" max="99" value="5" label="Max number of clusters (k) to be tested" />
51 <param name="elbow" argument="--elbow" type="boolean" value="true" label="Draw the elbow plot from k-min to k-max"/> 52 <param name="elbow" argument="--elbow" type="boolean" value="true" label="Draw the elbow plot from k-min to k-max"/>
52 <param name="silhouette" argument="--silhouette" type="boolean" value="true" label="Draw the Silhouette plot from k-min to k-max"/> 53 <param name="silhouette" argument="--silhouette" type="boolean" value="true" label="Draw the Silhouette plot from k-min to k-max"/>
53 </when> 54 </when>
54 <when value="dbscan"> 55 <when value="dbscan">
72 </conditional> 73 </conditional>
73 </inputs> 74 </inputs>
74 75
75 <outputs> 76 <outputs>
76 <data format="txt" name="log" label="${tool.name} - Log" /> 77 <data format="txt" name="log" label="${tool.name} - Log" />
77 <collection name="results" type="list" label="${tool.name} - Results"> 78 <data format="tabular" name="best_cluster" label="${tool.name} - Best cluster" />
79 <collection name="results" type="list" label="${tool.name} - Plots and results">
78 <discover_datasets pattern="__name_and_ext__" directory="clustering"/> 80 <discover_datasets pattern="__name_and_ext__" directory="clustering"/>
79 </collection> 81 </collection>
80 </outputs> 82 </outputs>
81 <help> 83 <help>
82 <![CDATA[ 84 <![CDATA[