Mercurial > octave-nkf
diff scripts/ode/private/starting_stepsize.m @ 20584:eb9e2d187ed2
maint: Use Octave coding conventions in scripts/ode/private dir.
* AbsRel_Norm.m, fuzzy_compare.m, hermite_quartic_interpolation.m,
integrate_adaptive.m, integrate_const.m, integrate_n_steps.m, kahan.m,
ode_struct_value_check.m, odepkg_event_handle.m, odepkg_structure_check.m,
runge_kutta_45_dorpri.m, starting_stepsize.m:
Wrap long lines to < 80 chars.
Use double quotes rather than single quotes where possible.
Use ';' at end of keywords "return;" and "break;"
Use '##" for stand-alone comments and '#' for end-of-line comments.
Use two spaces after period before starting new sentence.
Use '!' instead of '~' for logical negation.
Use specific form of end (endif, endfor, etc.).
Don't use line continuation marker '...' unless necessary.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 04 Oct 2015 22:18:54 -0700 |
| parents | 25623ef2ff4f |
| children |
line wrap: on
line diff
--- a/scripts/ode/private/starting_stepsize.m Sun Oct 04 16:24:32 2015 +0100 +++ b/scripts/ode/private/starting_stepsize.m Sun Oct 04 22:18:54 2015 -0700 @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{h}] =} starting_stepsize (@var{order}, @var{@@fun}, @var{t0}, @var{x0}) +## @deftypefn {Function File} {@var{h} =} starting_stepsize (@var{order}, @var{@@fun}, @var{t0}, @var{x0}) ## ## This function file can be used to determine a good initial step for an ODE ## solver of order @var{order}. The algorithm is that one described in [1]. @@ -45,8 +45,8 @@ y = func (t0, x0); d1 = AbsRel_Norm (y, y, AbsTol, RelTol, normcontrol); - if (d0 < 1.e-5 || d1 < 1.e-5) - h0 = 1.e-6; + if (d0 < 1e-5 || d1 < 1e-5) + h0 = 1e-6; else h0 = .01 * (d0 / d1); endif @@ -59,16 +59,13 @@ AbsRel_Norm (func (t0+h0, x1) - y, func (t0+h0, x1) - y, AbsTol, RelTol, normcontrol); - if (max(d1, d2) <= 1.e-15) - h1 = max (1.e-6, h0*1.e-3); + if (max(d1, d2) <= 1e-15) + h1 = max (1e-6, h0*1e-3); else - h1 = (1.e-2 / max (d1, d2)) ^(1 / (order+1)); + h1 = (1e-2 / max (d1, d2)) ^(1 / (order+1)); endif h = min (100*h0, h1); endfunction -## Local Variables: *** -## mode: octave *** -## End: ***