Mercurial > octave-nkf
diff scripts/ode/private/runge_kutta_45_dorpri.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 | b7ac1e94266e |
line wrap: on
line diff
--- a/scripts/ode/private/runge_kutta_45_dorpri.m Sun Oct 04 16:24:32 2015 +0100 +++ b/scripts/ode/private/runge_kutta_45_dorpri.m Sun Oct 04 22:18:54 2015 -0700 @@ -97,16 +97,16 @@ k(:,5) = feval (f, s(5), x + k(:,1:4) * aa(5, 1:4).', args{:}); k(:,6) = feval (f, s(6), x + k(:,1:5) * aa(6, 1:5).', args{:}); - ## compute new time and new values for the unkwnowns + ## compute new time and new values for the unknowns t_out = t + dt; - x_out = x + k(:,1:6) * cc(:); # 5th order approximation + x_out = x + k(:,1:6) * cc(:); # 5th order approximation ## if the estimation of the error is required if (nargout >= 3) ## new solution to be compared with the previous one k(:,7) = feval (f, t + dt, x_out, args{:}); cc_prime = dt * c_prime; - x_est = x + k * cc_prime(:); # x_est + x_est = x + k * cc_prime(:); endif endfunction