X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FoptimParams.R;h=79e2876fa6372a9b566591bc8e28a1ae1ead56a7;hb=2989133a738da99b78594cb00afdd3d87916b8bd;hp=5d378989e4b234e2b4620b80b38456ff536e1b2c;hpb=07f2d0453144f5b639dcc28f1df40a141db7da79;p=morpheus.git diff --git a/pkg/R/optimParams.R b/pkg/R/optimParams.R index 5d37898..79e2876 100644 --- a/pkg/R/optimParams.R +++ b/pkg/R/optimParams.R @@ -269,17 +269,17 @@ setRefClass( W <<- diag(d+d^2+d^3) loopMax <- 2 #TODO: loopMax = 3 ? Seems not improving... + x_init <- linArgs(θ0) 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)) - #print(op_res$value) #debug - #print(expArgs(op_res$par)) #debug + #x_init <- op_res$par #degrades performances (TODO: why?) } expArgs(op_res$par)