diff options
author | Tavian Barnes <tavianator@gmail.com> | 2010-10-06 23:00:58 -0400 |
---|---|---|
committer | Tavian Barnes <tavianator@gmail.com> | 2010-10-06 23:00:58 -0400 |
commit | 486a188b074c0c4f3ad771f536159e1bd2045fe2 (patch) | |
tree | 490bf76b27b404cfd65ed3380ec4c57d1b10ffc7 /tests | |
parent | 25cc2bf981d52f0c7688b1e380b795f0cda8a852 (diff) | |
download | vz-486a188b074c0c4f3ad771f536159e1bd2045fe2.tar.xz |
Add Bogacki-Shampine method.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/BS23.cpp | 39 | ||||
-rw-r--r-- | tests/HE12.cpp | 11 | ||||
-rw-r--r-- | tests/Makefile.am | 4 |
3 files changed, 48 insertions, 6 deletions
diff --git a/tests/BS23.cpp b/tests/BS23.cpp new file mode 100644 index 0000000..15abd0c --- /dev/null +++ b/tests/BS23.cpp @@ -0,0 +1,39 @@ +#include "vZ.hpp" +#include <cmath> +#include <cstdlib> +#include <iostream> +#include <iomanip> + +// y' = y (y == C*exp(t)) +double +f(double t, double y) +{ + return y; +} + +int +main() +{ + vZ::BS23Integrator integrator(f); + integrator.tol(1e-6).y(1.0).x(0.0).h(0.03); + + integrator.integrate(2.0); + + double actual = integrator.y(); + double expected = std::exp(2.0); + + std::cout << std::setprecision(10) + << "Numerical: " << actual << std::endl + << "Expected: " << expected << std::endl + << "h: " << integrator.h() << std::endl + << "rejections: " << integrator.rejections() << std::endl; + + double error = std::fabs(expected - actual)/expected; + if (error > 4.8e-6) { + std::cerr << "Error: " << 100.0*error << "%" << std::endl; + return EXIT_FAILURE; + } else { + std::cout << "Error: " << 100.0*error << "%" << std::endl; + return EXIT_SUCCESS; + } +} diff --git a/tests/HE12.cpp b/tests/HE12.cpp index 44d6943..511a8e0 100644 --- a/tests/HE12.cpp +++ b/tests/HE12.cpp @@ -23,16 +23,17 @@ main() double expected = std::exp(2.0); std::cout << std::setprecision(10) - << "Numerical: " << actual << std::endl - << "Expected: " << expected << std::endl - << "h: " << integrator.h() << std::endl; + << "Numerical: " << actual << std::endl + << "Expected: " << expected << std::endl + << "h: " << integrator.h() << std::endl + << "rejections: " << integrator.rejections() << std::endl; double error = std::fabs(expected - actual)/expected; if (error > 8.7e-7) { - std::cerr << "Error: " << 100.0*error << "%" << std::endl; + std::cerr << "Error: " << 100.0*error << "%" << std::endl; return EXIT_FAILURE; } else { - std::cout << "Error: " << 100.0*error << "%" << std::endl; + std::cout << "Error: " << 100.0*error << "%" << std::endl; return EXIT_SUCCESS; } } diff --git a/tests/Makefile.am b/tests/Makefile.am index e3c7601..cab6d98 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,7 +23,8 @@ check_PROGRAMS = Euler-test \ Midpoint-test \ Heun-test \ RK4-test \ - HE12-test + HE12-test \ + BS23-test TESTS = $(check_PROGRAMS) Euler_test_SOURCES = Euler.cpp @@ -31,3 +32,4 @@ Midpoint_test_SOURCES = Midpoint.cpp Heun_test_SOURCES = Heun.cpp RK4_test_SOURCES = RK4.cpp HE12_test_SOURCES = HE12.cpp +BS23_test_SOURCES = BS23.cpp |