X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=test%2Fgenerate_test_data%2FEMGLLF.R;h=37859d8637c8bc210ce01833dbf936e8cb7bc87e;hp=272eb6f60dc86e8dc226f36d5f219f7410a4bf6a;hb=f9143bd90ee989e7fede640b4c411374be8e2099;hpb=f33f35efc9a01f93bb61959522d90ee6a76b892e

diff --git a/test/generate_test_data/EMGLLF.R b/test/generate_test_data/EMGLLF.R
index 272eb6f..37859d8 100644
--- a/test/generate_test_data/EMGLLF.R
+++ b/test/generate_test_data/EMGLLF.R
@@ -1,4 +1,4 @@
-EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
+EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
 {
   #matrix dimensions
   n = dim(X)[1]
@@ -17,7 +17,6 @@ EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
   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
@@ -119,7 +118,8 @@ EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
     ##########
     #Etape E #
     ##########
-    sumLogLLF2 = 0
+
+		sumLogLLF2 = 0
     for (i in 1:n)
 		{
       #precompute sq norms to numerically adjust their values
@@ -127,7 +127,7 @@ EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
       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)
 			{