X-Git-Url: https://git.auder.net/images/pieces/Cwda/bg.svg?a=blobdiff_plain;f=epclust%2FR%2Fmain.R;h=28217c3f2e1d79e405a510a46699df120e7d430b;hb=a174b8ea1f322992068ab42810df017a2b9620ee;hp=977e61b235da2ea1ac4e0fc3c4cd40bbddcc049f;hpb=e161499b97c782aadfc287c22b55f85724f86fae;p=epclust.git

diff --git a/epclust/R/main.R b/epclust/R/main.R
index 977e61b..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))
 		}
@@ -234,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 = clusteringTask2(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)