X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=epclust%2FR%2Fclustering.R;h=a431ba86e6120aef106fdce8712eb52a5ef3c4b0;hb=9f05a4a0b703deffd7bdb9cd99b0aaa2246a5c83;hp=b09c1bc1c899caf4b3f701db435747dc0c03f624;hpb=0486fbadb122cb4d78c5d9f248c29800a59eb24e;p=epclust.git

diff --git a/epclust/R/clustering.R b/epclust/R/clustering.R
index b09c1bc..a431ba8 100644
--- 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)