several modifs - pkg looks better (but untested)

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

diff --git a/pkg/R/initSmallEM.R b/pkg/R/initSmallEM.R
index 541d7e1..bfe1d46 100644 (file)
--- a/pkg/R/initSmallEM.R
+++ b/pkg/R/initSmallEM.R
@@ -24,7 +24,7 @@ initSmallEM = function(k,X,Y)
        gamInit1 = array(0, dim=c(n,k,20))
        LLFinit1 = list()
 
-       require(MASS) #Moore-Penrose generalized inverse of matrix
+       #require(MASS) #Moore-Penrose generalized inverse of matrix
        for(repet in 1:20)
        {
          distance_clus = dist(X)
@@ -36,10 +36,10 @@ initSmallEM = function(k,X,Y)
                        Z = Zinit1[,repet]
                        Z_indice = seq_len(n)[Z == r] #renvoit les indices où Z==r
                        if (length(Z_indice) == 1) {
-                         betaInit1[,,r,repet] = ginv(crossprod(t(X[Z_indice,]))) %*%
+                         betaInit1[,,r,repet] = MASS::ginv(crossprod(t(X[Z_indice,]))) %*%
                            crossprod(t(X[Z_indice,]), Y[Z_indice,])
                        } else {
-                       betaInit1[,,r,repet] = ginv(crossprod(X[Z_indice,])) %*%
+                       betaInit1[,,r,repet] = MASS::ginv(crossprod(X[Z_indice,])) %*%
                                crossprod(X[Z_indice,], Y[Z_indice,])
                        }
                        sigmaInit1[,,r,repet] = diag(m)
@@ -62,9 +62,8 @@ initSmallEM = function(k,X,Y)
                miniInit = 10
                maxiInit = 11
                
-               #new_EMG = .Call("EMGLLF_core",phiInit1[,,,repet],rhoInit1[,,,repet],piInit1[repet,],
-#                      gamInit1[,,repet],miniInit,maxiInit,1,0,X,Y,1e-4)
-               new_EMG = EMGLLF(phiInit1[,,,repet],rhoInit1[,,,repet],piInit1[repet,],gamInit1[,,repet],miniInit,maxiInit,1,0,X,Y,1e-4)
+               new_EMG = EMGLLF(phiInit1[,,,repet], rhoInit1[,,,repet], piInit1[repet,],
+                       gamInit1[,,repet], miniInit, maxiInit, gamma=1, lambda=0, X, Y, tau=1e-4)
                LLFEessai = new_EMG$LLF
                LLFinit1[repet] = LLFEessai[length(LLFEessai)]
        }