X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=epclust%2FR%2Fmain.R;h=28217c3f2e1d79e405a510a46699df120e7d430b;hb=a174b8ea1f322992068ab42810df017a2b9620ee;hp=2037dbe1e12360778f91869614ca96baff63e8cf;hpb=bf5c08443087a23ea3d1a7ab993568e608a8b5dd;p=epclust.git

diff --git a/epclust/R/main.R b/epclust/R/main.R
index 2037dbe..28217c3 100644
--- a/epclust/R/main.R
+++ b/epclust/R/main.R
@@ -170,9 +170,10 @@ claws = function(getSeries, K1, K2,
 			inds, getContribs, K1, nb_series_per_chunk, ncores_clust, verbose, parll)
 		if (WER=="mix")
 		{
+			require("bigmemory", quietly=TRUE)
 			medoids1 = bigmemory::as.big.matrix( getSeries(indices_medoids) )
-			medoids2 = clusteringTask2(medoids1,
-				K2, getSeries, nb_curves, nb_series_per_chunk, ncores_clust, verbose, parll)
+			medoids2 = clusteringTask2(medoids1, K2, getSeries, nb_curves, nb_series_per_chunk,
+				nbytes, endian, ncores_clust, verbose, parll)
 			binarize(medoids2, synchrones_file, nb_series_per_chunk, sep, nbytes, endian)
 			return (vector("integer",0))
 		}
@@ -186,7 +187,12 @@ claws = function(getSeries, K1, K2,
 		indices_all[((i-1)*nb_series_per_task+1):upper_bound]
 	})
 	if (verbose)
-		cat(paste("...Run ",ntasks," x stage 1 in parallel\n",sep=""))
+	{
+		message = paste("...Run ",ntasks," x stage 1", sep="")
+		if (WER=="mix")
+			message = paste(message," + stage 2", sep="")
+		cat(paste(message,"\n", sep=""))
+	}
 	if (WER=="mix")
 		{synchrones_file = paste(bin_dir,"synchrones",sep="") ; unlink(synchrones_file)}
 	if (parll && ntasks>1)
@@ -229,8 +235,8 @@ claws = function(getSeries, K1, K2,
 	indices_medoids = clusteringTask1(
 		indices, getContribs, K1, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose, parll)
 	medoids1 = bigmemory::as.big.matrix( getSeries(indices_medoids) )
-	medoids2 = computeClusters2(medoids1, K2,
-		getRefSeries, nb_curves, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose, parll)
+	medoids2 = clusteringTask2(medoids1, K2, getRefSeries, nb_curves, nb_series_per_chunk,
+		nbytes, endian, ncores_tasks*ncores_clust, verbose, parll)
 
 	# Cleanup
 	unlink(bin_dir, recursive=TRUE)