projects
/
epclust.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b9f535
)
'update'
author
Benjamin Auder
<benjamin.auder@somewhere>
Fri, 10 Mar 2017 11:38:09 +0000
(12:38 +0100)
committer
Benjamin Auder
<benjamin.auder@somewhere>
Fri, 10 Mar 2017 11:38:09 +0000
(12:38 +0100)
epclust/R/main.R
patch
|
blob
|
blame
|
history
diff --git
a/epclust/R/main.R
b/epclust/R/main.R
index
cbc92b1
..
31ce390
100644
(file)
--- 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)
if (WER=="mix")
{
indices = seq_len(ntasks*K2)
- # Now series
must be retrieved from synchrone
s_file
- getSeries = function(inds) getDataInFile(inds,
synchrone
s_file, nbytes, endian)
+ # Now series
(synchrones) must be retrieved from medoid
s_file
+ getSeries = function(inds) getDataInFile(inds,
medoid
s_file, nbytes, endian)
# Contributions must be re-computed
unlink(contribs_file)
index = 1
# 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)
}
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")
# Run step2 on resulting indices or series (from file)
if (verbose)
cat("...Run final // stage 1 + stage 2\n")