With sync_mean to average synchrones: bad idea, will be removed

[epclust.git] / epclust / R / clustering.R

diff --git a/epclust/R/clustering.R b/epclust/R/clustering.R
index b09c1bc..a431ba8 100644 (file)
--- a/epclust/R/clustering.R
+++ b/epclust/R/clustering.R
@@ -76,7 +76,7 @@ clusteringTask2 = function(medoids, K2, algoClust2, getRefSeries, nb_ref_curves,
        distances = computeWerDists(synchrones, nbytes, endian, ncores_clust, verbose, parll)
        if (verbose)
                cat(paste("   algoClust2() on ",nrow(distances)," items\n", sep=""))
-       medoids[ algoClust2(distances,K2), ]
+       medoids[ ,algoClust2(distances,K2) ]
 }
 
 #' computeSynchrones
@@ -111,7 +111,7 @@ computeSynchrones = function(medoids, getRefSeries, nb_ref_curves,
                }
 
                ref_series = getRefSeries(indices)
-               nb_series = nrow(ref_series)
+               nb_series = ncol(ref_series)
 
                # Get medoids indices for this chunk of series
                mi = computeMedoidsIndices(medoids@address, ref_series)
@@ -318,16 +318,16 @@ computeWerDists = function(synchrones, nbytes,endian,ncores_clust=1,verbose=FALS
 {
        L = length(indices)
        nb_workers = floor( L / nb_per_set )
-       rem = L %% max_nb_per_set
+       rem = L %% nb_per_set
        if (nb_workers == 0 || (nb_workers==1 && rem==0))
        {
-               # L <= max_nb_per_set, simple case
+               # L <= nb_per_set, simple case
                indices_workers = list(indices)
        }
        else
        {
                indices_workers = lapply( seq_len(nb_workers), function(i)
-                       indices[(nb_per_chunk*(i-1)+1):(nb_per_set*i)] )
+                       indices[(nb_per_set*(i-1)+1):(nb_per_set*i)] )
                # Spread the remaining load among the workers
                rem = L %% nb_per_set
                while (rem > 0)