#include <R.h>
#include <Rdefines.h>
-#include "sources/EMGLLF.h"
+#include "constructionModelesLassoRank.h"
-SEXP EMGLLF(
+SEXP constructionModelesLassoRank(
SEXP Pi_,
SEXP Rho_,
SEXP mini_,
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];
double* Rho = REAL(Rho_);
double* X = REAL(X_);
double* Y = REAL(Y_);
- double* A1 = REAL(A1_);
+ int* A1 = INTEGER(A1_);
/////////////
// OUTPUTS //
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);
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);