projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of auder.net:valse
[valse.git]
/
src
/
adapters
/
a.EMGLLF.c
diff --git
a/src/adapters/a.EMGLLF.c
b/src/adapters/a.EMGLLF.c
index
f70d69d
..
0df00bd
100644
(file)
--- a/
src/adapters/a.EMGLLF.c
+++ b/
src/adapters/a.EMGLLF.c
@@
-63,7
+63,7
@@
SEXP EMGLLF(
// Call to EMGLLF //
////////////////////
// Call to EMGLLF //
////////////////////
- EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau,
+ EMGLLF
_core
(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau,
pPhi,pRho,pPi,pLLF,pS,
n,p,m,k);
pPhi,pRho,pPi,pLLF,pS,
n,p,m,k);
@@
-75,11
+75,11
@@
SEXP EMGLLF(
for (int i=0; i<5; i++)
SET_STRING_ELT(listNames,i,mkChar(lnames[i]));
setAttrib(listParams, R_NamesSymbol, listNames);
for (int i=0; i<5; i++)
SET_STRING_ELT(listNames,i,mkChar(lnames[i]));
setAttrib(listParams, R_NamesSymbol, listNames);
- SET_
ARRAY
_ELT(listParams, 0, phi);
- SET_
ARRAY
_ELT(listParams, 1, rho);
- SET_
MATRIX
_ELT(listParams, 2, pi);
+ SET_
VECTOR
_ELT(listParams, 0, phi);
+ SET_
VECTOR
_ELT(listParams, 1, rho);
+ SET_
VECTOR
_ELT(listParams, 2, pi);
SET_VECTOR_ELT(listParams, 3, LLF);
SET_VECTOR_ELT(listParams, 3, LLF);
- SET_
ARRAY
_ELT(listParams, 4, S);
+ SET_
VECTOR
_ELT(listParams, 4, S);
UNPROTECT(9);
return listParams;
UNPROTECT(9);
return listParams;