X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Fadapters%2Fa.EMGLLF.c;h=0df00bdaa9fcde3bc6b556227e39a8affdcbe493;hp=f70d69d5ae4236481cd0e57ca35f52bb8665bf4d;hb=09ab3c164abb566764e86a175b5973241e708fd6;hpb=8e92c49c15bdacebf46190e7c8279bd227873928

diff --git a/src/adapters/a.EMGLLF.c b/src/adapters/a.EMGLLF.c
index f70d69d..0df00bd 100644
--- a/src/adapters/a.EMGLLF.c
+++ b/src/adapters/a.EMGLLF.c
@@ -63,7 +63,7 @@ SEXP EMGLLF(
 	// Call to EMGLLF //
 	////////////////////
 
-	EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau,
+	EMGLLF_core(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau,
 		pPhi,pRho,pPi,pLLF,pS,
 		n,p,m,k);
 
@@ -75,11 +75,11 @@ SEXP EMGLLF(
 	for (int i=0; i<5; i++)
 		SET_STRING_ELT(listNames,i,mkChar(lnames[i]));
 	setAttrib(listParams, R_NamesSymbol, listNames);
-	SET_ARRAY_ELT(listParams, 0, phi);
-	SET_ARRAY_ELT(listParams, 1, rho);
-	SET_MATRIX_ELT(listParams, 2, pi);
+	SET_VECTOR_ELT(listParams, 0, phi);
+	SET_VECTOR_ELT(listParams, 1, rho);
+	SET_VECTOR_ELT(listParams, 2, pi);
 	SET_VECTOR_ELT(listParams, 3, LLF);
-	SET_ARRAY_ELT(listParams, 4, S);
+	SET_VECTOR_ELT(listParams, 4, S);
 
 	UNPROTECT(9);
 	return listParams;