finished translation MATLAB --> R,C ; start debugging...

[valse.git] / src / adapters / a.constructionModelesLassoRank.c

diff --git a/src/adapters/a.constructionModelesLassoRank.c b/src/adapters/a.constructionModelesLassoRank.c
index 359290c..0d056c8 100644 (file)
--- a/src/adapters/a.constructionModelesLassoRank.c
+++ b/src/adapters/a.constructionModelesLassoRank.c
@@ -1,6 +1,6 @@
 #include <R.h>
 #include <Rdefines.h>
-#include "sources/EMGLLF.h"
+#include "constructionModelesLassoRank.h"
 
 SEXP EMGLLF(
        SEXP Pi_,
@@ -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,7 +52,7 @@ 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 //