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
/
main.R
diff --git
a/epclust/R/main.R
b/epclust/R/main.R
index
9e9b641
..
e003933
100644
(file)
--- a/
epclust/R/main.R
+++ b/
epclust/R/main.R
@@
-348,9
+348,10
@@
claws <- function(getSeries, K1, K2, nb_series_per_chunk,
#' @return A [big.]matrix of size log(L) x n containing contributions in columns
#'
#' @export
#' @return A [big.]matrix of size log(L) x n containing contributions in columns
#'
#' @export
-curvesToContribs = function(series, wav_filt, contrib_type)
+curvesToContribs = function(series, wav_filt, contrib_type
, coin=FALSE
)
{
L = nrow(series)
{
L = nrow(series)
+ if (coin) browser()
D = ceiling( log2(L) )
nb_sample_points = 2^D
apply(series, 2, function(x) {
D = ceiling( log2(L) )
nb_sample_points = 2^D
apply(series, 2, function(x) {