projects
/
morpheus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forgot to add weights as a field in Optimparams class
[morpheus.git]
/
reports
/
multistart.R
diff --git
a/reports/multistart.R
b/reports/multistart.R
index
b3d1e10
..
9971cd2
100644
(file)
--- a/
reports/multistart.R
+++ b/
reports/multistart.R
@@
-46,7
+46,7
@@
ms <- multiRun(
library(morpheus)
K <- fargs$optargs$K
op <- optimParams(K, fargs$optargs$link, fargs$optargs)
library(morpheus)
K <- fargs$optargs$K
op <- optimParams(K, fargs$optargs$link, fargs$optargs)
- x_init <-
c(rep(1/K,K-1), as.double(fargs$mu),
rep(0,K))
+ x_init <-
list(p=rep(1/K,K-1), beta=fargs$mu, b=
rep(0,K))
do.call(rbind,op$run(x_init))
},
function(fargs) {
do.call(rbind,op$run(x_init))
},
function(fargs) {
@@
-58,7
+58,7
@@
ms <- multiRun(
best_par <- list()
for (i in 1:fargs$optargs$nstart)
{
best_par <- list()
for (i in 1:fargs$optargs$nstart)
{
- x_init <-
c(rep(1/K,K-1), as.double(i*fargs$mu),
rep(0,K))
+ x_init <-
list(p=rep(1/K,K-1), beta=i*fargs$mu, b=
rep(0,K))
par <- op$run(x_init)
val <- op$f( op$linArgs(par) )
if (val < best_val)
par <- op$run(x_init)
val <- op$f( op$linArgs(par) )
if (val < best_val)