X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=epclust%2FR%2FcomputeWerDists.R;h=0ad5404e07fffa9ac0524b27ee7f5ad6961dc2c4;hb=14c10f2d252f45349e0b4fbf87e17dfbfae39f92;hp=4dbcb7b8ca09c4c0f6202adb2f114b02311ec8e9;hpb=e0154a59e55143dac0fbd2a4739a3509bc958e76;p=epclust.git

diff --git a/epclust/R/computeWerDists.R b/epclust/R/computeWerDists.R
index 4dbcb7b..0ad5404 100644
--- a/epclust/R/computeWerDists.R
+++ b/epclust/R/computeWerDists.R
@@ -3,8 +3,8 @@
 #' Compute the WER distances between the series at specified indices, which are
 #' obtaind by \code{getSeries(indices)}
 #'
-#' @param indices Range of series indices to cluster
-#' @param getSeries Function to retrieve series (argument: 'indices', integer vector),
+#' @param indices Indices of the series to consider
+#' @param getSeries Function to retrieve series (argument: 'inds', integer vector),
 #'   as columns of a matrix
 #' @param ncores Number of cores for parallel runs
 #' @inheritParams claws
@@ -12,8 +12,8 @@
 #' @return A distances matrix of size K x K where K == length(indices)
 #'
 #' @export
-computeWerDists <- function(indices, getSeries, nb_series_per_chunk, smooth_lvl, nvoice,
-	nbytes, endian, ncores=3, verbose=FALSE, parll=TRUE)
+computeWerDists <- function(indices, getSeries, nb_series_per_chunk, smooth_lvl=3, nvoice=4,
+	nbytes=4, endian=.Platform$endian, ncores=3, verbose=FALSE)
 {
 	n <- length(indices)
 	L <- length(getSeries(1)) #TODO: not very neat way to get L
@@ -97,6 +97,7 @@ computeWerDists <- function(indices, getSeries, nb_series_per_chunk, smooth_lvl,
 	for (inds in indices_cwt)
 		computeSaveCWT(inds)
 
+	parll <- (ncores > 1)
 	if (parll)
 	{
 		# outfile=="" to see stderr/stdout on terminal