X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=epclust%2FR%2Fmain.R;h=892c64c631ffafc67058e5d491ba6e86923ca4ba;hb=95b5c2e621af8949c5a5eed287d451817c16c24e;hp=bba0618899d4c26a97746f0ae702a51560fa0abe;hpb=c45fd66342e40c8b5387fc6f0059c4d3a9718340;p=epclust.git

diff --git a/epclust/R/main.R b/epclust/R/main.R
index bba0618..892c64c 100644
--- a/epclust/R/main.R
+++ b/epclust/R/main.R
@@ -144,7 +144,7 @@ claws = function(getSeries, K1, K2,
 		getSeries = function(inds) getDataInFile(inds, series_file, nbytes, endian)
 	}
 
-	# Serialize all computed wavelets contributions onto a file
+	# Serialize all computed wavelets contributions into a file
 	contribs_file = paste(bin_dir,"contribs",sep="") ; unlink(contribs_file)
 	index = 1
 	nb_curves = 0
@@ -169,6 +169,15 @@ claws = function(getSeries, K1, K2,
 			inds, getContribs, K1, nb_series_per_chunk, ncores_clust, verbose, parll)
 		if (WER=="mix")
 		{
+
+
+
+
+#TODO: getSeries(indices_medoids) BAD ; il faudrait une big.matrix de medoids en entree
+			#OK en RAM il y en aura 1000 (donc 1000*K1*17519... OK)
+			#...mais du coup chaque process ne re-dupliquera pas medoids
+
+
 			medoids2 = computeClusters2(getSeries(indices_medoids),
 				K2, getSeries, nb_curves, nb_series_per_chunk, ncores_clust, verbose, parll)
 			binarize(medoids2, synchrones_file, nb_series_per_chunk, sep, nbytes, endian)
@@ -221,6 +230,10 @@ claws = function(getSeries, K1, K2,
 			contribs_file, nb_series_per_chunk, nbytes, endian)
 	}
 
+
+
+#TODO: if ntasks==1, c'est deja terminé
+
 	# Run step2 on resulting indices or series (from file)
 	if (verbose)
 		cat("...Run final // stage 1 + stage 2\n")