Mercurial > octave-nkf
comparison scripts/optimization/fminunc.m @ 9631:00958d0c4e3c
split __dogleg__ > __doglegm__
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 09 Sep 2009 14:43:06 +0200 |
parents | 73e6ad869f08 |
children | ecc2c556f844 |
comparison
equal
deleted
inserted
replaced
9630:d52e405df4f7 | 9631:00958d0c4e3c |
---|---|
207 decfac = 0.5; | 207 decfac = 0.5; |
208 | 208 |
209 ## Inner loop. | 209 ## Inner loop. |
210 while (! suc && niter <= maxiter && nfev < maxfev && ! info) | 210 while (! suc && niter <= maxiter && nfev < maxfev && ! info) |
211 | 211 |
212 s = - __dogleg__ (hesr, grad, dg, delta, true); | 212 s = - __doglegm__ (hesr, grad, dg, delta); |
213 | 213 |
214 sn = norm (dg .* s); | 214 sn = norm (dg .* s); |
215 if (niter == 1) | 215 if (niter == 1) |
216 delta = min (delta, sn); | 216 delta = min (delta, sn); |
217 endif | 217 endif |