X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=src%2Fadapters%2Fa.constructionModelesLassoRank.c;h=4833e1912609028e8bd1db32fe68a2053d91f72f;hb=09ab3c164abb566764e86a175b5973241e708fd6;hp=359290cdd7fd977ee15f4bfcfb77c3c090fda96e;hpb=552b00e200e8a990c1247989d29e98d4ae8679f3;p=valse.git

diff --git a/src/adapters/a.constructionModelesLassoRank.c b/src/adapters/a.constructionModelesLassoRank.c
index 359290c..4833e19 100644
--- a/src/adapters/a.constructionModelesLassoRank.c
+++ b/src/adapters/a.constructionModelesLassoRank.c
@@ -1,8 +1,8 @@
 #include <R.h>
 #include <Rdefines.h>
-#include "sources/EMGLLF.h"
+#include "constructionModelesLassoRank.h"
 
-SEXP EMGLLF(
+SEXP constructionModelesLassoRank(
 	SEXP Pi_,
 	SEXP Rho_,
 	SEXP mini_,
@@ -12,13 +12,13 @@ SEXP EMGLLF(
 	SEXP tau_,
 	SEXP A1_,
 	SEXP rangmin_,
-	SEXP rangmax
+	SEXP rangmax_
 ) {
 	// Get matrices dimensions
 	SEXP dimX = getAttrib(X_, R_DimSymbol);
 	int n = INTEGER(dimX)[0];
 	int p = INTEGER(dimX)[1];
-	SEXP dimRho = getAttrib(Rho_, R_DimSymbol)
+	SEXP dimRho = getAttrib(Rho_, R_DimSymbol);
 	int m = INTEGER(dimRho)[0];
 	int k = INTEGER(dimRho)[2];
 	int L = INTEGER(getAttrib(A1_, R_DimSymbol))[1];
@@ -39,7 +39,7 @@ SEXP EMGLLF(
 	double* Rho = REAL(Rho_);
 	double* X = REAL(X_);
 	double* Y = REAL(Y_);
-	double* A1 = REAL(A1_);
+	int* A1 = INTEGER(A1_);
 
 	/////////////
 	// OUTPUTS //
@@ -52,13 +52,13 @@ SEXP EMGLLF(
 	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);
+	double *pPhi=REAL(phi), *pLvraisemblance=REAL(lvraisemblance);
 
 	//////////////////////////////////////////
 	// Call to constructionModelesLassoRank //
 	//////////////////////////////////////////
 
-	constructionModelesLassoRank(
+	constructionModelesLassoRank_core(
 		Pi,Rho,mini,maxi,X,Y,tau,A1,rangmin,rangmax,
 		pPhi,pLvraisemblance,
 		n,p,m,k,L);
@@ -71,7 +71,7 @@ SEXP EMGLLF(
 	for (int i=0; i<2; i++)
 		SET_STRING_ELT(listNames,i,mkChar(lnames[i]));
 	setAttrib(listParams, R_NamesSymbol, listNames);
-	SET_ARRAY_ELT(listParams, 0, phi);
+	SET_VECTOR_ELT(listParams, 0, phi);
 	SET_VECTOR_ELT(listParams, 1, lvraisemblance);
 
 	UNPROTECT(5);