From: Benjamin Auder <benjamin.auder@somewhere>
Date: Fri, 3 Mar 2017 09:59:16 +0000 (+0100)
Subject: 'update'
X-Git-Url: https://git.auder.net/%7B%7B%20asset%28%27mixstore/css/user/board.css%27%29%20%7D%7D?a=commitdiff_plain;h=74f571a72fd63ae92466d944a9ab4a111d177121;p=epclust.git

'update'
---

diff --git a/epclust/R/clustering.R b/epclust/R/clustering.R
index 077becf..42e894c 100644
--- a/epclust/R/clustering.R
+++ b/epclust/R/clustering.R
@@ -15,6 +15,7 @@ clusteringTask = function(K1, K2, WER, nb_series_per_chunk, indices_tasks, ncore
 			indices_workers[[i]] = indices_clust[(nb_series_per_chunk*(i-1)+1):upper_bound]
 		}
 		indices_clust = parallel::parLapply(cl, indices_workers, clusterChunk, K1, K2*(WER=="mix"))
+		# TODO: soft condition between K2 and K1, before applying final WER step
 		if ((WER=="end" && length(indices_clust)==K1) || (WER=="mix" && length(indices_clust)==K2))
 			break
 	}
diff --git a/epclust/R/computeCoeffs.R b/epclust/R/computeCoeffs.R
index 5bc4744..6ca55ee 100644
--- a/epclust/R/computeCoeffs.R
+++ b/epclust/R/computeCoeffs.R
@@ -27,7 +27,7 @@ computeCoeffs = function(data, index, nb_series_per_chunk, wf)
 	coeffs_chunk
 }
 
-#NOTE: always keep ID in first column
+#NOTE: always keep ID in first column (...? is it good ?!)
 curvesToCoeffs = function(series, wf)
 {
 	if (!require(wavelets, quietly=TRUE))