X-Git-Url: https://git.auder.net/?p=epclust.git;a=blobdiff_plain;f=epclust%2FR%2FcomputeSynchrones.R;h=f8d7a068f152c7daea73203033d6f64f9e179de0;hp=16bf0b44939fcd760b52ed5fff693e52a4dcfcee;hb=3fb6e823601002c44ffbf913e83c8d24cfa1e819;hpb=282342bafdc9ff65c5df98c6e2304d63b33b9fb2

diff --git a/epclust/R/computeSynchrones.R b/epclust/R/computeSynchrones.R
index 16bf0b4..f8d7a06 100644
--- a/epclust/R/computeSynchrones.R
+++ b/epclust/R/computeSynchrones.R
@@ -1,10 +1,11 @@
 #' computeSynchrones
 #'
-#' Compute the synchrones curves (sum of clusters elements) from a matrix of medoids,
+#' Compute the synchrones curves (sums of clusters elements) from a matrix of medoids,
 #' using euclidian distance.
 #'
-#' @param medoids matrix of medoids in columns (curves of same length as the series)
-#' @param getSeries Function to retrieve series (argument: 'indices', integer vector)
+#' @param medoids matrix of K medoids curves in columns
+#' @param getSeries Function to retrieve series (argument: 'indices', integer vector),
+#'   as columns of a matrix
 #' @param nb_curves How many series? (this is known, at this stage)
 #' @inheritParams claws
 #'
@@ -12,16 +13,15 @@
 #'
 #' @export
 computeSynchrones <- function(medoids, getSeries, nb_curves,
-	nb_series_per_chunk, ncores_clust=1,verbose=FALSE,parll=TRUE)
+	nb_series_per_chunk, ncores_clust=3, verbose=FALSE, parll=TRUE)
 {
 	# Synchrones computation is embarassingly parallel: compute it by chunks of series
 	computeSynchronesChunk <- function(indices)
 	{
 		if (parll)
 		{
-			require("bigmemory", quietly=TRUE)
-			requireNamespace("synchronicity", quietly=TRUE)
 			require("epclust", quietly=TRUE)
+			requireNamespace("synchronicity", quietly=TRUE)
 			# The big.matrix objects need to be attached to be usable on the workers
 			synchrones <- bigmemory::attach.big.matrix(synchrones_desc)
 			medoids <- bigmemory::attach.big.matrix(medoids_desc)
@@ -66,7 +66,11 @@ computeSynchrones <- function(medoids, getSeries, nb_curves,
 		medoids <- bigmemory::as.big.matrix(medoids)
 		medoids_desc <- bigmemory::describe(medoids)
 		# outfile=="" to see stderr/stdout on terminal
-		cl <- parallel::makeCluster(ncores_clust, outfile="")
+		cl <-
+			if (verbose)
+				parallel::makeCluster(ncores_clust, outfile="")
+			else
+				parallel::makeCluster(ncores_clust)
 		parallel::clusterExport(cl, envir=environment(),
 			varlist=c("synchrones_desc","m_desc","medoids_desc","getSeries"))
 	}