X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Fselectiontotale.R;h=25128cb0b36d3c61756815a5f8084f477675612d;hb=3f62d540d32b70f42b9090087f72426c18cb219e;hp=5b0112c347b0b46d816b7592956ae014931c8535;hpb=f33f35efc9a01f93bb61959522d90ee6a76b892e;p=valse.git

diff --git a/pkg/R/selectiontotale.R b/pkg/R/selectiontotale.R
index 5b0112c..25128cb 100644
--- a/pkg/R/selectiontotale.R
+++ b/pkg/R/selectiontotale.R
@@ -29,21 +29,24 @@ selectiontotale = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambd
     selectedVariables = list()
     Rho = list()
     Pi = list()
+    cpt = 0
     #Pour chaque lambda de la grille, on calcule les coefficients
     for (lambdaIndex in 1:length(glambda)){
-      print(lambdaIndex)
       params = 
         EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda[lambdaIndex],X,Y,tau)
       p = dim(phiInit)[1]
       m = dim(phiInit)[2]
       #selectedVariables: list where element j contains vector of selected variables in [1,m]
-      selectedVariables[[lambdaIndex]] = lapply(1:p, function(j) {
+      if (sum(params$phi) != 0){
+        cpt = cpt+1
+      selectedVariables[[cpt]] = sapply(1:p, function(j) {
         #from boolean matrix mxk of selected variables obtain the corresponding boolean m-vector,
         #and finally return the corresponding indices
-        seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ]
+        c(seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ], rep(0, m-length(seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ] ) ))
       })
-      Rho[[lambdaIndex]] = params$Rho
-      Pi[[lambdaIndex]] = params$Pi
+      Rho[[cpt]] = params$rho
+      Pi[[cpt]] = params$pi
+      }
     }
     list("selected"=selectedVariables,"Rho"=Rho,"Pi"=Pi)
   }