X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2FconstructionModelesLassoRank.R;h=fe75d2c6169e69b86c0547dab16b6fb862f0516b;hp=5da26e3594573ee7df9a31e9fe08c19e9eb121f2;hb=7a56cc1804edcc2bb3ca3e4a8589faf55eb03547;hpb=0930b5d395ef0a48d1f97f88ee533c13d0962759

diff --git a/pkg/R/constructionModelesLassoRank.R b/pkg/R/constructionModelesLassoRank.R
index 5da26e3..fe75d2c 100644
--- a/pkg/R/constructionModelesLassoRank.R
+++ b/pkg/R/constructionModelesLassoRank.R
@@ -18,77 +18,77 @@
 #' @return a list with several models, defined by phi, rho, pi, llh
 #'
 #' @export
-constructionModelesLassoRank = function(S, k, mini, maxi, X, Y, eps, rank.min,
-                                        rank.max, ncores, fast=TRUE, verbose=FALSE)
-{
-  n = dim(X)[1]
-  p = dim(X)[2]
-  m = dim(Y)[2]
-  L = length(S)
+constructionModelesLassoRank <- function(S, k, mini, maxi, X, Y, eps, rank.min, rank.max, 
+  ncores, fast = TRUE, verbose = FALSE)
+  {
+  n <- dim(X)[1]
+  p <- dim(X)[2]
+  m <- dim(Y)[2]
+  L <- length(S)
   
   # Possible interesting ranks
-  deltaRank = rank.max - rank.min + 1
-  Size = deltaRank^k
-  RankLambda = matrix(0, nrow=Size*L, ncol=k+1)
+  deltaRank <- rank.max - rank.min + 1
+  Size <- deltaRank^k
+  RankLambda <- matrix(0, nrow = Size * L, ncol = k + 1)
   for (r in 1:k)
   {
-    # On veut le tableau de toutes les combinaisons de rangs possibles, et des lambdas
-    # Dans la première colonne : on répète (rank.max-rank.min)^(k-1) chaque chiffre :
-    #   ça remplit la colonne
-    # Dans la deuxieme : on répète (rank.max-rank.min)^(k-2) chaque chiffre,
-    #   et on fait ça (rank.max-rank.min)^2 fois
-    # ...
-    # Dans la dernière, on répète chaque chiffre une fois,
-    #   et on fait ça (rank.min-rank.max)^(k-1) fois.
-    RankLambda[,r] = rep(rank.min + rep(0:(deltaRank-1), deltaRank^(r-1), each=deltaRank^(k-r)), each = L)
+    # On veut le tableau de toutes les combinaisons de rangs possibles, et des
+    # lambdas Dans la première colonne : on répète (rank.max-rank.min)^(k-1) chaque
+    # chiffre : ça remplit la colonne Dans la deuxieme : on répète
+    # (rank.max-rank.min)^(k-2) chaque chiffre, et on fait ça (rank.max-rank.min)^2
+    # fois ...  Dans la dernière, on répète chaque chiffre une fois, et on fait ça
+    # (rank.min-rank.max)^(k-1) fois.
+    RankLambda[, r] <- rep(rank.min + rep(0:(deltaRank - 1), deltaRank^(r - 1), 
+      each = deltaRank^(k - r)), each = L)
   }
-  RankLambda[,k+1] = rep(1:L, times = Size)
+  RankLambda[, k + 1] <- rep(1:L, times = Size)
   
   if (ncores > 1)
   {
-    cl = parallel::makeCluster(ncores, outfile='')
-    parallel::clusterExport( cl, envir=environment(),
-                             varlist=c("A1","Size","Pi","Rho","mini","maxi","X","Y","eps",
-                                       "Rank","m","phi","ncores","verbose") )
+    cl <- parallel::makeCluster(ncores, outfile = "")
+    parallel::clusterExport(cl, envir = environment(), varlist = c("A1", "Size", 
+      "Pi", "Rho", "mini", "maxi", "X", "Y", "eps", "Rank", "m", "phi", "ncores", 
+      "verbose"))
   }
   
   computeAtLambda <- function(index)
   {
-    lambdaIndex = RankLambda[index,k+1]
-    rankIndex = RankLambda[index,1:k]
-    if (ncores > 1)
-      require("valse") #workers start with an empty environment
+    lambdaIndex <- RankLambda[index, k + 1]
+    rankIndex <- RankLambda[index, 1:k]
+    if (ncores > 1) 
+      require("valse")  #workers start with an empty environment
     
     # 'relevant' will be the set of relevant columns
-    selected = S[[lambdaIndex]]$selected
-    relevant = c()
-    for (j in 1:p){
-      if (length(selected[[j]])>0){
-        relevant = c(relevant,j)
+    selected <- S[[lambdaIndex]]$selected
+    relevant <- c()
+    for (j in 1:p)
+    {
+      if (length(selected[[j]]) > 0)
+      {
+        relevant <- c(relevant, j)
       }
     }
-    if (max(rankIndex)<length(relevant)){
-      phi = array(0, dim=c(p,m,k))
+    if (max(rankIndex) < length(relevant))
+    {
+      phi <- array(0, dim = c(p, m, k))
       if (length(relevant) > 0)
       {
-        res = EMGrank(S[[lambdaIndex]]$Pi, S[[lambdaIndex]]$Rho, mini, maxi,
-                      X[,relevant], Y, eps, rankIndex, fast)
-        llh = c( res$LLF, sum(rankIndex * (length(relevant)- rankIndex + m)) ) 
-        phi[relevant,,] = res$phi
+        res <- EMGrank(S[[lambdaIndex]]$Pi, S[[lambdaIndex]]$Rho, mini, maxi, 
+          X[, relevant], Y, eps, rankIndex, fast)
+        llh <- c(res$LLF, sum(rankIndex * (length(relevant) - rankIndex + 
+          m)))
+        phi[relevant, , ] <- res$phi
       }
-      list("llh"=llh, "phi"=phi, "pi" = S[[lambdaIndex]]$Pi, "rho" = S[[lambdaIndex]]$Rho)
+      list(llh = llh, phi = phi, pi = S[[lambdaIndex]]$Pi, rho = S[[lambdaIndex]]$Rho)
       
     }
   }
   
-  #For each lambda in the grid we compute the estimators
-  out =
-    if (ncores > 1)
-      parLapply(cl, seq_len(length(S)*Size), computeAtLambda)
-  else
-    lapply(seq_len(length(S)*Size), computeAtLambda)
+  # For each lambda in the grid we compute the estimators
+  out <- if (ncores > 1) 
+    parLapply(cl, seq_len(length(S) * Size), computeAtLambda) else lapply(seq_len(length(S) * Size), computeAtLambda)
   
-  if (ncores > 1)
+  if (ncores > 1) 
     parallel::stopCluster(cl)
   
   out