Changed rk4 signature.

This commit is contained in:
jgoppert
2015-11-12 10:19:30 -05:00
parent 606eb1dc2b
commit 7656385ea1
2 changed files with 16 additions and 15 deletions
+9 -9
View File
@@ -7,19 +7,19 @@ namespace matrix {
template<typename Type, size_t M>
int integrate_rk4(
Vector<Type, M> (*f)(Type, Vector<Type, M>),
Vector<Type, M> & y,
Type & t,
Type h
const Vector<Type, M> & y0,
Type t0,
Type h,
Vector<Type, M> & y1
)
{
// https://en.wikipedia.org/wiki/Runge%E2%80%93Kutta_methods
Vector<Type, M> k1, k2, k3, k4;
k1 = f(t, y);
k2 = f(t + h/2, y + k1*h/2);
k3 = f(t + h/2, y + k2*h/2);
k4 = f(t + h, y + k3*h);
y += (k1 + k2*2 + k3*2 + k4)*(h/6);
t += h;
k1 = f(t0, y0);
k2 = f(t0 + h/2, y0 + k1*h/2);
k3 = f(t0 + h/2, y0 + k2*h/2);
k4 = f(t0 + h, y0 + k3*h);
y1 = y0 + (k1 + k2*2 + k3*2 + k4)*(h/6);
return 0;
}