# HG changeset patch
# User bgruening
# Date 1387029521 18000
# Node ID aea72b24dea0f79aa0b234a588a03d73998bc632
# Parent  baf4283e2d7f66040a5c15559a389dfa0432bc56
Uploaded

diff -r baf4283e2d7f -r aea72b24dea0 deepTools_macros.xml
--- a/deepTools_macros.xml	Sat Dec 14 07:00:55 2013 -0500
+++ b/deepTools_macros.xml	Sat Dec 14 08:58:41 2013 -0500
@@ -62,6 +62,7 @@
             <regex match="Error:" />
             <regex match="Exception:" />
             <regex match="EXception:" />
+            <regex match="Traceback" />
         </stdio>
     </macro>
     <token name="@REFERENCES@">
diff -r baf4283e2d7f -r aea72b24dea0 heatmapper.xml
--- a/heatmapper.xml	Sat Dec 14 07:00:55 2013 -0500
+++ b/heatmapper.xml	Sat Dec 14 08:58:41 2013 -0500
@@ -79,6 +79,13 @@
             #end if
 
             $advancedOpt.onePlotPerGroup
+
+            #if $advancedOpt.clustering.clustering_options == 'kmeans':
+                #if int($advancedOpt.clustering.k_kmeans) > 0:
+                    --kmeans $advancedOpt.clustering.k_kmeans
+                #end if
+            #end if
+
         #end if
     </command>
     <inputs>
@@ -151,6 +158,20 @@
                 <param name="regionsLabel" type="text" value="genes" size="30" label="Labels for the regions plotted in the heatmap" help="If more than one region is being plotted a list of labels separated by comma and limited by quotes, is required. For example, &quot;label1, label2&quot;."/>
                 <param name="plotTitle" type="text" value="" size="30" label="Title of the plot" help="Title of the plot, to be printed on top of the generated image. Leave blank for no title." />
                 <param name="onePlotPerGroup" type="boolean" truevalue="--onePlotPerGroup" falsevalue="" label="Do one plot per group" help="When the region file contains groups separated by &quot;#&quot;, the default is to plot the averages for the distinct plots in one plot. If this option is set, each group will get its own plot, stacked on top of each other."/>
+
+                <conditional name="clustering">
+                    <param name="clustering_options" type="select" label="Clustering algorithm">
+                        <option value="none">No clustering</option>
+                        <option value="kmeans">Kmeans clustering</option>
+                    </param>
+                    <when value="kmeans">
+                        <param name="k_kmeans" type="integer" value="0" label="Number of clusters to compute" 
+                            help="When this option is set, then the matrix is split into clusters using the kmeans algorithm. Only works for data that is not grouped, otherwise only the first group will be clustered. If more specific clustering methods are required it is advisable to save the underlying matrix and run the clustering using other software. The plotting of the clustering may fail (Error: Segmentation fault) if a cluster has very few members compared to the total number or regions. (default: None)."/>
+                    </when>
+                    <when value="none" />
+                </conditional>
+
+
             </when>
         </conditional>
     </inputs>