Mercurial > hg > octave-lyh

diff scripts/optimization/fsolve.m @ 8997:187a9d9c2f04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplifications to fsolve
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 19 Mar 2009 08:54:56 +0100
parents c235a59d30a4
children 1bf0ce0930be
line wrap: on
line diff
--- a/scripts/optimization/fsolve.m
+++ b/scripts/optimization/fsolve.m
@@ -406,12 +406,12 @@
     [fx, jx] = fun (x);
   else
     fx = fun (x);
-    jx = []
+    jx = [];
   endif
 
-  if (! complexeqn && ! (all (isreal (fx(:))) && all (isreal (jx(:)))))
+  if (! complexeqn && ! (isreal (fx) && isreal (jx)))
     error ("fsolve:notreal", "fsolve: non-real value encountered"); 
-  elseif (complexeqn && ! (all (isnumeric (fx(:))) && all (isnumeric(jx(:)))))
+  elseif (complexeqn && ! (isnumeric (fx) && isnumeric(jx)))
     error ("fsolve:notnum", "fsolve: non-numeric value encountered");
   elseif (any (isnan (fx(:))))
     error ("fsolve:isnan", "fsolve: NaN value encountered");