changeset 4:d75a74a93587 draft default tip

"planemo upload for repository https://github.com/juliechevalier/GIANT/tree/master commit 89b7d0e8812f53222691cffe29bd48be6519829d"
author vandelj
date Fri, 25 Sep 2020 08:52:29 +0000
parents dd0f4da5f68f
children
files galaxy/wrappers/ExprHeatmapClustering.xml src/utils.R
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/galaxy/wrappers/ExprHeatmapClustering.xml	Tue Sep 15 15:54:23 2020 +0000
+++ b/galaxy/wrappers/ExprHeatmapClustering.xml	Fri Sep 25 08:52:29 2020 +0000
@@ -1,4 +1,4 @@
-<tool name="GIANT-Heatmap and Hierarchical clustering" id="giant_hierarchical_clustering" version="0.5.3">
+<tool name="GIANT-Heatmap and Hierarchical clustering" id="giant_hierarchical_clustering" version="0.5.4">
   <description>Run hierarchical clustering and plot heatmap from expression data and/or differential expression analysis</description>
   <requirements>
     <requirement type="package" version="4.8.0">r-plotly</requirement>
--- a/src/utils.R	Tue Sep 15 15:54:23 2020 +0000
+++ b/src/utils.R	Fri Sep 25 08:52:29 2020 +0000
@@ -18,7 +18,7 @@
 distExtended <- function(x,method) {
   if(method %in% c("euclidean", "maximum", "manhattan", "canberra", "binary", "minkowski"))return(dist(x,method = method))
   if(method %in% c("pearson", "spearman", "kendall"))return(as.dist(1-cor(t(x),method=method))/2)
-  if(method %in% c("absPearson", "absSpearman", "absKendall"))return(as.dist(1-abs(cor(t(x),method=method))))
+  if(method %in% c("absPearson", "absSpearman", "absKendall"))return(as.dist(1-abs(cor(t(x),method=tolower(substr(method,4,15))))))
   return(NULL)
 }