X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=R%2FinitSmallEM.R;h=e2157b254b6bfdbd5e369e02d304962e0fb44197;hp=c8365231070c2d05954dcd082ac9eb687ad78a29;hb=31463ab809c0195273ff2760606ea65361d721ab;hpb=4725af564bfdbeb40d0caf7f124ab94ac05a97eb

diff --git a/R/initSmallEM.R b/R/initSmallEM.R
index c836523..e2157b2 100644
--- a/R/initSmallEM.R
+++ b/R/initSmallEM.R
@@ -13,7 +13,7 @@ initSmallEM = function(k,X,Y,tau)
 	m = ncol(Y)
 	p = ncol(X)
   
-	Zinit1 = array(0, dim=c(n,20)) 
+	Zinit1 = array(0, dim=c(n,20))
 	betaInit1 = array(0, dim=c(p,m,k,20))
 	sigmaInit1 = array(0, dim = c(m,m,k,20))
 	phiInit1 = array(0, dim = c(p,m,k,20))
@@ -33,15 +33,14 @@ initSmallEM = function(k,X,Y,tau)
 		for(r in 1:k)
 		{
 			Z = Zinit1[,repet]
-			Z_bin = vec_bin(Z,r)
-			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
+			Z_indice = seq_len(n)[Z == r] #renvoit les indices où Z==r
 			
-			betaInit1[,,r,repet] = ginv( crossprod(X[Z_indice,]) )   %*%   crossprod(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]
 			rhoInit1[,,r,repet] = solve(sigmaInit1[,,r,repet])
-			piInit1[repet,r] = sum(Z_vec)/n
+			piInit1[repet,r] = mean(Z == r)
 		}
 		
 		for(i in 1:n)
@@ -58,7 +57,8 @@ initSmallEM = function(k,X,Y,tau)
 		miniInit = 10
 		maxiInit = 11
 		
-		new_EMG = .Call("EMGLLF_core",phiInit1[,,,repet],rhoInit1[,,,repet],piInit1[repet,],gamInit1[,,repet],miniInit,maxiInit,1,0,X,Y,tau)
+		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)]
 	}