projects
/
epclust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improvements
[epclust.git]
/
epclust
/
R
/
main.R
diff --git
a/epclust/R/main.R
b/epclust/R/main.R
index
2037dbe
..
977e61b
100644
(file)
--- a/
epclust/R/main.R
+++ b/
epclust/R/main.R
@@
-186,7
+186,12
@@
claws = function(getSeries, K1, K2,
indices_all[((i-1)*nb_series_per_task+1):upper_bound]
})
if (verbose)
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)
if (WER=="mix")
{synchrones_file = paste(bin_dir,"synchrones",sep="") ; unlink(synchrones_file)}
if (parll && ntasks>1)
@@
-229,7
+234,7
@@
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) )
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 = c
omputeClusters
2(medoids1, K2,
+ medoids2 = c
lusteringTask
2(medoids1, K2,
getRefSeries, nb_curves, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose, parll)
# Cleanup
getRefSeries, nb_curves, nb_series_per_chunk, ncores_tasks*ncores_clust, verbose, parll)
# Cleanup