align C version of EMGLLF on R version

[valse.git] / test / generate_test_data / EMGLLF.R

diff --git a/test/generate_test_data/EMGLLF.R b/test/generate_test_data/EMGLLF.R
index f1eeffa..673b807 100644 (file)
--- a/test/generate_test_data/EMGLLF.R
+++ b/test/generate_test_data/EMGLLF.R
@@ -17,7 +17,6 @@ EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,ta
   Gram2 = array(0, dim=c(p,p,k))
   ps2 = array(0, dim=c(p,m,k))
   b = rep(0, k)
   Gram2 = array(0, dim=c(p,p,k))
   ps2 = array(0, dim=c(p,m,k))
   b = rep(0, k)

-  pen = matrix(0, maxi, k)

   X2 = array(0, dim=c(n,p,k))
   Y2 = array(0, dim=c(n,m,k))
   dist = 0
   X2 = array(0, dim=c(n,p,k))
   Y2 = array(0, dim=c(n,m,k))
   dist = 0


@@ -116,7 +115,8 @@ EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,ta
     ##########
     #Etape E #
     ##########
     ##########
     #Etape E #
     ##########

-    sumLogLLF2 = 0
+
+               sumLogLLF2 = 0

     for (i in 1:n)
                {
       #precompute sq norms to numerically adjust their values
     for (i in 1:n)
                {
       #precompute sq norms to numerically adjust their values


@@ -124,11 +124,11 @@ EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,ta
       for (r in 1:k){
         sqNorm2[r] = sum( (Y[i,]%*%rho[,,r]-X[i,]%*%phi[,,r])^2 )}
 
       for (r in 1:k){
         sqNorm2[r] = sum( (Y[i,]%*%rho[,,r]-X[i,]%*%phi[,,r])^2 )}
 

-      #compute Gam(:,:) using shift determined above
+      #compute Gam(:,:)

       sumLLF1 = 0.0;
       for (r in 1:k)
                        {
       sumLLF1 = 0.0;
       for (r in 1:k)
                        {

-                               Gam[i,r] = pi[r] * exp(-0.5*sqNorm2[r]) * det(rho[,,r]) #FIXME: still issues here ?!?!
+                               Gam[i,r] = pi[r] * exp(-0.5*sqNorm2[r]) * det(rho[,,r])

         sumLLF1 = sumLLF1 + Gam[i,r] / (2*base::pi)^(m/2)
       }
       sumLogLLF2 = sumLogLLF2 + log(sumLLF1)
         sumLLF1 = sumLLF1 + Gam[i,r] / (2*base::pi)^(m/2)
       }
       sumLogLLF2 = sumLogLLF2 + log(sumLLF1)