| Previous changeset 3:dd0f4da5f68f (2020-09-15) |
|
Commit message:
"planemo upload for repository https://github.com/juliechevalier/GIANT/tree/master commit 89b7d0e8812f53222691cffe29bd48be6519829d" |
|
modified:
galaxy/wrappers/ExprHeatmapClustering.xml src/utils.R |
| b |
| diff -r dd0f4da5f68f -r d75a74a93587 galaxy/wrappers/ExprHeatmapClustering.xml --- 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 |
| b |
| @@ -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> |
| b |
| diff -r dd0f4da5f68f -r d75a74a93587 src/utils.R --- a/src/utils.R Tue Sep 15 15:54:23 2020 +0000 +++ b/src/utils.R Fri Sep 25 08:52:29 2020 +0000 |
| b |
| @@ -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) } |