draft of constructionModelesLassoMLE.R

[valse.git] / R / selectVariables.R

diff --git a/R/selectVariables.R b/R/selectVariables.R
index 03578c9..46fb3f3 100644 (file)
--- a/R/selectVariables.R
+++ b/R/selectVariables.R
@@ -21,17 +21,19 @@
 #' @export
 selectVariables = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,X,Y,seuil,tau)
 {
+       #TODO: parameter ncores (chaque tâche peut aussi demander du parallélisme...)
        cl = parallel::makeCluster( parallel::detectCores() / 4 )
        parallel::clusterExport(cl=cl,
                varlist=c("phiInit","rhoInit","gamInit","mini","maxi","glambda","X","Y","seuil","tau"),
                envir=environment())
        #Pour chaque lambda de la grille, on calcule les coefficients
-       out = parLapply( 1:L, function(lambdaindex)
+       out = parLapply( seq_along(glambda), function(lambdaindex)
        {
-               params = EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda[lambdaIndex],X,Y,tau)
-
                p = dim(phiInit)[1]
                m = dim(phiInit)[2]
+
+               params = EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda[lambdaIndex],X,Y,tau)
+
                #selectedVariables: list where element j contains vector of selected variables in [1,m]
                selectedVariables = lapply(1:p, function(j) {
                        #from boolean matrix mxk of selected variables obtain the corresponding boolean m-vector,