'update'

[epclust.git] / old_C_code / stage2_UNFINISHED / src / 05_cluster2stepWER.r

diff --git a/old_C_code/stage2_UNFINISHED/src/05_cluster2stepWER.r b/old_C_code/stage2_UNFINISHED/src/05_cluster2stepWER.r
index 69939b2..aa35d0c 100644 (file)
--- a/old_C_code/stage2_UNFINISHED/src/05_cluster2stepWER.r
+++ b/old_C_code/stage2_UNFINISHED/src/05_cluster2stepWER.r
@@ -45,13 +45,19 @@ rm(synchros09, nas)
 nvoice   <- 4
 # # noctave4 = 2^13 = 8192 half hours ~ 180 days
 noctave4 <- adjust.noctave(N = delta, dt = 1, s0 = 2,
-#                           tw = 0, noctave = 13)
+                           tw = 0, noctave = 13)
 # # 4 here represent 2^5 = 32 half-hours ~ 1 day
 scalevector4  <- 2^(4:(noctave4 * nvoice) / nvoice) * 2
 lscvect4      <- length(scalevector4)
 lscvect <- lscvect4  # i should clean my code: werFam demands a lscvect
 
 
+#(Benjamin)
+#à partir de là, "conso" == courbes synchrones
+n     <- nrow(conso)
+delta <- ncol(conso)
+
+
 #17000 colonnes coeff 1, puis 17000 coeff 2... [non : dans chaque tranche du cube]
 
 #TODO: une fonction qui fait lignes 59 à 91