octave-lyh: src/DLD-FUNCTIONS/lsode.cc comparison

[project @ 2002-05-24 17:58:16 by jwe]

comparison

equal deleted inserted replaced

-:b88e01ad515e
+:5a848097fe4a
 } \
 while (0)
 DEFUN_DLD (lsode, args, nargout,
 "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} lsode (@var{fcn}, @var{x0}, @var{t}, @var{t_crit})\n\
+@deftypefn {Loadable Function} {[@var{x}, @var{istate}, @var{msg}]} lsode (@var{fcn}, @var{x0}, @var{t}, @var{t_crit})\n\
 Return a matrix of @var{x} as a function of @var{t}, given the initial\n\
 state of the system @var{x0}.  Each row in the result matrix corresponds\n\
 to one of the elements in the vector @var{t}.  The first element of\n\
 @var{t} corresponds to the initial state @var{x0}, so that the first row\n\
 of the output is @var{x0}.\n\
 if (call_depth > 1)
 LSODE_ABORT1 ("invalid recursive call");
 int nargin = args.length ();
-if (nargin > 2 && nargin < 5 && nargout < 2)
+if (nargin > 2 && nargin < 5 && nargout < 4)
 {
 octave_value f_arg = args(0);
 switch (f_arg.rows ())
 	{
 else
 	output = ode.integrate (out_times);
 if (! error_state)
 	{
-	  retval.resize (1);
+	  retval(2) = ode.error_message ();
-	  retval(0) = output;
+	  retval(1) = static_cast<double> (ode.integration_state ());
+	  if (ode.integration_ok ())
+	    retval = output;
+	  else
+	    {
+	      output = Matrix ();
+	      if (nargout < 2)
+		{
+		  std::string msg = ode.error_message ();
+		  error ("lsode: %s", msg.c_str ());
+		}
+	    }
 	}
 }
 else
 print_usage ("lsode");

Mercurial > hg > octave-lyh