X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2FselectVariables.R;h=02252872045a5805c2b444fee0e973897afa0e15;hp=869e7bfc99967f5f4e79b131200c625de39e0a4e;hb=43d76c49d2f98490abc782c7e8a8b94baee40247;hpb=4cc632c9a1e1d93e9a43a402d1361f23afc50e5e

diff --git a/pkg/R/selectVariables.R b/pkg/R/selectVariables.R
index 869e7bf..0225287 100644
--- a/pkg/R/selectVariables.R
+++ b/pkg/R/selectVariables.R
@@ -12,8 +12,8 @@
 #' @param glambda grid of regularization parameters
 #' @param X			 matrix of regressors
 #' @param Y			 matrix of responses
-#' @param thres	 threshold to consider a coefficient to be equal to 0
-#' @param tau		 threshold to say that EM algorithm has converged
+#' @param thresh real, threshold to say a variable is relevant, by default = 1e-8
+#' @param eps		 threshold to say that EM algorithm has converged
 #' @param ncores Number or cores for parallel execution (1 to disable)
 #'
 #' @return a list of outputs, for each lambda in grid: selected,Rho,Pi
@@ -23,46 +23,53 @@
 #' @export
 #'
 selectVariables = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,
-	X,Y,thresh,tau, ncores=3)
+                           X,Y,thresh=1e-8,eps, ncores=3, fast=TRUE)
 {
-	if (ncores > 1)
-	{
-		cl = parallel::makeCluster(ncores)
-		parallel::clusterExport(cl=cl,
-			varlist=c("phiInit","rhoInit","gamInit","mini","maxi","glambda","X","Y","thresh","tau"),
-			envir=environment())
-	}
-
-	# Calcul pour un lambda
-	computeCoefs <-function(lambda)
-	{
-		params = EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,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 = 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 ) ]
-		})
-
-		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, 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
+  if (ncores > 1)
+  {
+    cl = parallel::makeCluster(ncores, outfile='')
+    parallel::clusterExport(cl=cl,
+                            varlist=c("phiInit","rhoInit","gamInit","mini","maxi","glambda","X","Y","thresh","eps"),
+                            envir=environment())
+  }
+  
+  # Computation for a fixed lambda
+  computeCoefs <- function(lambda)
+  {
+    params = EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,eps,fast)
+    
+    p = dim(phiInit)[1]
+    m = dim(phiInit)[2]
+    
+    #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,
+      #and finally return the corresponding indices
+      seq_len(m)[ apply( abs(params$phi[j,,]) > thresh, 1, any ) ]
+    })
+    
+    list("selected"=selectedVariables,"Rho"=params$rho,"Pi"=params$pi)
+  }
+  
+  # For each lambda in the grid, we compute the coefficients
+  out <-
+    if (ncores > 1)
+      parLapply(cl, glambda, computeCoefs)
+  else
+    lapply(glambda, computeCoefs)
+  if (ncores > 1)
+    parallel::stopCluster(cl)
+  # Suppress models which are computed twice
+  #En fait, ca ca fait la comparaison de tous les parametres
+  #On veut juste supprimer ceux qui ont les memes variables sélectionnées
+  #sha1_array <- lapply(out, digest::sha1)
+  #out[ duplicated(sha1_array) ]
+  selec = lapply(out, function(model) model$selected)
+  ind_dup = duplicated(selec)
+  ind_uniq = which(!ind_dup)
+  out2 = list()
+  for (l in 1:length(ind_uniq)){
+    out2[[l]] = out[[ind_uniq[l]]]
+  }
+  out2
 }