X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2FconstructionModelesLassoRank.R;h=339ba60bf3ef42251cae09bf573bbe1115844c22;hp=71713f73c180593b658d5bf13d2ae8e2ed1bab7f;hb=aa480ac1fef50618978307a4df2cf9da1e285abc;hpb=0eb161e3f3d018bce7d98fc85622d14910f89d43

diff --git a/pkg/R/constructionModelesLassoRank.R b/pkg/R/constructionModelesLassoRank.R
index 71713f7..339ba60 100644
--- a/pkg/R/constructionModelesLassoRank.R
+++ b/pkg/R/constructionModelesLassoRank.R
@@ -8,7 +8,7 @@
 #'
 #' export
 constructionModelesLassoRank = function(pi, rho, mini, maxi, X, Y, tau, A1, rangmin,
-	rangmax, ncores, verbose=FALSE)
+	rangmax, ncores, fast=TRUE, verbose=FALSE)
 {
   n = dim(X)[1]
   p = dim(X)[2]
@@ -35,7 +35,7 @@ constructionModelesLassoRank = function(pi, rho, mini, maxi, X, Y, tau, A1, rang
 
   if (ncores > 1)
 	{
-    cl = parallel::makeCluster(ncores)
+    cl = parallel::makeCluster(ncores, outfile='')
     parallel::clusterExport( cl, envir=environment(),
 			varlist=c("A1","Size","Pi","Rho","mini","maxi","X","Y","tau",
 			"Rank","m","phi","ncores","verbose") )
@@ -57,7 +57,7 @@ constructionModelesLassoRank = function(pi, rho, mini, maxi, X, Y, tau, A1, rang
       for (j in 1:Size)
 			{
         res = EMGrank(Pi[,lambdaIndex], Rho[,,,lambdaIndex], mini, maxi,
-					X[,active], Y, tau, Rank[j,])
+					X[,active], Y, tau, Rank[j,], fast)
         llh = rbind(llh,
 					c( res$LLF, sum(Rank[j,] * (length(active)- Rank[j,] + m)) ) )
         phi[active,,,] = rbind(phi[active,,,], res$phi)