From 0a110a1b02c0ee2e04e2eb067392319e8fce9efa Mon Sep 17 00:00:00 2001 From: jgoppert Date: Thu, 12 Nov 2015 15:15:31 -0500 Subject: [PATCH] Fixed integration test. --- test/integration.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/test/integration.cpp b/test/integration.cpp index cdb8eb2466..0d6863394d 100644 --- a/test/integration.cpp +++ b/test/integration.cpp @@ -5,28 +5,20 @@ using namespace matrix; -// instantiate template to ensure coverage check -template int integrate_rk4( - Vector (*f)(float, Vector), - const Vector & y0, - float t0, - float h, - Vector & y1 -); +Vector f(float t, const Vector & y, const Vector & u); -Vector f(float t, Vector y); - -Vector f(float t, Vector y) { +Vector f(float t, const Vector & y, const Vector & u) { return ones(); } int main() { Vector y = ones(); + Vector u = ones(); float t = 1; float h = 0.1f; y.T().print(); - integrate_rk4(f, y, t, h, y); + integrate_rk4(f, y, u, t, h, y); y.T().print(); assert(y == (ones()*1.1f)); return 0;