From 486a188b074c0c4f3ad771f536159e1bd2045fe2 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 6 Oct 2010 23:00:58 -0400 Subject: Add Bogacki-Shampine method. --- src/vZ/Adaptive.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/vZ/Adaptive.hpp') diff --git a/src/vZ/Adaptive.hpp b/src/vZ/Adaptive.hpp index 74de0db..256bda6 100644 --- a/src/vZ/Adaptive.hpp +++ b/src/vZ/Adaptive.hpp @@ -41,6 +41,8 @@ namespace vZ Scalar atol() const { return m_atol; } Scalar rtol() const { return m_rtol; } + unsigned int rejections() const { return m_rejections; } + protected: typedef typename GenericRKIntegrator::ACoefficients ACoefficients; typedef typename GenericRKIntegrator::BCoefficients BCoefficients; @@ -49,7 +51,7 @@ namespace vZ GenericAdaptiveIntegrator(Function f, unsigned int order, ACoefficients a, BCoefficients b, BCoefficients bStar) - : GenericRKIntegrator(f), m_order(order), + : GenericRKIntegrator(f), m_order(order), m_rejections(0), m_a(a), m_b(b), m_bStar(bStar) { } virtual ~GenericAdaptiveIntegrator() { } @@ -59,6 +61,7 @@ namespace vZ private: Scalar m_atol, m_rtol; unsigned int m_order; + unsigned int m_rejections; ACoefficients m_a; BCoefficients m_b, m_bStar; }; @@ -94,6 +97,7 @@ namespace vZ if (delta > scale) { // Reject the step this->h(newH); + ++m_rejections; } else { rejected = false; } -- cgit v1.2.3