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

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

diff --git a/src/adapters/a.constructionModelesLassoMLE.c b/src/adapters/a.constructionModelesLassoMLE.c
index 7578664..8543658 100644 (file)
--- a/src/adapters/a.constructionModelesLassoMLE.c
+++ b/src/adapters/a.constructionModelesLassoMLE.c
@@ -1,6 +1,6 @@
 #include <R.h>
 #include <Rdefines.h>
-#include "sources/EMGLLF.h"
+#include "constructionModelesLassoMLE.h"
 
 SEXP EMGLLF(
        SEXP phiInit_,
@@ -20,7 +20,7 @@ SEXP EMGLLF(
 ) {
        // Get matrices dimensions
        int n = INTEGER(getAttrib(X_, R_DimSymbol))[0];
-       SEXP dim = getAttrib(phiInit_, R_DimSymbol)
+       SEXP dim = getAttrib(phiInit_, R_DimSymbol);
        int p = INTEGER(dim)[0];
        int m = INTEGER(dim)[1];
        int k = INTEGER(dim)[2];
@@ -63,7 +63,7 @@ SEXP EMGLLF(
        PROTECT(rho = allocArray(REALSXP, dimRho));
        PROTECT(pi = allocMatrix(REALSXP, k, L));
        PROTECT(lvraisemblance = allocMatrix(REALSXP, L, 2));
-       double* pPhi=REAL(phi), pRho=REAL(rho), pPi=REAL(pi), pLvraisemblance=REAL(lvraisemblance);
+       double *pPhi=REAL(phi), *pRho=REAL(rho), *pPi=REAL(pi), *pLvraisemblance=REAL(lvraisemblance);
 
        /////////////////////////////////////////
        // Call to constructionModelesLassoMLE //
@@ -77,7 +77,7 @@ SEXP EMGLLF(
        // Build list from OUT params and return it
        SEXP listParams, listNames;
        PROTECT(listParams = allocVector(VECSXP, 4));
-       char* lnames[4] = {"phi", "rho", "pi", "lvraisemblance}; //lists labels
+       char* lnames[4] = {"phi", "rho", "pi", "lvraisemblance"}; //lists labels
        PROTECT(listNames = allocVector(STRSXP,4));
        for (int i=0; i<4; i++)
                SET_STRING_ELT(listNames,i,mkChar(lnames[i]));