Mercurial > hg > octave-lyh

diff src/DLD-FUNCTIONS/fsolve.cc @ 4132:87eb044020ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-10-29 21:21:45 by jwe]
author jwe
date Tue, 29 Oct 2002 21:21:45 +0000
parents 19a1626b8d57
children 02ca908056e9
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/fsolve.cc
+++ b/src/DLD-FUNCTIONS/fsolve.cc
@@ -185,10 +185,10 @@
       if (error_state)
 	FSOLVE_ABORT1 ("expecting vector as second argument");
 
-      if (nargin > 2)
+      if (nargin > 3)
 	warning ("fsolve: ignoring extra arguments");
 
-      if (nargout > 2)
+      if (nargout > 3)
 	warning ("fsolve: can't compute path output yet");
 
       NLFunc nleqn_fcn (fsolve_user_function);
@@ -205,15 +205,10 @@
 	  retval(2) = msg;
 	  retval(1) = static_cast<double> (hybrd_info_to_fsolve_info (info));
 
-	  if (nleqn.solution_ok ())
-	    retval(0) = soln;
-	  else
-	    {
-	      retval(0) = Matrix ();
+	  retval(0) = soln;
 
-	      if (nargout < 2)
-		error ("fsolve: %s", msg.c_str ());
-	    }
+	  if (! nleqn.solution_ok () && nargout < 2)
+	    error ("fsolve: %s", msg.c_str ());
 	}
     }
   else