projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
R package can now be installed (compilation OK)
[valse.git]
/
src
/
adapters
/
a.constructionModelesLassoRank.c
diff --git
a/src/adapters/a.constructionModelesLassoRank.c
b/src/adapters/a.constructionModelesLassoRank.c
index
359290c
..
4833e19
100644
(file)
--- a/
src/adapters/a.constructionModelesLassoRank.c
+++ b/
src/adapters/a.constructionModelesLassoRank.c
@@
-1,8
+1,8
@@
#include <R.h>
#include <Rdefines.h>
#include <R.h>
#include <Rdefines.h>
-#include "
sources/EMGLLF
.h"
+#include "
constructionModelesLassoRank
.h"
-SEXP
EMGLLF
(
+SEXP
constructionModelesLassoRank
(
SEXP Pi_,
SEXP Rho_,
SEXP mini_,
SEXP Pi_,
SEXP Rho_,
SEXP mini_,
@@
-12,13
+12,13
@@
SEXP EMGLLF(
SEXP tau_,
SEXP A1_,
SEXP rangmin_,
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];
) {
// 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];
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* Rho = REAL(Rho_);
double* X = REAL(X_);
double* Y = REAL(Y_);
-
double* A1 = REAL
(A1_);
+
int* A1 = INTEGER
(A1_);
/////////////
// OUTPUTS //
/////////////
// 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));
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 //
//////////////////////////////////////////
//////////////////////////////////////////
// Call to constructionModelesLassoRank //
//////////////////////////////////////////
- constructionModelesLassoRank(
+ constructionModelesLassoRank
_core
(
Pi,Rho,mini,maxi,X,Y,tau,A1,rangmin,rangmax,
pPhi,pLvraisemblance,
n,p,m,k,L);
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);
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);
SET_VECTOR_ELT(listParams, 1, lvraisemblance);
UNPROTECT(5);