projects
/
epclust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
save state; test clustering not OK, all others OK
[epclust.git]
/
epclust
/
R
/
clustering.R
diff --git
a/epclust/R/clustering.R
b/epclust/R/clustering.R
index
b09c1bc
..
8662f89
100644
(file)
--- a/
epclust/R/clustering.R
+++ b/
epclust/R/clustering.R
@@
-318,16
+318,16
@@
computeWerDists = function(synchrones, nbytes,endian,ncores_clust=1,verbose=FALS
{
L = length(indices)
nb_workers = floor( L / nb_per_set )
{
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))
{
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_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)
# Spread the remaining load among the workers
rem = L %% nb_per_set
while (rem > 0)