X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=R%2FinitSmallEM.R;h=6dd74576eb9d06f610dc12073fbcff3209c6ceda;hp=c8365231070c2d05954dcd082ac9eb687ad78a29;hb=c3bc47052f3ccb659659c59a82e9a99ea842398d;hpb=e39bc178cf5de02489ea2dce3869ba6323e18492

diff --git a/R/initSmallEM.R b/R/initSmallEM.R
index c836523..6dd7457 100644
--- a/R/initSmallEM.R
+++ b/R/initSmallEM.R
@@ -33,15 +33,13 @@ 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)