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
+7 -6
View File
@@ -8,9 +8,10 @@ using namespace matrix;
// instantiate template to ensure coverage check
template int integrate_rk4<float, 6>(
Vector<float, 6> (*f)(float, Vector<float, 6>),
Vector<float, 6> & y,
float & t,
float h
const Vector<float, 6> & y0,
float t0,
float h,
Vector<float, 6> & y1
);
Vector<float, 6> f(float t, Vector<float, 6> y);
@@ -22,12 +23,12 @@ Vector<float, 6> f(float t, Vector<float, 6> y) {
int main()
{
Vector<float, 6> y = ones<float, 6, 1>();
float h = 1;
float t = 1;
float h = 0.1f;
y.T().print();
integrate_rk4(f, y, t, h);
integrate_rk4(f, y, t, h, y);
y.T().print();
assert(y == (ones<float, 6, 1>()*2));
assert(y == (ones<float, 6, 1>()*1.1f));
return 0;
}