Remove parll arg (redundant with ncores_XX)

[epclust.git] / epclust / R / computeWerDists.R

diff --git a/epclust/R/computeWerDists.R b/epclust/R/computeWerDists.R
index 4dbcb7b..5f12896 100644 (file)
--- a/epclust/R/computeWerDists.R
+++ b/epclust/R/computeWerDists.R
@@ -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