diff --git a/R/method_clustering.R b/R/method_clustering.R index 741ca14..f8bb869 100644 --- a/R/method_clustering.R +++ b/R/method_clustering.R @@ -9,14 +9,14 @@ #' @param data The values that should be scored. #' @param span The maximum span of values considered to be in one cluster. #' @param weight The weight that will be given to the next largest cluster in -#' relation to the previous one. For example, if `weight` is 0.7 (the -#' default), the first cluster will weigh 1.0, the second 0.7, the third 0.49 +#' relation to the previous one. For example, if `weight` is 0.5 (the +#' default), the first cluster will weigh 1.0, the second 0.5, the third 0.25 #' etc. #' #' @return A score between 0.0 and 1.0 summarizing how much the data clusters. #' #' @export -clusteriness <- function(data, span = 100000, weight = 0.7) { +clusteriness <- function(data, span = 500000, weight = 0.5) { n <- length(data) # Return a score of 0.0 if there is just one or no value at all. @@ -65,8 +65,8 @@ clusteriness <- function(data, span = 100000, weight = 0.7) { clustering <- function(id = "clustering", name = "Clustering", description = "Clustering of genes", - span = 100000, - weight = 0.7) { + span = 500000, + weight = 0.5) { method( id = id, name = name, diff --git a/man/clusteriness.Rd b/man/clusteriness.Rd index 4fe22b2..7ddce27 100644 --- a/man/clusteriness.Rd +++ b/man/clusteriness.Rd @@ -4,7 +4,7 @@ \alias{clusteriness} \title{Perform a cluster analysis.} \usage{ -clusteriness(data, span = 1e+05, weight = 0.7) +clusteriness(data, span = 5e+05, weight = 0.5) } \arguments{ \item{data}{The values that should be scored.} @@ -12,8 +12,8 @@ clusteriness(data, span = 1e+05, weight = 0.7) \item{span}{The maximum span of values considered to be in one cluster.} \item{weight}{The weight that will be given to the next largest cluster in -relation to the previous one. For example, if \code{weight} is 0.7 (the -default), the first cluster will weigh 1.0, the second 0.7, the third 0.49 +relation to the previous one. For example, if \code{weight} is 0.5 (the +default), the first cluster will weigh 1.0, the second 0.5, the third 0.25 etc.} } \value{ diff --git a/man/clustering.Rd b/man/clustering.Rd index d0f8832..e5fdf43 100644 --- a/man/clustering.Rd +++ b/man/clustering.Rd @@ -8,8 +8,8 @@ clustering( id = "clustering", name = "Clustering", description = "Clustering of genes", - span = 1e+05, - weight = 0.7 + span = 5e+05, + weight = 0.5 ) } \arguments{