X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2FconstructionModelesLassoRank.R;h=339ba60bf3ef42251cae09bf573bbe1115844c22;hp=6dbf3500089f1f2e50e39e2cbeb9f5ff4b8d68b0;hb=aa480ac1fef50618978307a4df2cf9da1e285abc;hpb=b9b0b72a2c8f7f0d1a3216528aefcec0a92c6c99 diff --git a/pkg/R/constructionModelesLassoRank.R b/pkg/R/constructionModelesLassoRank.R index 6dbf350..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] @@ -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)