projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progress in debug: fix LLF/llh mismatch, and length + add adapter test in test/
[valse.git]
/
pkg
/
src
/
adapters
/
a.EMGLLF.c
diff --git
a/pkg/src/adapters/a.EMGLLF.c
b/pkg/src/adapters/a.EMGLLF.c
index
e93b7ec
..
9b004c2
100644
(file)
--- a/
pkg/src/adapters/a.EMGLLF.c
+++ b/
pkg/src/adapters/a.EMGLLF.c
@@
-46,7
+46,7
@@
SEXP EMGLLF(
// OUTPUTS //
/////////////
// OUTPUTS //
/////////////
- SEXP phi, rho, pi,
LLF
, S, affec, dimPhiS, dimRho;
+ SEXP phi, rho, pi,
llh
, S, affec, dimPhiS, dimRho;
PROTECT(dimPhiS = allocVector(INTSXP, 3));
int* pDimPhiS = INTEGER(dimPhiS);
pDimPhiS[0] = p; pDimPhiS[1] = m; pDimPhiS[2] = k;
PROTECT(dimPhiS = allocVector(INTSXP, 3));
int* pDimPhiS = INTEGER(dimPhiS);
pDimPhiS[0] = p; pDimPhiS[1] = m; pDimPhiS[2] = k;
@@
-56,10
+56,10
@@
SEXP EMGLLF(
PROTECT(phi = allocArray(REALSXP, dimPhiS));
PROTECT(rho = allocArray(REALSXP, dimRho));
PROTECT(pi = allocVector(REALSXP, k));
PROTECT(phi = allocArray(REALSXP, dimPhiS));
PROTECT(rho = allocArray(REALSXP, dimRho));
PROTECT(pi = allocVector(REALSXP, k));
- PROTECT(
LLF = allocVector(REALSXP, maxi
));
+ PROTECT(
llh = allocVector(REALSXP, 1
));
PROTECT(S = allocArray(REALSXP, dimPhiS));
PROTECT(affec = allocVector(INTSXP, n));
PROTECT(S = allocArray(REALSXP, dimPhiS));
PROTECT(affec = allocVector(INTSXP, n));
- double *pPhi=REAL(phi), *pRho=REAL(rho), *pPi=REAL(pi), *pL
LF=REAL(LLF
), *pS=REAL(S);
+ double *pPhi=REAL(phi), *pRho=REAL(rho), *pPi=REAL(pi), *pL
lh=REAL(llh
), *pS=REAL(S);
int *pAffec=INTEGER(affec);
////////////////////
int *pAffec=INTEGER(affec);
////////////////////
@@
-67,14
+67,14
@@
SEXP EMGLLF(
////////////////////
EMGLLF_core(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,eps,
////////////////////
EMGLLF_core(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,eps,
- pPhi,pRho,pPi,pL
LF
,pS,pAffec,
+ pPhi,pRho,pPi,pL
lh
,pS,pAffec,
n,p,m,k);
// Build list from OUT params and return it
SEXP listParams, listNames;
int nouts = 6;
PROTECT(listParams = allocVector(VECSXP, nouts));
n,p,m,k);
// Build list from OUT params and return it
SEXP listParams, listNames;
int nouts = 6;
PROTECT(listParams = allocVector(VECSXP, nouts));
- char* lnames[6] = {"phi", "rho", "pi", "
LLF
", "S", "affec"}; //lists labels
+ char* lnames[6] = {"phi", "rho", "pi", "
llh
", "S", "affec"}; //lists labels
PROTECT(listNames = allocVector(STRSXP,nouts));
for (int i=0; i<nouts; i++)
SET_STRING_ELT(listNames,i,mkChar(lnames[i]));
PROTECT(listNames = allocVector(STRSXP,nouts));
for (int i=0; i<nouts; i++)
SET_STRING_ELT(listNames,i,mkChar(lnames[i]));
@@
-82,7
+82,7
@@
SEXP EMGLLF(
SET_VECTOR_ELT(listParams, 0, phi);
SET_VECTOR_ELT(listParams, 1, rho);
SET_VECTOR_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,
llh
);
SET_VECTOR_ELT(listParams, 4, S);
SET_VECTOR_ELT(listParams, 5, affec);
SET_VECTOR_ELT(listParams, 4, S);
SET_VECTOR_ELT(listParams, 5, affec);