fix EMGRank.R, and add some lines in the roxygen code for some functions

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

diff --git a/pkg/R/EMGrank.R b/pkg/R/EMGrank.R
index e30b605..7c0d91f 100644 (file)
--- a/pkg/R/EMGrank.R
+++ b/pkg/R/EMGrank.R
@@ -2,7 +2,6 @@
 #'
 #' Description de EMGrank
 #'
-#' @param phiInit ...
 #' @param Pi Parametre de proportion
 #' @param Rho Parametre initial de variance renormalisé
 #' @param mini Nombre minimal d'itérations dans l'algorithme EM
@@ -22,7 +21,7 @@ EMGrank <- function(Pi, Rho, mini, maxi, X, Y, tau, rank, fast=TRUE)
        if (!fast)
        {
                # Function in R
-               return (EMGrank_R(Pi, Rho, mini, maxi, X, Y, tau, rank))
+               return (.EMGrank_R(Pi, Rho, mini, maxi, X, Y, tau, rank))
        }
 
        # Function in C
@@ -47,8 +46,9 @@ matricize <- function(X)
 }
 
 # R version - slow but easy to read
-EMGrank_R = function(Pi, Rho, mini, maxi, X, Y, tau, rank)
+.EMGrank_R = function(Pi, Rho, mini, maxi, X, Y, tau, rank)
 {
+  require(MASS)
   #matrix dimensions
   n = dim(X)[1]
   p = dim(X)[2]
@@ -70,10 +70,10 @@ EMGrank_R = function(Pi, Rho, mini, maxi, X, Y, tau, rank)
   ite = 1
   while (ite<=mini || (ite<=maxi && sumDeltaPhi>tau))
        {
-    #M step: Mise à jour de Beta (et donc phi)
+    #M step: update for Beta ( and then phi)
     for(r in 1:k)
                {
-      Z_indice = seq_len(n)[Z==r] #indices où Z == r
+      Z_indice = seq_len(n)[Z==r] #indices where Z == r
       if (length(Z_indice) == 0)
         next
       #U,S,V = SVD of (t(Xr)Xr)^{-1} * t(Xr) * Yr
@@ -87,7 +87,7 @@ EMGrank_R = function(Pi, Rho, mini, maxi, X, Y, tau, rank)
       phi[,,r] = s$u %*% diag(S) %*% t(s$v) %*% Rho[,,r]
     }
 
-               #Etape E et calcul de LLF
+               #Step E and computation of the loglikelihood
                sumLogLLF2 = 0
                for(i in seq_len(n))
                {