projects
/
morpheus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
147b2ef
)
Update starting point in optimParams::run()
author
Benjamin Auder
<benjamin.auder@somewhere>
Sat, 21 Dec 2019 10:40:54 +0000
(11:40 +0100)
committer
Benjamin Auder
<benjamin.auder@somewhere>
Sat, 21 Dec 2019 10:40:54 +0000
(11:40 +0100)
pkg/R/optimParams.R
patch
|
blob
|
blame
|
history
diff --git
a/pkg/R/optimParams.R
b/pkg/R/optimParams.R
index
5d37898
..
039070c
100644
(file)
--- a/
pkg/R/optimParams.R
+++ b/
pkg/R/optimParams.R
@@
-269,15
+269,17
@@
setRefClass(
W <<- diag(d+d^2+d^3)
loopMax <- 2 #TODO: loopMax = 3 ? Seems not improving...
W <<- diag(d+d^2+d^3)
loopMax <- 2 #TODO: loopMax = 3 ? Seems not improving...
+ x_init <- linArgs(θ0)
for (loop in 1:loopMax)
{
for (loop in 1:loopMax)
{
- op_res = constrOptim(
linArgs(θ0)
, .self$f, .self$grad_f,
+ op_res = constrOptim(
x_init
, .self$f, .self$grad_f,
ui=cbind(
rbind( rep(-1,K-1), diag(K-1) ),
matrix(0, nrow=K, ncol=(d+1)*K) ),
ci=c(-1,rep(0,K-1)) )
if (loop < loopMax) #avoid computing an extra W
W <<- computeW(expArgs(op_res$par))
ui=cbind(
rbind( rep(-1,K-1), diag(K-1) ),
matrix(0, nrow=K, ncol=(d+1)*K) ),
ci=c(-1,rep(0,K-1)) )
if (loop < loopMax) #avoid computing an extra W
W <<- computeW(expArgs(op_res$par))
+ x_init <- op_res$par
#print(op_res$value) #debug
#print(expArgs(op_res$par)) #debug
}
#print(op_res$value) #debug
#print(expArgs(op_res$par)) #debug
}