projects
/
morpheus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix accuracy.R + add postTreatment draft
[morpheus.git]
/
reports
/
timings.R
diff --git
a/reports/timings.R
b/reports/timings.R
index
704fd82
..
6d26bc0
100644
(file)
--- a/
reports/timings.R
+++ b/
reports/timings.R
@@
-16,8
+16,8
@@
ourOptim <- function(X, Y, K, link)
{
M <- computeMoments(X, Y)
mu <- computeMu(X, Y, list(K=K,M=M))
{
M <- computeMoments(X, Y)
mu <- computeMu(X, Y, list(K=K,M=M))
- x_init =
c(1/2, as.double(mu), c(0,0
))
- optimParams(
K, link, list(M=M)
)$run(x_init)
+ x_init =
list(p=rep(1/K,K-1), beta=mu, b=rep(0,K
))
+ optimParams(
X, Y, K, link, M, 1
)$run(x_init)
NULL
}
NULL
}