X-Git-Url: https://git.auder.net/doc/html/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=epclust%2FR%2Fmain.R;h=bf31c87d6f18ed2e8b6f226a17859e0d098253dd;hb=af3ea94782db30c2fc1bd796d788dab5e1fb79ed;hp=9064dfaec6ee0bed2fa0a5544a093bab91141e5e;hpb=492cd9e74a79cbcc0ecde55fa3071a44b7e463dc;p=epclust.git
diff --git a/epclust/R/main.R b/epclust/R/main.R
index 9064dfa..bf31c87 100644
--- a/epclust/R/main.R
+++ b/epclust/R/main.R
@@ -222,9 +222,9 @@ claws = function(getSeries, K1, K2,
if (verbose)
cat("...Run final // stage 1 + stage 2\n")
indices_medoids = clusteringTask1(
- indices, getContribs, K1, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose)
- medoids = computeClusters2(getSeries(indices_medoids),
- K2, getRefSeries, nb_curves, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose)
+ indices, getContribs, K1, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose, parll)
+ medoids = computeClusters2(getSeries(indices_medoids), K2,
+ getRefSeries, nb_curves, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose, parll)
# Cleanup
unlink(bin_dir, recursive=TRUE)