Mercurial > octave
changeset 31417:7286327ec4b6
Improve "Events" location in ode45, ode23, ode23s (bug #63162)
* ode23.m, ode23s.m, ode45.m: Except for "done", pass dummy arguments
in final call to ode_event_handler. Update tests.
* ode_event_handler.m (evtfcn_val): New helper subfunction.
Find root using polynomial interpolation function.
Eliminate unuseds handling of Y argument as a cell array.
Accept new arguments, K_VALS and ORD.
Don't handle parameters as appended arguments.
Update docstring.
* integrate_adaptive.m: Update calls to ode_event_handler. Use
anonymous function handle to pass extra parameters.
| author | Ken Marek <marek_ka@mercer.edu> |
|---|---|
| date | Thu, 06 Oct 2022 18:29:01 -0400 |
| parents | 33d5c1c41bbc |
| children | 0c48b7e6f3cf |
| files | scripts/ode/ode23.m scripts/ode/ode23s.m scripts/ode/ode45.m scripts/ode/private/integrate_adaptive.m scripts/ode/private/ode_event_handler.m |
| diffstat | 5 files changed, 76 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ode/ode23.m Thu Oct 06 16:17:50 2022 -0400 +++ b/scripts/ode/ode23.m Thu Oct 06 18:29:01 2022 -0400 @@ -154,6 +154,10 @@ "ode23: FCN must be a valid function handle"); endif + ## FIXME: Warn user if ! isempty (funarguments) + ## Not a documented behavior and may be deprecated + + ## Start preprocessing, have a look which options are set in odeopts, ## check if an invalid or unused option is set. [defaults, classes, attributes] = odedefaults (numel (init), @@ -241,9 +245,7 @@ feval (odeopts.OutputFcn, [], [], "done", odeopts.funarguments{:}); endif if (! isempty (odeopts.Events)) # Cleanup event function handling - ode_event_handler (odeopts.Events, solution.ode_t(end), ... - solution.ode_x(end,:).', "done", ... - odeopts.funarguments{:}); + ode_event_handler ([], [], [], [], [], "done"); endif ## Print additional information if option Stats is set @@ -460,11 +462,11 @@ %! opt = odeset ("Events", @fevn, "NormControl", "on"); %! sol = ode23 (@fpol, [0 10], [2 0], opt); %! assert ([sol.ie, sol.xe, sol.ye.'], -%! [2.0, 2.496110, -0.830550, -2.677589], .5e-1); +%! [2.0, 2.496110, -0.830550, -2.677589], 1e-3); %!test # Events option, five output arguments %! opt = odeset ("Events", @fevn, "NormControl", "on"); %! [t, y, vxe, ye, vie] = ode23 (@fpol, [0 10], [2 0], opt); -%! assert ([vie, vxe, ye], [2.0, 2.496110, -0.830550, -2.677589], 1e-1); +%! assert ([vie, vxe, ye], [2.0, 2.496110, -0.830550, -2.677589], 1e-3); %!test # Mass option as function %! opt = odeset ("Mass", @fmas); %! sol = ode23 (@fpol, [0 2], [2 0], opt);
--- a/scripts/ode/ode23s.m Thu Oct 06 16:17:50 2022 -0400 +++ b/scripts/ode/ode23s.m Thu Oct 06 18:29:01 2022 -0400 @@ -155,6 +155,10 @@ "ode23s: FCN must be a valid function handle"); endif + ## FIXME: Warn user if ! isempty (funarguments) + ## Not a documented behavior and may be deprecated + + ## Start preprocessing, have a look which options are set in odeopts, ## check if an invalid or unused option is set. [defaults, classes, attributes] = odedefaults (numel (init), @@ -217,9 +221,7 @@ feval (odeopts.OutputFcn, [], [], "done", odeopts.funarguments{:}); endif if (! isempty (odeopts.Events)) # Cleanup event function handling - ode_event_handler (odeopts.Events, solution.ode_t(end), ... - solution.ode_x(end,:).', "done", ... - odeopts.funarguments{:}); + ode_event_handler ([], [], [], [], [], "done"); endif ## Print additional information if option Stats is set @@ -456,6 +458,15 @@ %! assert (sol.ie(1), 2); %! assert (isfield (sol, "xe")); %! assert (isfield (sol, "ye")); +%!test # Events option, now stop integration +%! opt = odeset ("Events", @fevn, "NormControl", "on"); +%! sol = ode23s (@fpol, [0 10], [2 0], opt); +%! assert ([sol.ie, sol.xe, sol.ye.'], +%! [2.0, 9.094439, -0.996480, -14.180147], 2e-2); +%!test # Events option, five output arguments +%! opt = odeset ("Events", @fevn, "NormControl", "on"); +%! [t, y, vxe, ye, vie] = ode23s (@fpol, [0 10], [2 0], opt); +%! assert ([vie, vxe, ye], [2.0, 9.094439, -0.996480, -14.180147], 2e-2); %!test # Mass option as function %! opt = odeset ("Mass", @fmas); %! sol = ode23s (@fpol, [0 2], [2 0], opt);
--- a/scripts/ode/ode45.m Thu Oct 06 16:17:50 2022 -0400 +++ b/scripts/ode/ode45.m Thu Oct 06 18:29:01 2022 -0400 @@ -151,6 +151,10 @@ "ode45: FCN must be a valid function handle"); endif + ## FIXME: Warn user if ! isempty (funarguments) + ## Not a documented behavior and may be deprecated + + ## Start preprocessing, have a look which options are set in odeopts, ## check if an invalid or unused option is set [defaults, classes, attributes] = odedefaults (numel (init), @@ -240,9 +244,7 @@ feval (odeopts.OutputFcn, [], [], "done", odeopts.funarguments{:}); endif if (! isempty (odeopts.Events)) # Cleanup event function handling - ode_event_handler (odeopts.Events, solution.ode_t(end), ... - solution.ode_x(end,:).', "done", ... - odeopts.funarguments{:}); + ode_event_handler ([], [], [], [], [], "done"); endif ## Print additional information if option Stats is set @@ -471,12 +473,12 @@ %! opt = odeset ("Events", @fevn, "NormControl", "on"); %! sol = ode45 (@fpol, [0 10], [2 0], opt); %! assert ([sol.ie, sol.xe, sol.ye.'], -%! [2.0, 2.496110, -0.830550, -2.677589], 6e-1); +%! [2.0, 2.496110, -0.830550, -2.677589], 2e-3); %!test # Events option, five output arguments %! opt = odeset ("Events", @fevn, "NormControl", "on"); %! [t, y, vxe, ye, vie] = ode45 (@fpol, [0 10], [2 0], opt); %! assert ([vie, vxe, ye], -%! [2.0, 2.496110, -0.830550, -2.677589], 6e-1); +%! [2.0, 2.496110, -0.830550, -2.677589], 2e-3); %!test # Mass option as function %! opt = odeset ("Mass", @fmas); %! sol = ode45 (@fpol, [0 2], [2 0], opt);
--- a/scripts/ode/private/integrate_adaptive.m Thu Oct 06 16:17:50 2022 -0400 +++ b/scripts/ode/private/integrate_adaptive.m Thu Oct 06 18:29:01 2022 -0400 @@ -121,8 +121,9 @@ have_EventFcn = false; if (! isempty (options.Events)) have_EventFcn = true; - ode_event_handler (options.Events, tspan(1), ode_x, - "init", options.funarguments{:}); + options.Events = @(t,y) options.Events (t, y, options.funarguments{:}); + ode_event_handler (options.Events, tspan(1), ode_x, ... + [], order, "init"); endif if (options.havenonnegative) @@ -171,8 +172,8 @@ ## Check for Events if (have_EventFcn) - solution.event = ode_event_handler (options.Events, t_new, x_new, ... - [], options.funarguments{:}); + solution.event = ode_event_handler ([], t_new, x_new, ... + new_k_vals, [], []); ## Check for terminal Event if (! isempty (solution.event{1}) && solution.event{1} == 1) ode_t(istep) = solution.event{3}(end);
--- a/scripts/ode/private/ode_event_handler.m Thu Oct 06 16:17:50 2022 -0400 +++ b/scripts/ode/private/ode_event_handler.m Thu Oct 06 18:29:01 2022 -0400 @@ -24,43 +24,45 @@ ######################################################################## ## -*- texinfo -*- -## @deftypefn {} {@var{retval} =} ode_event_handler (@var{@@evtfcn}, @var{t}, @var{y}, @var{flag}, @var{par1}, @var{par2}, @dots{}) +## @deftypefn {} {@var{retval} =} ode_event_handler (@var{@@evt_fcn}, @var{t}, @var{y}, @var{k_vals}, @var{ord}, @var{flag}) ## -## Return the solution of the event function (@var{@@evtfcn}) which is +## Return the solution of the event function (@var{@@evt_fcn}) which is ## specified in the form of a function handle. ## ## The second input argument @var{t} is a scalar double and specifies the time ## of the event evaluation. ## -## The third input argument @var{y} may be a column vector of type double -## (for ODEs and DAEs) which specifies the solutions. Alternatives, @var{y} -## may be a cell array (for IDEs and DDEs) which specifies the solutions and -## derivatives. +## The third input argument @var{y} is a scalar or a column vector of type +## double which specifies the solution(s) at time @var{t}. ## -## The fourth input argument @var{flag} is of type string. Valid values are: +## The fourth input argument @var{k_vals} is a vector or matrix with the +## k values obtained from the most recent integration step. +## +## The fifth input argument @var{ord} the order of the integration technique. +## +## The sixth input argument @var{flag} is of type string. Valid values are: ## ## @table @option ## @item @qcode{"init"} ## Initialize internal persistent variables of the function ## @code{ode_event_handler} and return an empty cell array of size 4. ## -## @item @qcode{"calc"} -## Evaluate the event function and return the solution @var{retval} as a cell -## array of size 4. +## @item @qcode{""} +## (default) Evaluate the event function and return the solution @var{retval} +## as a cell array of size 4. Inputs @var{ord} and @var{@@evt_fcn} are ignored, +## since they are set in the @qcode{"init"} step. ## ## @item @qcode{"done"} ## Clean up internal variables of the function @code{ode_event_handler} and -## return an empty cell array of size 4. +## return an empty cell array of size 4. All other inputs are ignored with +## this flag. ## @end table ## -## If additional input arguments @var{par1}, @var{par2}, @dots{} are given -## these parameters are passed directly to the event function. -## ## This function is an ODE internal helper function and it should never be ## necessary to call it directly. ## @end deftypefn -function retval = ode_event_handler (evtfcn, t, y, flag = "", varargin) +function retval = ode_event_handler (evt_fcn, t, y, k_vals, ord, flag = "") ## No error handling has been implemented in this function to achieve ## the highest performance possible. @@ -77,23 +79,14 @@ ## yold the ODE result ## retcell the return values cell array ## evtcnt the counter for how often this function has been called - persistent evtold told yold retcell; + persistent evtold told yold retcell order evtfcn; persistent evtcnt = 1; # Don't remove. Required for Octave parser. persistent firstrun = true; if (isempty (flag)) ## Process the event, i.e., ## find the zero crossings for either a rising or falling edge - if (! iscell (y)) - inpargs = {evtfcn, t, y}; - else - inpargs = {evtfcn, t, y{1}, y{2}}; - y = y{1}; # Delete cell element 2 - endif - if (nargin > 4) - inpargs = {inpargs{:}, varargin{:}}; - endif - [evt, term, dir] = feval (inpargs{:}); + [evt, term, dir] = evtfcn (t, y); ## We require that all return values be row vectors evt = evt(:).'; term = term(:).'; dir = dir(:).'; @@ -119,10 +112,21 @@ ## Add all events this step to the output. for idx2 = idx # Loop through all values of idx ## Calculate the time stamp when the event function returned 0 and - ## calculate new values for the integration results, we do both by - ## a linear interpolation. - tnew = t - evt(idx2) * (t - told) / (evt(idx2) - evtold(idx2)); - ynew = (y - (t - tnew) * (y - yold) / (t - told)).'; + ## calculate new values for the integration results. We do both by + ## root solving, calling the Event function with y values from + ## the RK interpolation polynomial. Set tolerance to zero (actually + ## uses machine tolerance based criterion in this case) since we + ## don't have a way for the user to specify an acceptable tolerance. + ## For simple Event functions, this means we're basically root + ## finding on a small interval for a polynomial, so we expect + ## pretty quick convergence. + tvals = [told t]; + yvals = [yold y]; + tnew = fzero(@(t2) evtfcn_val (evtfcn, t2, ... + runge_kutta_interpolate (order, tvals, yvals, ... + t2, k_vals), idx2), tvals, optimset ("TolX", 0)); + ynew = runge_kutta_interpolate (order, tvals, yvals, tnew, k_vals); + tnews(evtcntnew, 1) = tnew; ynews(evtcntnew, :) = ynew; terms(evtcntnew, 1) = term(idx2); @@ -170,17 +174,10 @@ ## a value for evtold. firstrun = true; + order = ord; + evtfcn = evt_fcn; - if (! iscell (y)) - inpargs = {evtfcn, t, y}; - else - inpargs = {evtfcn, t, y{1}, y{2}}; - y = y{1}; # Delete cell element 2 - endif - if (nargin > 4) - inpargs = {inpargs{:}, varargin{:}}; - endif - [evtold, ~, ~] = feval (inpargs{:}); + [evtold, ~, ~] = evtfcn (t, y); ## We require that all return values be row vectors evtold = evtold(:).'; told = t; yold = y; @@ -190,9 +187,14 @@ elseif (strcmp (flag, "done")) ## Clear this event handling function firstrun = true; - evtold = told = yold = evtcnt = []; + evtold = told = yold = evtcnt = order = evtfcn = []; retval = retcell = cell (1,4); endif endfunction + +function val = evtfcn_val (evtfcn, t, y, ind) + [evt, ~, ~] = evtfcn (t, y); + val = evt(ind); +endfunction