X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Fadapters%2Fa.constructionModelesLassoRank.c;h=0e069d478a1359f19c0a31b417a5fce4e66b35e1;hp=4833e1912609028e8bd1db32fe68a2053d91f72f;hb=c3bc47052f3ccb659659c59a82e9a99ea842398d;hpb=e39bc178cf5de02489ea2dce3869ba6323e18492

diff --git a/src/adapters/a.constructionModelesLassoRank.c b/src/adapters/a.constructionModelesLassoRank.c
index 4833e19..0e069d4 100644
--- a/src/adapters/a.constructionModelesLassoRank.c
+++ b/src/adapters/a.constructionModelesLassoRank.c
@@ -46,13 +46,13 @@ SEXP constructionModelesLassoRank(
 	/////////////
 
 	int Size = pow(rangmax-rangmin+1,k);
-	SEXP phi, lvraisemblance, dimPhi;
+	SEXP phi, llh, dimPhi;
 	PROTECT(dimPhi = allocVector(INTSXP, 4));
 	int* pDimPhi = INTEGER(dimPhi);
 	pDimPhi[0] = p; pDimPhi[1] = m; pDimPhi[2] = k; pDimPhi[3] = L*Size;
 	PROTECT(phi = allocArray(REALSXP, dimPhi));
-	PROTECT(lvraisemblance = allocMatrix(REALSXP, L*Size, 2));
-	double *pPhi=REAL(phi), *pLvraisemblance=REAL(lvraisemblance);
+	PROTECT(llh = allocMatrix(REALSXP, L*Size, 2));
+	double *pPhi=REAL(phi), *pllh=REAL(llh);
 
 	//////////////////////////////////////////
 	// Call to constructionModelesLassoRank //
@@ -60,19 +60,19 @@ SEXP constructionModelesLassoRank(
 
 	constructionModelesLassoRank_core(
 		Pi,Rho,mini,maxi,X,Y,tau,A1,rangmin,rangmax,
-		pPhi,pLvraisemblance,
+		pPhi,pllh,
 		n,p,m,k,L);
 
 	// Build list from OUT params and return it
 	SEXP listParams, listNames;
 	PROTECT(listParams = allocVector(VECSXP, 2));
-	char* lnames[2] = {"phi", "lvraisemblance"}; //lists labels
+	char* lnames[2] = {"phi", "llh"}; //lists labels
 	PROTECT(listNames = allocVector(STRSXP,2));
 	for (int i=0; i<2; i++)
 		SET_STRING_ELT(listNames,i,mkChar(lnames[i]));
 	setAttrib(listParams, R_NamesSymbol, listNames);
 	SET_VECTOR_ELT(listParams, 0, phi);
-	SET_VECTOR_ELT(listParams, 1, lvraisemblance);
+	SET_VECTOR_ELT(listParams, 1, llh);
 
 	UNPROTECT(5);
 	return listParams;