From: Benjamin Auder Date: Fri, 10 Mar 2017 11:38:09 +0000 (+0100) Subject: 'update' X-Git-Url: https://git.auder.net/?p=epclust.git;a=commitdiff_plain;h=bccecb19b4faa20808dab761d30f2d2dd4dcf587;hp=2b9f5356793c245a5e10229a74ac0dabd8f62508 'update' --- diff --git a/epclust/R/main.R b/epclust/R/main.R index cbc92b1..31ce390 100644 --- a/epclust/R/main.R +++ b/epclust/R/main.R @@ -304,8 +304,8 @@ claws <- function(getSeries, K1, K2, nb_per_chunk, if (WER=="mix") { indices = seq_len(ntasks*K2) - # Now series must be retrieved from synchrones_file - getSeries = function(inds) getDataInFile(inds, synchrones_file, nbytes, endian) + # Now series (synchrones) must be retrieved from medoids_file + getSeries = function(inds) getDataInFile(inds, medoids_file, nbytes, endian) # Contributions must be re-computed unlink(contribs_file) index = 1 @@ -316,6 +316,9 @@ claws <- function(getSeries, K1, K2, nb_per_chunk, contribs_file, nb_series_per_chunk, nbytes, endian) } +#TODO: check THAT + + # Run step2 on resulting indices or series (from file) if (verbose) cat("...Run final // stage 1 + stage 2\n")