X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Fselectiontotale.R;h=7209feddf3167a986b29468490253d89b21e243e;hb=93285a2d87991291c96f661208ddde248297a3b5;hp=169038639e1d918051e63f3bf7fe9ecf0748d2d5;hpb=f87ff0f5116c0c1c59c5608e46563ff0f79e5d43;p=valse.git

diff --git a/pkg/R/selectiontotale.R b/pkg/R/selectiontotale.R
index 1690386..7209fed 100644
--- a/pkg/R/selectiontotale.R
+++ b/pkg/R/selectiontotale.R
@@ -1,12 +1,13 @@
 #Return a list of outputs, for each lambda in grid: selected,Rho,Pi
-selectiontotale = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,X,Y,thresh,tau){
-  require(parallel)
-    cl = parallel::makeCluster( parallel::detectCores() / 4 ) # <-- ça devrait être un argument
+selectiontotale = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,X,Y,thresh,tau, parallel = FALSE){
+  if (parallel) {
+    require(parallel)
+    cl = parallel::makeCluster( parallel::detectCores() / 4) # <-- ça devrait être un argument
     parallel::clusterExport(cl=cl,
                             varlist=c("phiInit","rhoInit","gamInit","mini","maxi","glambda","X","Y","thresh","tau"),
                             envir=environment())
     #Pour chaque lambda de la grille, on calcule les coefficients
-    out = parLapply( 1:length(glambda), function(lambdaindex)
+    out = parLapply(cl,  1:length(glambda), function(lambdaIndex)
     {
       params = 
         EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda[lambdaIndex],X,Y,tau)
@@ -23,4 +24,31 @@ selectiontotale = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambd
       list("selected"=selectedVariables,"Rho"=params$Rho,"Pi"=params$Pi)
     })
     parallel::stopCluster(cl)
-  }
\ No newline at end of file
+  }
+  else {
+    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]
+      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
+        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[[cpt]] = params$rho
+      Pi[[cpt]] = params$pi
+      }
+    }
+    list("selected"=selectedVariables,"Rho"=Rho,"Pi"=Pi)
+  }
+}
\ No newline at end of file