fix many problems (models appearing twice, irrelevant coefficients in a relevant...

[valse.git] / reports / simulData_17mars.R

diff --git a/reports/simulData_17mars.R b/reports/simulData_17mars.R
index cdb476c..52148fd 100644 (file)
--- a/reports/simulData_17mars.R
+++ b/reports/simulData_17mars.R
@@ -24,8 +24,6 @@ simulData_17mars = function(ite){
   ###########
   require(wavelets)
   XY = array(0, dim = c(2*p,n))
-  Xproj = array(0, dim=c(48,n))
-  Yproj = array(0, dim=c(48,n))
   XYproj = array(0, dim=c(96,n))
   x = x1 + matrix(rnorm(n*p, 0, sigmaX), ncol = n)
   affec = sample(c(1,2), n, replace = TRUE)
@@ -47,14 +45,12 @@ simulData_17mars = function(ite){
     Ay = dwt(y[,i], filter='haar')@V
     Ay = rev(unlist(Ay))
     Ay = Ay[2:(1+3)]
-    Xproj[,i] = c(Ax,Dx)
-    Yproj[,i] = c(Ay,Dy)
     XYproj[,i] = c(Ax,Dx,Ay,Dy)
   }
   
-  res_valse = valse(x,y)
-  res_valse_proj = valse(Xproj, Yproj)
+  res_valse = valse(x,y, kmax=2, verbose=TRUE, plot=FALSE, size_coll_mod = 200)
+  res_valse_proj = valse(XYproj[1:p,],XYproj[(p+1):(2*p),], kmax=2, verbose=TRUE, plot=FALSE, size_coll_mod = 200)
   
-  save(res_valse,file=paste("./Out/Res_",ite, ".RData",sep=""))
-  save(res_valse_proj,file=paste("./Out/ResProj_",ite, ".RData",sep=""))
+  save(res_valse,file=paste("Res_",ite, ".RData",sep=""))
+  save(res_valse_proj,file=paste("ResProj_",ite, ".RData",sep=""))
 }