projects
/
epclust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'update'
[epclust.git]
/
epclust
/
R
/
main.R
diff --git
a/epclust/R/main.R
b/epclust/R/main.R
index
f1e435c
..
892c64c
100644
(file)
--- a/
epclust/R/main.R
+++ b/
epclust/R/main.R
@@
-144,7
+144,7
@@
claws = function(getSeries, K1, K2,
getSeries = function(inds) getDataInFile(inds, series_file, nbytes, endian)
}
getSeries = function(inds) getDataInFile(inds, series_file, nbytes, endian)
}
- # Serialize all computed wavelets contributions
o
nto a file
+ # Serialize all computed wavelets contributions
i
nto a file
contribs_file = paste(bin_dir,"contribs",sep="") ; unlink(contribs_file)
index = 1
nb_curves = 0
contribs_file = paste(bin_dir,"contribs",sep="") ; unlink(contribs_file)
index = 1
nb_curves = 0
@@
-230,6
+230,10
@@
claws = function(getSeries, K1, K2,
contribs_file, nb_series_per_chunk, nbytes, endian)
}
contribs_file, nb_series_per_chunk, nbytes, endian)
}
+
+
+#TODO: if ntasks==1, c'est deja terminé
+
# 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")