X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2FEMGLLF.R;h=57638f9709781bf89084497dd899323337e1ee4a;hp=2aeea537b9d6656c04032c2697d407f6c4d1d823;hb=6279ba8656582370e7242ff9e77d22c23fe8ca04;hpb=17b9fa5f6004bb55e915d8916f1c9a1f128a65ce

diff --git a/pkg/R/EMGLLF.R b/pkg/R/EMGLLF.R
index 2aeea53..57638f9 100644
--- a/pkg/R/EMGLLF.R
+++ b/pkg/R/EMGLLF.R
@@ -40,9 +40,8 @@ EMGLLF <- function(phiInit, rhoInit, piInit, gamInit, mini, maxi, gamma, lambda,
   k <- length(piInit)  #nombre de composantes dans le mélange
   .Call("EMGLLF", phiInit, rhoInit, piInit, gamInit, mini, maxi, gamma, lambda, 
     X, Y, eps, phi = double(p * m * k), rho = double(m * m * k), pi = double(k), 
-    LLF = double(maxi), S = double(p * m * k), affec = integer(n), n, p, m, k, 
+    llh = double(1), S = double(p * m * k), affec = integer(n), n, p, m, k, 
     PACKAGE = "valse")
-	list(phi = phi, rho = rho, pi = pi, llh = llh, S = S, affec=affec)
 }
 
 # R version - slow but easy to read
@@ -74,7 +73,6 @@ EMGLLF <- function(phiInit, rhoInit, piInit, gamInit, mini, maxi, gamma, lambda,
   ps2 <- array(0, dim = c(p, m, k))
   X2 <- array(0, dim = c(n, p, k))
   Y2 <- array(0, dim = c(n, m, k))
-  EPS <- 1e-15
 
   for (ite in 1:maxi)
   {