X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=R%2FinitSmallEM.R;h=b70eea92d65fd7bdb0bb115eb90a1cc32ea8831f;hb=71a8ee557968aa1130b9c5e47690cf73631474a4;hp=3f98e07ad2a1998791ccb53d8a42b3e5962b96e7;hpb=ae4fa2cb5a036ed1c8b8b69f257c007e8894238d;p=valse.git

diff --git a/R/initSmallEM.R b/R/initSmallEM.R
index 3f98e07..b70eea9 100644
--- a/R/initSmallEM.R
+++ b/R/initSmallEM.R
@@ -37,9 +37,9 @@ initSmallEM = function(k,X,Y,tau)
 			Z_vec = Z_bin$vec #vecteur 0 et 1 aux endroits o? Z==r
 			Z_indice = Z_bin$indice #renvoit les indices o? Z==r
 			
-			betaInit1[,,r,repet] = ginv(t(X[Z_indice,])%*%X[Z_indice,])%*%t(X[Z_indice,])%*%Y[Z_indice,]
+			betaInit1[,,r,repet] = ginv( crossprod(X[Z_indice,]) )   %*%   crossprod(X[Z_indice,], Y[Z_indice,]) 
 			sigmaInit1[,,r,repet] = diag(m)
-			phiInit1[,,r,repet] = betaInit1[,,r,repet]#/sigmaInit1[,,r,repet]
+			phiInit1[,,r,repet] = betaInit1[,,r,repet]/sigmaInit1[,,r,repet]
 			rhoInit1[,,r,repet] = solve(sigmaInit1[,,r,repet])
 			piInit1[repet,r] = sum(Z_vec)/n
 		}
@@ -48,7 +48,7 @@ initSmallEM = function(k,X,Y,tau)
 		{
 			for(r in 1:k)
 			{
-				dotProduct = 3 #(Y[i,]%*%rhoInit1[,,r,repet]-X[i,]%*%phiInit1[,,r,repet]) %*% (Y[i,]%*%rhoInit1[,,r,repet]-X[i,]%*%phiInit1[,,r,repet])
+				dotProduct = (Y[i,]%*%rhoInit1[,,r,repet]-X[i,]%*%phiInit1[,,r,repet]) %*% (Y[i,]%*%rhoInit1[,,r,repet]-X[i,]%*%phiInit1[,,r,repet])
 				Gam[i,r] = piInit1[repet,r]*det(rhoInit1[,,r,repet])*exp(-0.5*dotProduct)
 			}
 			sumGamI = sum(Gam[i,])
@@ -58,7 +58,7 @@ initSmallEM = function(k,X,Y,tau)
 		miniInit = 10
 		maxiInit = 11
 		
-		new_EMG = .Call("EMGLLF",phiInit1[,,,repet],rhoInit1[,,,repet],piInit1[repet,],
+		new_EMG = .Call("EMGLLF_core",phiInit1[,,,repet],rhoInit1[,,,repet],piInit1[repet,],
 										gamInit1[,,repet],miniInit,maxiInit,1,0,X,Y,tau)
 		LLFEessai = new_EMG$LLF
 		LLFinit1[repet] = LLFEessai[length(LLFEessai)]