X-Git-Url: https://git.auder.net/?p=epclust.git;a=blobdiff_plain;f=epclust%2FR%2FcomputeSynchrones.R;h=3a29546c8fed64636f9e2de286f38897b3c04dcc;hp=3c1959a62433282034a6176b8ec4b5c79f4b6af4;hb=074a48c472fcbdf99a36fae333dd8dbb568c06a0;hpb=c25d83a0ea7435d3c72ed74738be86ddcccd7e66

diff --git a/epclust/R/computeSynchrones.R b/epclust/R/computeSynchrones.R
index 3c1959a..3a29546 100644
--- 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)