Mercurial > octave-nkf
comparison scripts/optimization/fminunc.m @ 14383:07c55bceca23 stable
Fix guarded_eval() subfunction in fminunc (bug #35534).
* fminunc.m: Fix guarded_eval() subfunction in fminunc (bug #35534).
author | Olaf Till <olaf.till@uni-jena.de> |
---|---|
date | Wed, 15 Feb 2012 14:44:37 +0100 |
parents | 72c96de7a403 |
children | 59aab666f2bf |
comparison
equal
deleted
inserted
replaced
14362:cb4f1915db92 | 14383:07c55bceca23 |
---|---|
348 else | 348 else |
349 fx = fun (x); | 349 fx = fun (x); |
350 gx = []; | 350 gx = []; |
351 endif | 351 endif |
352 | 352 |
353 if (! (isreal (fx) && isreal (jx))) | 353 if (! (isreal (fx) && isreal (gx))) |
354 error ("fminunc:notreal", "fminunc: non-real value encountered"); | 354 error ("fminunc:notreal", "fminunc: non-real value encountered"); |
355 elseif (complexeqn && ! (isnumeric (fx) && isnumeric(jx))) | |
356 error ("fminunc:notnum", "fminunc: non-numeric value encountered"); | |
357 elseif (any (isnan (fx(:)))) | 355 elseif (any (isnan (fx(:)))) |
358 error ("fminunc:isnan", "fminunc: NaN value encountered"); | 356 error ("fminunc:isnan", "fminunc: NaN value encountered"); |
359 endif | 357 endif |
360 endfunction | 358 endfunction |
361 | 359 |