octave: scripts/ode/ode23.m annotate

annotate scripts/ode/ode23.m @ 23219:3ac9f9ecfae5 stable

maint: Update copyright dates.

author	John W. Eaton <jwe@octave.org>
date	Wed, 22 Feb 2017 12:39:29 -0500
parents	e9a0469dedd9
children	092078913d54

rev	line source
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	1 ## Copyright (C) 2016-2017 Carlo de Falco
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	2 ## Copyright (C) 2016 Francesco Faccio <francesco.faccio@mail.polimi.it>
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22299 diff changeset	3 ## Copyright (C) 2014-2016 Jacopo Corno <jacopo.corno@gmail.com>
bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22299 diff changeset	4 ## Copyright (C) 2013-2016 Roberto Porcu' <roberto.porcu@polimi.it>
bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22299 diff changeset	5 ## Copyright (C) 2006-2016 Thomas Treichl <treichl@users.sourceforge.net>
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	6 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	7 ## This file is part of Octave.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	8 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	9 ## Octave is free software; you can redistribute it and/or modify it
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	10 ## under the terms of the GNU General Public License as published by
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	11 ## the Free Software Foundation; either version 3 of the License, or (at
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	12 ## your option) any later version.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	13 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	14 ## Octave is distributed in the hope that it will be useful, but
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	15 ## WITHOUT ANY WARRANTY; without even the implied warranty of
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	16 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	17 ## General Public License for more details.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	18 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	19 ## You should have received a copy of the GNU General Public License
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	20 ## along with Octave; see the file COPYING. If not, see
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	21 ## <http://www.gnu.org/licenses/>.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	22
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	23 ## -- texinfo --
21319 8880d93010d8 Remove further uses of CLASS field in @deftypefn macro. Rik <rik@octave.org> parents: 21123 diff changeset	24 ## @deftypefn {} {[@var{t}, @var{y}] =} ode23 (@var{fun}, @var{trange}, @var{init})
8880d93010d8 Remove further uses of CLASS field in @deftypefn macro. Rik <rik@octave.org> parents: 21123 diff changeset	25 ## @deftypefnx {} {[@var{t}, @var{y}] =} ode23 (@var{fun}, @var{trange}, @var{init}, @var{ode_opt})
8880d93010d8 Remove further uses of CLASS field in @deftypefn macro. Rik <rik@octave.org> parents: 21123 diff changeset	26 ## @deftypefnx {} {[@var{t}, @var{y}, @var{te}, @var{ye}, @var{ie}] =} ode23 (@dots{})
8880d93010d8 Remove further uses of CLASS field in @deftypefn macro. Rik <rik@octave.org> parents: 21123 diff changeset	27 ## @deftypefnx {} {@var{solution} =} ode23 (@dots{})
22939 54302b670139 doc: Document nargout=0 calling mode for ode23, ode45. Rik <rik@octave.org> parents: 22937 diff changeset	28 ## @deftypefnx {} {} ode23 (@dots{})
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	29 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	30 ## Solve a set of non-stiff Ordinary Differential Equations (non-stiff ODEs)
21123 71408ab5071e doc: Periodic spellcheck of documentation. Rik <rik@octave.org> parents: 20928 diff changeset	31 ## with the well known explicit @nospell{Bogacki-Shampine} method of order 3.
71408ab5071e doc: Periodic spellcheck of documentation. Rik <rik@octave.org> parents: 20928 diff changeset	32 ## For the definition of this method see
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	33 ## @url{http://en.wikipedia.org/wiki/List_of_Runge%E2%80%93Kutta_methods}.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	34 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	35 ## @var{fun} is a function handle, inline function, or string containing the
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	36 ## name of the function that defines the ODE: @code{y' = f(t,y)}. The function
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	37 ## must accept two inputs where the first is time @var{t} and the second is a
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	38 ## column vector of unknowns @var{y}.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	39 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	40 ## @var{trange} specifies the time interval over which the ODE will be
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	41 ## evaluated. Typically, it is a two-element vector specifying the initial and
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	42 ## final times (@code{[tinit, tfinal]}). If there are more than two elements
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	43 ## then the solution will also be evaluated at these intermediate time
22594 b8d525710075 cleanup ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22593 diff changeset	44 ## instances.
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	45 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	46 ## By default, @code{ode23} uses an adaptive timestep with the
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	47 ## @code{integrate_adaptive} algorithm. The tolerance for the timestep
22625 081a201b77c7 Clean up ode options implementation to follow Octave coding standards. Carlo de Falco <carlo.defalco@polimi.it> parents: 22605 diff changeset	48 ## computation may be changed by using the options @qcode{"RelTol"}
081a201b77c7 Clean up ode options implementation to follow Octave coding standards. Carlo de Falco <carlo.defalco@polimi.it> parents: 22605 diff changeset	49 ## and @qcode{"AbsTol"}.
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	50 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	51 ## @var{init} contains the initial value for the unknowns. If it is a row
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	52 ## vector then the solution @var{y} will be a matrix in which each column is
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	53 ## the solution for the corresponding initial value in @var{init}.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	54 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	55 ## The optional fourth argument @var{ode_opt} specifies non-default options to
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	56 ## the ODE solver. It is a structure generated by @code{odeset}.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	57 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	58 ## The function typically returns two outputs. Variable @var{t} is a
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	59 ## column vector and contains the times where the solution was found. The
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	60 ## output @var{y} is a matrix in which each column refers to a different
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	61 ## unknown of the problem and each row corresponds to a time in @var{t}.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	62 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	63 ## The output can also be returned as a structure @var{solution} which
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	64 ## has a field @var{x} containing a row vector of times where the solution
bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	65 ## was evaluated and a field @var{y} containing the solution matrix such
bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	66 ## that each column corresponds to a time in @var{x}.
21546 f7f97d7e9294 doc: Wrap m-file docstrings to 79 characters + newline (80 total). Rik <rik@octave.org> parents: 21443 diff changeset	67 ## Use @code{fieldnames (@var{solution})} to see the other fields and
f7f97d7e9294 doc: Wrap m-file docstrings to 79 characters + newline (80 total). Rik <rik@octave.org> parents: 21443 diff changeset	68 ## additional information returned.
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	69 ##
22939 54302b670139 doc: Document nargout=0 calling mode for ode23, ode45. Rik <rik@octave.org> parents: 22937 diff changeset	70 ## If no output arguments are requested, and no @code{OutputFcn} is
54302b670139 doc: Document nargout=0 calling mode for ode23, ode45. Rik <rik@octave.org> parents: 22937 diff changeset	71 ## specified in @var{ode_opt}, then the @code{OutputFcn} is set to
54302b670139 doc: Document nargout=0 calling mode for ode23, ode45. Rik <rik@octave.org> parents: 22937 diff changeset	72 ## @code{odeplot} and the results of the solver are plotted immediately.
54302b670139 doc: Document nargout=0 calling mode for ode23, ode45. Rik <rik@octave.org> parents: 22937 diff changeset	73 ##
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	74 ## If using the @qcode{"Events"} option then three additional outputs may
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	75 ## be returned. @var{te} holds the time when an Event function returned a
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	76 ## zero. @var{ye} holds the value of the solution at time @var{te}. @var{ie}
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	77 ## contains an index indicating which Event function was triggered in the case
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	78 ## of multiple Event functions.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	79 ##
21123 71408ab5071e doc: Periodic spellcheck of documentation. Rik <rik@octave.org> parents: 20928 diff changeset	80 ## Example: Solve the @nospell{Van der Pol} equation
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	81 ##
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	82 ## @example
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	83 ## @group
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	84 ## fvdp = @@(@var{t},@var{y}) [@var{y}(2); (1 - @var{y}(1)^2) * @var{y}(2) - @var{y}(1)];
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	85 ## [@var{t},@var{y}] = ode23 (fvdp, [0, 20], [2, 0]);
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	86 ## @end group
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	87 ## @end example
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	88 ## @seealso{odeset, odeget, ode45}
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	89 ## @end deftypefn
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	90
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	91 function varargout = ode23 (fun, trange, init, varargin)
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	92
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	93 if (nargin < 3)
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	94 print_usage ();
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	95 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	96
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	97 order = 3;
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	98 solver = "ode23";
20928 2b8447888e0a strip trailing whitespace from files John W. Eaton <jwe@octave.org> parents: 20908 diff changeset	99
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	100 if (nargin >= 4)
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	101 if (! isstruct (varargin{1}))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	102 ## varargin{1:len} are parameters for fun
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	103 odeopts = odeset ();
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	104 funarguments = varargin;
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	105 elseif (numel (varargin) > 1)
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	106 ## varargin{1} is an ODE options structure opt
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	107 odeopts = varargin{1};
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	108 funarguments = {varargin{2:numel (varargin)}};
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	109 else # if (isstruct (varargin{1}))
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	110 odeopts = varargin{1};
dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	111 funarguments = {};
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	112 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	113 else # nargin == 3
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	114 odeopts = odeset ();
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	115 funarguments = {};
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	116 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	117
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	118 if (! isnumeric (trange) \|\| ! isvector (trange))
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	119 error ("Octave:invalid-input-arg",
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	120 "ode23: TRANGE must be a numeric vector");
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	121 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	122
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	123 if (numel (trange) < 2)
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	124 error ("Octave:invalid-input-arg",
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	125 "ode23: TRANGE must contain at least 2 elements");
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	126 elseif (trange(2) == trange(1))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	127 error ("Octave:invalid-input-arg",
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	128 "ode23: invalid time span, TRANGE(1) == TRANGE(2)");
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	129 else
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	130 direction = sign (trange(2) - trange(1));
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	131 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	132 trange = trange(:);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	133
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	134 if (! isnumeric (init) \|\| ! isvector (init))
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	135 error ("Octave:invalid-input-arg",
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	136 "ode23: INIT must be a numeric vector");
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	137 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	138 init = init(:);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	139
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	140 if (ischar (fun))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	141 try
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	142 fun = str2func (fun);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	143 catch
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	144 warning (lasterr);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	145 end_try_catch
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	146 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	147 if (! isa (fun, "function_handle"))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	148 error ("Octave:invalid-input-arg",
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	149 "ode23: FUN must be a valid function handle");
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	150 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	151
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	152 ## Start preprocessing, have a look which options are set in odeopts,
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	153 ## check if an invalid or unused option is set.
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	154 [defaults, classes, attributes] = odedefaults (numel (init),
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	155 trange(1), trange(end));
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	156
22660 7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	157 persistent ode23_ignore_options = ...
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	158 {"BDF", "InitialSlope", "Jacobian", "JPattern",
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	159 "MassSingular", "MaxOrder", "MvPattern", "Vectorized"};
22707 413a19bca7f3 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22661 diff changeset	160
22660 7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	161 defaults = rmfield (defaults, ode23_ignore_options);
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	162 classes = rmfield (classes, ode23_ignore_options);
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	163 attributes = rmfield (attributes, ode23_ignore_options);
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	164
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	165 odeopts = odemergeopts ("ode23", odeopts, defaults, classes, attributes);
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	166
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	167 odeopts.funarguments = funarguments;
dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	168 odeopts.direction = direction;
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	169
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	170 if (! isempty (odeopts.NonNegative))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	171 if (isempty (odeopts.Mass))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	172 odeopts.havenonnegative = true;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	173 else
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	174 odeopts.havenonnegative = false;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	175 warning ("Octave:invalid-input-arg",
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	176 ['ode23: option "NonNegative" is ignored', ...
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	177 " when mass matrix is set\n"]);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	178 endif
20928 2b8447888e0a strip trailing whitespace from files John W. Eaton <jwe@octave.org> parents: 20908 diff changeset	179 else
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	180 odeopts.havenonnegative = false;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	181 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	182
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	183 if (isempty (odeopts.OutputFcn) && nargout == 0)
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	184 odeopts.OutputFcn = @odeplot;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	185 odeopts.haveoutputfunction = true;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	186 else
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	187 odeopts.haveoutputfunction = ! isempty (odeopts.OutputFcn);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	188 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	189
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	190 if (isempty (odeopts.InitialStep))
20908 0fb9de5b7903 remove verbose warnings from ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 20902 diff changeset	191 odeopts.InitialStep = odeopts.direction * ...
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	192 starting_stepsize (order, fun, trange(1), init,
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	193 odeopts.AbsTol, odeopts.RelTol,
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	194 strcmp (odeopts.NormControl, "on"),
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	195 odeopts.funarguments);
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	196 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	197
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	198 if (! isempty (odeopts.Mass) && isnumeric (odeopts.Mass))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	199 havemasshandle = false;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	200 mass = odeopts.Mass; # constant mass
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	201 elseif (isa (odeopts.Mass, "function_handle"))
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	202 havemasshandle = true; # mass defined by a function handle
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	203 else # no mass matrix - creating a diag-matrix of ones for mass
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	204 havemasshandle = false; # mass = diag (ones (length (init), 1), 0);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	205 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	206
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	207 ## Starting the initialization of the core solver ode23
20928 2b8447888e0a strip trailing whitespace from files John W. Eaton <jwe@octave.org> parents: 20908 diff changeset	208
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	209 if (havemasshandle) # Handle only the dynamic mass matrix,
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	210 if (! strcmp (odeopts.MStateDependence, "none"))
22661 c00578ac8dda Resolve FIXME notes in ode code base. Rik <rik@octave.org> parents: 22660 diff changeset	211 ## constant mass matrices have already been handled
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	212 mass = @(t,x) odeopts.Mass (t, x, odeopts.funarguments{:});
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	213 fun = @(t,x) mass (t, x, odeopts.funarguments{:}) ...
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	214 \ fun (t, x, odeopts.funarguments{:});
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	215 else
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	216 mass = @(t) odeopts.Mass (t, odeopts.funarguments{:});
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	217 fun = @(t,x) mass (t, odeopts.funarguments{:}) ...
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	218 \ fun (t, x, odeopts.funarguments{:});
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	219 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	220 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	221
22659 04fc7e9c5f96 Disable Refine option of ode solvers for certain input/output combinations (partial fix bug #49408). Rik <rik@octave.org> parents: 22658 diff changeset	222 if (nargout == 1)
04fc7e9c5f96 Disable Refine option of ode solvers for certain input/output combinations (partial fix bug #49408). Rik <rik@octave.org> parents: 22658 diff changeset	223 ## Single output requires auto-selected intermediate times,
04fc7e9c5f96 Disable Refine option of ode solvers for certain input/output combinations (partial fix bug #49408). Rik <rik@octave.org> parents: 22658 diff changeset	224 ## which is obtained by NOT specifying specific solution times.
04fc7e9c5f96 Disable Refine option of ode solvers for certain input/output combinations (partial fix bug #49408). Rik <rik@octave.org> parents: 22658 diff changeset	225 trange = [trange(1); trange(end)];
04fc7e9c5f96 Disable Refine option of ode solvers for certain input/output combinations (partial fix bug #49408). Rik <rik@octave.org> parents: 22658 diff changeset	226 odeopts.Refine = []; # disable Refine when single output requested
04fc7e9c5f96 Disable Refine option of ode solvers for certain input/output combinations (partial fix bug #49408). Rik <rik@octave.org> parents: 22658 diff changeset	227 elseif (numel (trange) > 2)
04fc7e9c5f96 Disable Refine option of ode solvers for certain input/output combinations (partial fix bug #49408). Rik <rik@octave.org> parents: 22658 diff changeset	228 odeopts.Refine = []; # disable Refine when specific times requested
22658 56d7d423aff9 Return intermediate integration times when single output argument used in ode solver (bug #49417). Rik <rik@octave.org> parents: 22655 diff changeset	229 endif
56d7d423aff9 Return intermediate integration times when single output argument used in ode solver (bug #49417). Rik <rik@octave.org> parents: 22655 diff changeset	230
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	231 solution = integrate_adaptive (@runge_kutta_23,
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	232 order, fun, trange, init, odeopts);
22625 081a201b77c7 Clean up ode options implementation to follow Octave coding standards. Carlo de Falco <carlo.defalco@polimi.it> parents: 22605 diff changeset	233
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	234 ## Postprocessing, do whatever when terminating integration algorithm
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	235 if (odeopts.haveoutputfunction) # Cleanup plotter
22639 7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	236 feval (odeopts.OutputFcn, [], [], "done", odeopts.funarguments{:});
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	237 endif
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	238 if (! isempty (odeopts.Events)) # Cleanup event function handling
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	239 ode_event_handler (odeopts.Events, solution.t(end),
22655 6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	240 solution.x(end,:).', "done", odeopts.funarguments{:});
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	241 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	242
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	243 ## Print additional information if option Stats is set
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	244 if (strcmp (odeopts.Stats, "on"))
21955 0f3e875d9078 Fix statistics on solution solving for ode45, ode23 (bug #48243). jcorno <jacopo.corno@gmail.com> parents: 21751 diff changeset	245 nsteps = solution.cntloop; # cntloop from 2..end
0f3e875d9078 Fix statistics on solution solving for ode45, ode23 (bug #48243). jcorno <jacopo.corno@gmail.com> parents: 21751 diff changeset	246 nfailed = solution.cntcycles - nsteps; # cntcycl from 1..end
0f3e875d9078 Fix statistics on solution solving for ode45, ode23 (bug #48243). jcorno <jacopo.corno@gmail.com> parents: 21751 diff changeset	247 nfevals = 3 * solution.cntcycles + 1; # number of ode evaluations
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	248 ndecomps = 0; # number of LU decompositions
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	249 npds = 0; # number of partial derivatives
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	250 nlinsols = 0; # no. of solutions of linear systems
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	251 ## Print cost statistics if no output argument is given
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	252 if (nargout == 0)
21634 96518f623c91 Backed out changeset dcf8922b724b Mike Miller <mtmiller@octave.org> parents: 21633 diff changeset	253 printf ("Number of successful steps: %d\n", nsteps);
96518f623c91 Backed out changeset dcf8922b724b Mike Miller <mtmiller@octave.org> parents: 21633 diff changeset	254 printf ("Number of failed attempts: %d\n", nfailed);
96518f623c91 Backed out changeset dcf8922b724b Mike Miller <mtmiller@octave.org> parents: 21633 diff changeset	255 printf ("Number of function calls: %d\n", nfevals);
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	256 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	257 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	258
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	259 if (nargout == 2)
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	260 varargout{1} = solution.t; # Time stamps are first output argument
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	261 varargout{2} = solution.x; # Results are second output argument
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	262 elseif (nargout == 1)
22655 6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	263 varargout{1}.x = solution.t.'; # Time stamps are saved in field x (row vector)
6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	264 varargout{1}.y = solution.x.'; # Results are saved in field y (row vector)
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	265 varargout{1}.solver = solver; # Solver name is saved in field solver
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	266 if (! isempty (odeopts.Events))
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	267 varargout{1}.ie = solution.event{2}; # Index info which event occurred
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	268 varargout{1}.xe = solution.event{3}; # Time info when an event occurred
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	269 varargout{1}.ye = solution.event{4}; # Results when an event occurred
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	270 endif
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	271 if (strcmp (odeopts.Stats, "on"))
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	272 varargout{1}.stats = struct ();
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	273 varargout{1}.stats.nsteps = nsteps;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	274 varargout{1}.stats.nfailed = nfailed;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	275 varargout{1}.stats.nfevals = nfevals;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	276 varargout{1}.stats.npds = npds;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	277 varargout{1}.stats.ndecomps = ndecomps;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	278 varargout{1}.stats.nlinsols = nlinsols;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	279 endif
22937 2b2ac017c901 Fix undefined return argument for more than 2 outputs from ode solver (bug #49890). Rik <rik@octave.org> parents: 22707 diff changeset	280 elseif (nargout > 2)
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	281 varargout = cell (1,5);
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	282 varargout{1} = solution.t;
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	283 varargout{2} = solution.x;
22593 dba5074bdc79 simplify options management in ode solvers Carlo de Falco <carlo.defalco@polimi.it> parents: 22445 diff changeset	284 if (! isempty (odeopts.Events))
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	285 varargout{3} = solution.event{3}; # Time info when an event occurred
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	286 varargout{4} = solution.event{4}; # Results when an event occurred
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	287 varargout{5} = solution.event{2}; # Index info which event occurred
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	288 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	289 endif
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	290
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	291 endfunction
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	292
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	293
21599 f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	294 %!demo
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	295 %! ## Demonstrate convergence order for ode23
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	296 %! tol = 1e-5 ./ 10.^[0:8];
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	297 %! for i = 1 : numel (tol)
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	298 %! opt = odeset ("RelTol", tol(i), "AbsTol", realmin);
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	299 %! [t, y] = ode23 (@(t, y) -y, [0, 1], 1, opt);
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	300 %! h(i) = 1 / (numel (t) - 1);
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	301 %! err(i) = norm (y .* exp (t) - 1, Inf);
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	302 %! endfor
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	303 %!
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	304 %! ## Estimate order visually
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	305 %! loglog (h, tol, "-ob",
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	306 %! h, err, "-b",
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	307 %! h, (h/h(end)) .^ 2 .* tol(end), "k--",
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	308 %! h, (h/h(end)) .^ 3 .* tol(end), "k-");
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	309 %! axis tight
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	310 %! xlabel ("h");
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	311 %! ylabel ("err(h)");
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	312 %! title ("Convergence plot for ode23");
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	313 %! legend ("imposed tolerance", "ode23 (relative) error",
f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	314 %! "order 2", "order 3", "location", "northwest");
22647 cf8ec7abb4ae Clean up demo and test blocks for ode functions. Rik <rik@octave.org> parents: 22644 diff changeset	315 %!
cf8ec7abb4ae Clean up demo and test blocks for ode functions. Rik <rik@octave.org> parents: 22644 diff changeset	316 %! ## Estimate order numerically
cf8ec7abb4ae Clean up demo and test blocks for ode functions. Rik <rik@octave.org> parents: 22644 diff changeset	317 %! p = diff (log (err)) ./ diff (log (h))
21599 f29d68e24c5a ode23.m, ode45.m: More reformatting of demos to Octave coding standards. Rik <rik@octave.org> parents: 21596 diff changeset	318
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	319 ## We are using the "Van der Pol" implementation for all tests that are done
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	320 ## for this function.
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	321 ## For further tests we also define a reference solution (computed at high
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	322 ## accuracy)
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	323 %!function ydot = fpol (t, y) # The Van der Pol ODE
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	324 %! ydot = [y(2); (1 - y(1)^2) * y(2) - y(1)];
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	325 %!endfunction
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	326 %!function ref = fref () # The computed reference sol
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	327 %! ref = [0.32331666704577, -1.83297456798624];
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	328 %!endfunction
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	329 %!function [val, trm, dir] = feve (t, y, varargin)
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	330 %! val = fpol (t, y, varargin); # We use the derivatives
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	331 %! trm = zeros (2,1); # that's why component 2
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	332 %! dir = ones (2,1); # does not seem to be exact
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	333 %!endfunction
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	334 %!function [val, trm, dir] = fevn (t, y, varargin)
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	335 %! val = fpol (t, y, varargin); # We use the derivatives
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	336 %! trm = ones (2,1); # that's why component 2
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	337 %! dir = ones (2,1); # does not seem to be exact
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	338 %!endfunction
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	339 %!function mas = fmas (t, y, varargin)
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	340 %! mas = [1, 0; 0, 1]; # Dummy mass matrix for tests
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	341 %!endfunction
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	342 %!function mas = fmsa (t, y, varargin)
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	343 %! mas = sparse ([1, 0; 0, 1]); # A sparse dummy matrix
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	344 %!endfunction
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	345 %!function out = fout (t, y, flag, varargin)
22639 7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	346 %! out = false;
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	347 %! if (strcmp (flag, "init"))
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	348 %! if (! isequal (size (t), [2, 1]))
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	349 %! error ('fout: step "init"');
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	350 %! endif
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	351 %! elseif (isempty (flag))
22639 7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	352 %! if (! isequal (size (t), [1, 1]))
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	353 %! error ('fout: step "calc"');
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	354 %! endif
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	355 %! elseif (strcmp (flag, "done"))
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	356 %! if (! isempty (t))
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	357 %! warning ('fout: step "done"');
7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	358 %! endif
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	359 %! else
22639 7efa2d0e22c9 More Matlab-compatible implementation of OutputFcn. Clean up odeplot.m. Rik <rik@octave.org> parents: 22626 diff changeset	360 %! error ("fout: invalid flag <%s>", flag);
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	361 %! endif
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	362 %!endfunction
afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	363 %!
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	364 %!test # two output arguments
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	365 %! [t, y] = ode23 (@fpol, [0 2], [2 0]);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	366 %! assert ([t(end), y(end,:)], [2, fref], 1e-3);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	367 %!test # anonymous function instead of real function
22644 23941beb44cd Cleanup variable names, obsolete ChangeLog info in ode23, ode45. Rik <rik@octave.org> parents: 22643 diff changeset	368 %! fvdp = @(t,y) [y(2); (1 - y(1)^2) * y(2) - y(1)];
23941beb44cd Cleanup variable names, obsolete ChangeLog info in ode23, ode45. Rik <rik@octave.org> parents: 22643 diff changeset	369 %! [t, y] = ode23 (fvdp, [0 2], [2 0]);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	370 %! assert ([t(end), y(end,:)], [2, fref], 1e-3);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	371 %!test # extra input arguments passed through
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	372 %! [t, y] = ode23 (@fpol, [0 2], [2 0], 12, 13, "KL");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	373 %! assert ([t(end), y(end,:)], [2, fref], 1e-3);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	374 %!test # empty OdePkg structure but extra input arguments
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	375 %! opt = odeset;
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	376 %! [t, y] = ode23 (@fpol, [0 2], [2 0], opt, 12, 13, "KL");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	377 %! assert ([t(end), y(end,:)], [2, fref], 1e-2);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	378 %!test # Solve another anonymous function below zero
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	379 %! ref = [0, 14.77810590694212];
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	380 %! [t, y] = ode23 (@(t,y) y, [-2 0], 2);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	381 %! assert ([t(end), y(end,:)], ref, 1e-2);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	382 %!test # InitialStep option
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	383 %! opt = odeset ("InitialStep", 1e-8);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	384 %! [t, y] = ode23 (@fpol, [0 0.2], [2 0], opt);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	385 %! assert ([t(2)-t(1)], [1e-8], 1e-9);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	386 %!test # MaxStep option
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	387 %! opt = odeset ("MaxStep", 1e-3);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	388 %! sol = ode23 (@fpol, [0 0.2], [2 0], opt);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	389 %! assert ([sol.x(5)-sol.x(4)], [1e-3], 1e-4);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	390 %!test # Solve in backward direction starting at t=0
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	391 %! ref = [-1.205364552835178, 0.951542399860817];
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	392 %! sol = ode23 (@fpol, [0 -2], [2 0]);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	393 %! assert ([sol.x(end); sol.y(:,end)], [-2; ref'], 5e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	394 %!test # Solve in backward direction starting at t=2
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	395 %! ref = [-1.205364552835178, 0.951542399860817];
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	396 %! sol = ode23 (@fpol, [2 0 -2], fref);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	397 %! assert ([sol.x(end); sol.y(:,end)], [-2; ref'], 2e-2);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	398 %!test # Solve another anonymous function in backward direction
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	399 %! ref = [-1, 0.367879437558975];
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	400 %! sol = ode23 (@(t,y) y, [0 -1], 1);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	401 %! assert ([sol.x(end); sol.y(:,end)], ref', 1e-2);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	402 %!test # Solve another anonymous function below zero
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	403 %! ref = [0, 14.77810590694212];
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	404 %! sol = ode23 (@(t,y) y, [-2 0], 2);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	405 %! assert ([sol.x(end); sol.y(:,end)], ref', 1e-2);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	406 %!test # Solve in backward direction starting at t=0 with MaxStep option
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	407 %! ref = [-1.205364552835178, 0.951542399860817];
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	408 %! opt = odeset ("MaxStep", 1e-3);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	409 %! sol = ode23 (@fpol, [0 -2], [2 0], opt);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	410 %! assert ([abs(sol.x(8)-sol.x(7))], [1e-3], 1e-3);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	411 %! assert ([sol.x(end); sol.y(:,end)], [-2; ref'], 1e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	412 %!test # AbsTol option
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	413 %! opt = odeset ("AbsTol", 1e-5);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	414 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	415 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	416 %!test # AbsTol and RelTol option
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	417 %! opt = odeset ("AbsTol", 1e-8, "RelTol", 1e-8);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	418 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	419 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	420 %!test # RelTol and NormControl option -- higher accuracy
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	421 %! opt = odeset ("RelTol", 1e-8, "NormControl", "on");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	422 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	423 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-4);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	424 %!test # Keeps initial values while integrating
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	425 %! opt = odeset ("NonNegative", 2);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	426 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	427 %! assert ([sol.x(end); sol.y(:,end)], [2; 2; 0], 1e-1);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	428 %!test # Details of OutputSel and Refine can't be tested
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	429 %! opt = odeset ("OutputFcn", @fout, "OutputSel", 1, "Refine", 5);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	430 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	431 %!test # Stats must add further elements in sol
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	432 %! opt = odeset ("Stats", "on");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	433 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	434 %! assert (isfield (sol, "stats"));
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	435 %! assert (isfield (sol.stats, "nsteps"));
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	436 %!test # Events option add further elements in sol
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	437 %! opt = odeset ("Events", @feve);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	438 %! sol = ode23 (@fpol, [0 10], [2 0], opt);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	439 %! assert (isfield (sol, "ie"));
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	440 %! assert (sol.ie(1), 2);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	441 %! assert (isfield (sol, "xe"));
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	442 %! assert (isfield (sol, "ye"));
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	443 %!test # Events option, now stop integration
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	444 %! warning ("off", "integrate_adaptive:unexpected_termination", "local");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	445 %! opt = odeset ("Events", @fevn, "NormControl", "on");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	446 %! sol = ode23 (@fpol, [0 10], [2 0], opt);
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21546 diff changeset	447 %! assert ([sol.ie, sol.xe, sol.ye],
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21546 diff changeset	448 %! [2.0, 2.496110, -0.830550, -2.677589], .5e-1);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	449 %!test # Events option, five output arguments
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	450 %! warning ("off", "integrate_adaptive:unexpected_termination", "local");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	451 %! opt = odeset ("Events", @fevn, "NormControl", "on");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	452 %! [t, y, vxe, ye, vie] = ode23 (@fpol, [0 10], [2 0], opt);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	453 %! assert ([vie, vxe, ye], [2.0, 2.496110, -0.830550, -2.677589], 1e-1);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	454 %!test # Mass option as function
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	455 %! opt = odeset ("Mass", @fmas);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	456 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	457 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	458 %!test # Mass option as matrix
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	459 %! opt = odeset ("Mass", eye (2,2));
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	460 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	461 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	462 %!test # Mass option as sparse matrix
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	463 %! opt = odeset ("Mass", sparse (eye (2,2)));
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	464 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	465 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	466 %!test # Mass option as function and sparse matrix
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	467 %! opt = odeset ("Mass", @fmsa);
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	468 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	469 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-3);
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	470 %!test # Mass option as function and MStateDependence
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	471 %! opt = odeset ("Mass", @fmas, "MStateDependence", "strong");
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	472 %! sol = ode23 (@fpol, [0 2], [2 0], opt);
22654 bc61ed076549 Change orientation of output fields in struct returned from ode solvers (bug #49402). Sebastian Schöps <sebastian@schoeps.org> parents: 22647 diff changeset	473 %! assert ([sol.x(end); sol.y(:,end)], [2; fref'], 1e-3);
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	474
22660 7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	475 ## Note: The following options have no effect on this solver
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	476 ## therefore it makes no sense to test them here:
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	477 ##
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	478 ## "BDF"
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	479 ## "InitialSlope"
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	480 ## "JPattern"
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	481 ## "Jacobian"
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	482 ## "MassSingular"
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	483 ## "MaxOrder"
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	484 ## "MvPattern"
7eb3f8ec1aed Remove FIXME comment about missing tests for ignored ODE options. Carlo de Falco <carlo.defalco@polimi.it> parents: 22659 diff changeset	485 ## "Vectorized"
20901 afe9c529760d 2015 Code Sprint: move ode23 and runge_kutta_23 from odepkg to core Stefan Miereis <stefan.miereis@gmx.de> parents: diff changeset	486
22655 6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	487 %!test # Check that imaginary part of solution does not get inverted
6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	488 %! sol = ode23 (@(x,y) 1, [0 1], 1i);
6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	489 %! assert (imag (sol.y), ones (size (sol.y)))
6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	490 %! [x, y] = ode23 (@(x,y) 1, [0 1], 1i);
6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	491 %! assert (imag (y), ones (size (y)))
6b134d294d61 ode solvers: use ordinary transpose instead of Hermitian conjugate (bug #49410). Carlo de Falco <carlo.defalco@polimi.it> parents: 22654 diff changeset	492
21443 acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	493 ## Test input validation
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	494 %!error ode23 ()
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	495 %!error ode23 (1)
acd6e203031d Alter BIST tests stop emitting warnings during runtests invocation. Rik <rik@octave.org> parents: 21319 diff changeset	496 %!error ode23 (1,2)
22626 869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	497 %!error <TRANGE must be a numeric> ode23 (@fpol, {[0 25]}, [3 15 1])
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	498 %!error <TRANGE must be a .* vector> ode23 (@fpol, [0 25; 25 0], [3 15 1])
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	499 %!error <TRANGE must contain at least 2 elements> ode23 (@fpol, [1], [3 15 1])
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	500 %!error <invalid time span> ode23 (@fpol, [1 1], [3 15 1])
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	501 %!error <INIT must be a numeric> ode23 (@fpol, [0 25], {[3 15 1]})
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	502 %!error <INIT must be a .* vector> ode23 (@fpol, [0 25], [3 15 1; 3 15 1])
869c02fde46c Further clean-up of ode functions. Rik <rik@octave.org> parents: 22625 diff changeset	503 %!error <FUN must be a valid function handle> ode23 (1, [0 25], [3 15 1])