Tests for numeric precision, initializing procedure for steppers

include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp

@@ -73,7 +73,7 @@ public:
 
     order_type order()
     {
-        return order_value + 1;
+        return order_value;
     }
 
     order_type stepper_order()
@@ -87,7 +87,7 @@ public:
     }
 
     template<class System>
-    void do_step(System system, state_type & inOut, time_type &t, time_type &dt)
+    void do_step(System system, state_type & inOut, time_type t, time_type &dt)
     {
         m_xerr_resizer.adjust_size( inOut , detail::bind( &stepper_type::template resize_xerr_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
 
@@ -95,7 +95,7 @@ public:
     };
 
     template<class System>
-    void do_step(System system, const state_type & in, time_type &t, state_type & out, time_type &dt)
+    void do_step(System system, const state_type & in, time_type t, state_type & out, time_type &dt)
     {
         m_xerr_resizer.adjust_size( in , detail::bind( &stepper_type::template resize_xerr_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
 
@@ -103,7 +103,7 @@ public:
     };
 
     template<class System>
-    void do_step(System system, state_type & inOut, time_type &t, time_type &dt, state_type &xerr)
+    void do_step(System system, state_type & inOut, time_type t, time_type &dt, state_type &xerr)
     {
         m_xnew_resizer.adjust_size( inOut , detail::bind( &stepper_type::template resize_xnew_impl< state_type > , detail::ref( *this ) , detail::_1 ) );
 
@@ -112,7 +112,7 @@ public:
     };
 
     template<class System>
-    void do_step(System system, const state_type & in, time_type &t, state_type & out, time_type &dt, state_type &xerr)
+    void do_step(System system, const state_type & in, time_type &t, state_type & out, time_type dt, state_type &xerr)
     {
         do_step_impl(system, m_coeff, in, t, out, dt, xerr);
 
@@ -149,6 +149,18 @@ public:
         m_aab.algebra().for_each3(xerr, xerr, out, typename Operations::template scale_sum2<double, double>(-1.0, 1.0));
     };
 
+    template<class System>
+    void initialize(System system, state_type &inOut, time_type &t, time_type dt)
+    {
+        m_coeff.reset();
+
+        for(size_t i=0; i<steps+1; ++i)
+        {
+            do_step(system, inOut, t, dt);
+            t += dt;
+        }
+    }
+
     const coeff_type& coeff() const
     {
         return m_coeff;

include/boost/numeric/odeint/stepper/adaptive_adams_moulton.hpp

@@ -42,7 +42,7 @@ public:
     typedef Operations operations_type;
     typedef algebra_stepper_base< Algebra , Operations > algebra_stepper_base_type;
 
-    typedef detail::adaptive_adams_coefficients<Steps, deriv_type, time_type, algebra_type, operations_type> coeff_type;
+    typedef detail::adaptive_adams_coefficients<order_value - 1, deriv_type, time_type, algebra_type, operations_type> coeff_type;
 
     typedef adaptive_adams_moulton< Steps , State , Value , Deriv , Time , Resizer > stepper_type;
 
@@ -64,8 +64,9 @@ public:
         // integrating
         for(size_t i=0; i<coeff.m_effective_order; ++i)
         {
-            time_type c = ((i!=coeff.m_effective_order-1)?coeff.m_c[i]:coeff.poly.evaluate_integrated(dt));
+            time_type c = ((i != coeff.m_effective_order-1) ? coeff.m_c[i] : coeff.poly.evaluate_integrated(dt));
-            this->m_algebra.for_each3(out, out, coeff.m_tss[i][coeff.m_effective_order-i-1].m_v, typename Operations::template scale_sum2<double, double>(1.0, c));
+            this->m_algebra.for_each3(out, out, coeff.m_tss[i][coeff.m_effective_order-i-1].m_v,
+                                typename Operations::template scale_sum2<double, double>(1.0, c));
         }
     };
 };

test/numeric/Jamfile.v2

@@ -27,7 +27,9 @@ test-suite "odeint"
      [ run symplectic.cpp ]
      [ run rosenbrock.cpp ]
      [ run adams_bashforth.cpp ]
+     [ run adaptive_adams_bashforth.cpp ]
      [ run adams_bashforth_moulton.cpp ]
+     [ run adaptive_adams_bashforth_moulton.cpp ]
      [ run abm_time_dependent.cpp ]
      [ run order_quadrature_formula.cpp ]
      [ run velocity_verlet.cpp ]

test/numeric/adaptive_adams_bashforth.cpp

@@ -0,0 +1,116 @@
+/* Boost numeric test of the adams-bashforth steppers test file
+
+ Copyright 2013 Karsten Ahnert
+ Copyright 2013-2015 Mario Mulansky
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or
+ copy at http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+// disable checked iterator warning for msvc
+#include <boost/config.hpp>
+#ifdef BOOST_MSVC
+    #pragma warning(disable:4996)
+#endif
+
+#define BOOST_TEST_MODULE numeric_adaptive_adams_bashforth
+
+#include <iostream>
+#include <cmath>
+
+#include <boost/array.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <boost/mpl/vector.hpp>
+
+#include <boost/numeric/odeint.hpp>
+
+using namespace boost::unit_test;
+using namespace boost::numeric::odeint;
+namespace mpl = boost::mpl;
+
+typedef double value_type;
+
+typedef boost::array< double , 2 > state_type;
+
+// harmonic oscillator, analytic solution x[0] = sin( t )
+struct osc
+{
+    void operator()( const state_type &x , state_type &dxdt , const double t ) const
+    {
+        dxdt[0] = x[1];
+        dxdt[1] = -x[0];
+    }
+};
+
+BOOST_AUTO_TEST_SUITE( numeric_adaptive_adams_bashforth_test )
+
+
+/* generic test for all adams bashforth steppers */
+template< class Stepper >
+struct perform_adaptive_adams_bashforth_test
+{
+    void operator()( void )
+    {
+        Stepper stepper;
+        const int o = stepper.order()+1; //order of the error is order of approximation + 1
+
+        const state_type x0 = {{ 0.0 , 1.0 }};
+        state_type x1 = x0;
+        double t = 0.0;
+        double dt = 0.2;
+        // initialization, does a number of steps to self-start the stepper with a small stepsize
+        stepper.initialize( osc() , x1 , t ,  1e-5);
+        double A = std::sqrt( x1[0]*x1[0] + x1[1]*x1[1] );
+        double phi = std::asin(x1[0]/A) - t;
+        // more steps necessary to "counteract" the effect from the lower order steps
+        for( size_t n=0 ; n < (stepper.steps+1)*3 ; ++n )
+        {
+            stepper.do_step( osc() , x1 , t , dt );
+            t += dt;
+        }
+        // now we do the actual step
+        stepper.do_step( osc() , x1 , t , dt );
+        // only examine the error of the adams-bashforth step, not the initialization
+        const double f = 2.0 * std::abs( A*sin(t+dt+phi) - x1[0] ) / std::pow( dt , o ); // upper bound
+        
+        std::cout << o << " , " 
+                  << f << std::endl;
+
+        /* as long as we have errors above machine precision */
+        while( f*std::pow( dt , o ) > 1E-16 )
+        {
+            x1 = x0;
+            t = 0.0;
+            stepper.initialize( osc() , x1 , t , 1e-5 );
+            A = std::sqrt( x1[0]*x1[0] + x1[1]*x1[1] );
+            phi = std::asin(x1[0]/A) - t;
+            // now we do the actual step
+            stepper.do_step( osc() , x1 , t , dt );
+            // only examine the error of the adams-bashforth step, not the initialization
+            std::cout << "Testing dt=" << dt << " , " << std::abs( A*sin(t+dt+phi) - x1[0] ) << std::endl;
+            BOOST_CHECK_LT( std::abs( A*sin(t+dt+phi) - x1[0] ) , f*std::pow( dt , o ) );
+            dt *= 0.5;
+        }
+    }
+};
+
+typedef mpl::vector<
+    adaptive_adams_bashforth< 2 , state_type > ,
+    adaptive_adams_bashforth< 3 , state_type > ,
+    adaptive_adams_bashforth< 4 , state_type > ,
+    adaptive_adams_bashforth< 5 , state_type > ,
+    adaptive_adams_bashforth< 6 , state_type > ,
+    adaptive_adams_bashforth< 7 , state_type > ,
+    adaptive_adams_bashforth< 8 , state_type >
+    > adaptive_adams_bashforth_steppers;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE( adaptive_adams_bashforth_test , Stepper, adaptive_adams_bashforth_steppers )
+{
+    perform_adaptive_adams_bashforth_test< Stepper > tester;
+    tester();
+}
+
+BOOST_AUTO_TEST_SUITE_END()

test/numeric/adaptive_adams_bashforth_moulton.cpp

@@ -0,0 +1,113 @@
+/* Boost numeric test of the adams-bashforth steppers test file
+
+ Copyright 2013 Karsten Ahnert
+ Copyright 2013-2015 Mario Mulansky
+
+ Distributed under the Boost Software License, Version 1.0.
+ (See accompanying file LICENSE_1_0.txt or
+ copy at http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+// disable checked iterator warning for msvc
+#include <boost/config.hpp>
+#ifdef BOOST_MSVC
+    #pragma warning(disable:4996)
+#endif
+
+#define BOOST_TEST_MODULE numeric_adaptive_adams_bashforth_moulton
+
+#include <iostream>
+#include <cmath>
+
+#include <boost/array.hpp>
+
+#include <boost/test/unit_test.hpp>
+
+#include <boost/mpl/vector.hpp>
+
+#include <boost/numeric/odeint.hpp>
+
+using namespace boost::unit_test;
+using namespace boost::numeric::odeint;
+namespace mpl = boost::mpl;
+
+typedef double value_type;
+
+typedef boost::array< double , 2 > state_type;
+
+// harmonic oscillator, analytic solution x[0] = sin( t )
+struct osc
+{
+    void operator()( const state_type &x , state_type &dxdt , const double t ) const
+    {
+        dxdt[0] = x[1];
+        dxdt[1] = -x[0];
+    }
+};
+
+BOOST_AUTO_TEST_SUITE( numeric_adaptive_adams_bashforth_moulton_test )
+
+
+/* generic test for all adams bashforth steppers */
+template< class Stepper >
+struct perform_adaptive_adams_bashforth_moulton_test
+{
+    void operator()( void )
+    {
+        Stepper stepper;
+        const int o = stepper.order()+1; //order of the error is order of approximation + 1
+
+        const state_type x0 = {{ 0.0 , 1.0 }};
+        state_type x1 = x0;
+        double t = 0.0;
+        double dt = 0.25;
+        // initialization, does a number of steps to self-start the stepper with a small stepsize
+        stepper.initialize( osc() , x1 , t ,  1e-3);
+        double A = std::sqrt( x1[0]*x1[0] + x1[1]*x1[1] );
+        double phi = std::asin(x1[0]/A) - t;
+        // more steps necessary to "counteract" the effect from the lower order steps
+        for( size_t n=0 ; n < (stepper.steps+1)*3 ; ++n )
+        {
+            stepper.do_step( osc() , x1 , t , dt );
+            t += dt;
+        }
+        // now we do the actual step
+        stepper.do_step( osc() , x1 , t , dt );
+        // only examine the error of the adams-bashforth step, not the initialization
+        const double f = 2.0 * std::abs( A*sin(t+dt+phi) - x1[0] ) / std::pow( dt , o ); // upper bound
+        
+        std::cout << o << " , " 
+                  << f << std::endl;
+
+        /* as long as we have errors above machine precision */
+        while( f*std::pow( dt , o ) > 1E-16 )
+        {
+            x1 = x0;
+            t = 0.0;
+            stepper.initialize( osc() , x1 , t , 1e-3 );
+            A = std::sqrt( x1[0]*x1[0] + x1[1]*x1[1] );
+            phi = std::asin(x1[0]/A) - t;
+            // now we do the actual step
+            stepper.do_step( osc() , x1 , t , dt );
+            // only examine the error of the adams-bashforth step, not the initialization
+            std::cout << "Testing dt=" << dt << " , " << std::abs( A*sin(t+dt+phi) - x1[0] ) << std::endl;
+            BOOST_CHECK_LT( std::abs( A*sin(t+dt+phi) - x1[0] ) , f*std::pow( dt , o ) );
+            dt *= 0.5;
+        }
+    }
+};
+
+typedef mpl::vector<
+    adaptive_adams_bashforth_moulton< 2 , state_type > ,
+    adaptive_adams_bashforth_moulton< 3 , state_type > ,
+    adaptive_adams_bashforth_moulton< 4 , state_type > ,
+    adaptive_adams_bashforth_moulton< 5 , state_type >
+    > adaptive_adams_bashforth_moulton_steppers;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE( adaptive_adams_bashforth_moulton_test , Stepper, adaptive_adams_bashforth_moulton_steppers )
+{
+    perform_adaptive_adams_bashforth_moulton_test< Stepper > tester;
+    tester();
+}
+
+BOOST_AUTO_TEST_SUITE_END()