fix/improve selectVariables.R

[valse.git] / pkg / R / selectVariables.R

diff --git a/pkg/R/selectVariables.R b/pkg/R/selectVariables.R
index ce7d3b3..b4fc0ab 100644 (file)
--- a/pkg/R/selectVariables.R
+++ b/pkg/R/selectVariables.R
@@ -44,19 +44,23 @@ selectVariables = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambd
                selectedVariables = lapply(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 ) ]
+                 seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ]
                })
 
-               list("selected"=selectedVariables,"Rho"=params$Rho,"Pi"=params$Pi)
+               list("selected"=selectedVariables,"Rho"=params$rho,"Pi"=params$pi)
        }
 
        # Pour chaque lambda de la grille, on calcule les coefficients
        out <-
                if (ncores > 1)
-                       parLapply(cl, seq_along(glambda, computeCoefs)
-               else
-                       lapply(seq_along(glambda), computeCoefs)
+                       parLapply(cl, glambda, computeCoefs)
+               else lapply(glambda, computeCoefs)
        if (ncores > 1)
                parallel::stopCluster(cl)
+
+       # Suppression doublons
+       sha1_array <- lapply(out, digest::sha1)
+       out[ !duplicated(sha1_array) ]
+
        out
 }