Mercurial > hg > octave-nkf

diff scripts/general/strerror.m @ 11469:c776f063fefe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Overhaul m-script files to use common variable name between code and documentation.
author Rik <octave@nomad.inbox5.com>
date Sun, 09 Jan 2011 12:41:21 -0800
parents a1dbe9d80eee
children 1740012184f9
line wrap: on
line diff
--- a/scripts/general/strerror.m
+++ b/scripts/general/strerror.m
@@ -27,7 +27,7 @@
 
 ## Author: jwe
 
-function msg = strerror (name, err)
+function msg = strerror (name, num)
 
   if (nargin != 2)
     print_usage ();
@@ -37,22 +37,22 @@
     error ("strerror: first argument must be a string");
   endif
 
-  if (! isscalar (err))
+  if (! isscalar (num))
     error ("strerror: second argument must be a scalar");
   endif
 
   if (strcmp (name, "fsolve"))
 
-    if (err == -2)
+    if (num == -2)
       msg = "input error\n";
-    elseif (err == -1)
+    elseif (num == -1)
       msg = "error encountered in user-supplied function\n";
-    elseif (err == 1)
+    elseif (num == 1)
       msg = "solution converged to requested tolerance\n";
-    elseif (err == 4)
+    elseif (num == 3)
+      msg = "iteration is not making good progress\n";
+    elseif (num == 4)
       msg = "iteration limit exceeded\n";
-    elseif (err == 3)
-      msg = "iteration is not making good progress\n";
     else
       error ("strerror: unrecognized error code for fsolve");
     endif