projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics (rename tau to eps everywhere)
[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
f24cd2a
..
1503315
100644
(file)
--- a/
pkg/src/adapters/a.EMGLLF.c
+++ b/
pkg/src/adapters/a.EMGLLF.c
@@
-14,7
+14,7
@@
SEXP EMGLLF(
SEXP lambda_,
SEXP X_,
SEXP Y_,
SEXP lambda_,
SEXP X_,
SEXP Y_,
- SEXP
tau
_
+ SEXP
eps
_
) {
// Get matrices dimensions
int n = INTEGER(getAttrib(X_, R_DimSymbol))[0];
) {
// Get matrices dimensions
int n = INTEGER(getAttrib(X_, R_DimSymbol))[0];
@@
-32,7
+32,7
@@
SEXP EMGLLF(
int maxi = INTEGER_VALUE(maxi_);
double gamma = NUMERIC_VALUE(gamma_);
double lambda = NUMERIC_VALUE(lambda_);
int maxi = INTEGER_VALUE(maxi_);
double gamma = NUMERIC_VALUE(gamma_);
double lambda = NUMERIC_VALUE(lambda_);
- double
tau = NUMERIC_VALUE(tau
_);
+ double
eps = NUMERIC_VALUE(eps
_);
// Get pointers from SEXP arrays ; WARNING: by columns !
double* phiInit = REAL(phiInit_);
// Get pointers from SEXP arrays ; WARNING: by columns !
double* phiInit = REAL(phiInit_);
@@
-66,7
+66,7
@@
SEXP EMGLLF(
// Call to EMGLLF //
////////////////////
// Call to EMGLLF //
////////////////////
- EMGLLF_core(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,
tau
,
+ EMGLLF_core(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,
eps
,
pPhi,pRho,pPi,pLLF,pS,pAffec,
n,p,m,k);
pPhi,pRho,pPi,pLLF,pS,pAffec,
n,p,m,k);