Remove parll arg (redundant with ncores_XX)

[epclust.git] / epclust / R / computeSynchrones.R

diff --git a/epclust/R/computeSynchrones.R b/epclust/R/computeSynchrones.R
index 3c1959a..3a29546 100644 (file)
--- a/epclust/R/computeSynchrones.R
+++ b/epclust/R/computeSynchrones.R
@@ -12,7 +12,7 @@
 #'
 #' @export
 computeSynchrones <- function(medoids, getSeries, nb_curves,
-       nb_series_per_chunk, ncores=3, verbose=FALSE, parll=TRUE)
+       nb_series_per_chunk, ncores=3, verbose=FALSE)
 {
        # Synchrones computation is embarassingly parallel: compute it by chunks of series
        computeSynchronesChunk <- function(indices)
@@ -43,7 +43,7 @@ computeSynchrones <- function(medoids, getSeries, nb_curves,
        # Use bigmemory (shared==TRUE by default) + synchronicity to fill synchrones in //
        synchrones <- bigmemory::big.matrix(nrow=L, ncol=K, type="double", init=0.)
        # NOTE: synchronicity is only for Linux & MacOS; on Windows: run sequentially
-       parll <- (parll && requireNamespace("synchronicity",quietly=TRUE)
+       parll <- (ncores > 1 && requireNamespace("synchronicity",quietly=TRUE)
                && Sys.info()['sysname'] != "Windows")
 
        if (parll)