projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temporary fix: use R version of EMGLLF and EMGrank in package
[valse.git]
/
pkg
/
R
/
EMGLLF.R
diff --git
a/pkg/R/EMGLLF.R
b/pkg/R/EMGLLF.R
index
7d9ee77
..
5484706
100644
(file)
--- a/
pkg/R/EMGLLF.R
+++ b/
pkg/R/EMGLLF.R
@@
-25,6
+25,9
@@
EMGLLF <- function(phiInit, rhoInit, piInit, gamInit,
mini, maxi, gamma, lambda, X, Y, tau)
{
EMGLLF <- function(phiInit, rhoInit, piInit, gamInit,
mini, maxi, gamma, lambda, X, Y, tau)
{
+ #TEMPORARY: use R version
+ return (EMGLLF_R(phiInit, rhoInit, piInit, gamInit,mini, maxi, gamma, lambda, X, Y, tau))
+
n = nrow(X) #nombre d'echantillons
p = ncol(X) #nombre de covariables
m = ncol(Y) #taille de Y (multivarié)
n = nrow(X) #nombre d'echantillons
p = ncol(X) #nombre de covariables
m = ncol(Y) #taille de Y (multivarié)