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
0d056c8
..
4833e19
100644
(file)
--- a/
src/adapters/a.constructionModelesLassoRank.c
+++ b/
src/adapters/a.constructionModelesLassoRank.c
@@
-2,7
+2,7
@@
#include <Rdefines.h>
#include "constructionModelesLassoRank.h"
#include <Rdefines.h>
#include "constructionModelesLassoRank.h"
-SEXP
EMGLLF
(
+SEXP
constructionModelesLassoRank
(
SEXP Pi_,
SEXP Rho_,
SEXP mini_,
SEXP Pi_,
SEXP Rho_,
SEXP mini_,
@@
-58,7
+58,7
@@
SEXP EMGLLF(
// 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);