boost_mirror/odeint
1
0
Fork 0
mirror of https://github.com/boostorg/odeint.git synced 2025-05-09 15:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

completed testcases

Browse Source
This commit is contained in:
Valentin Hartmann 2017-07-03 14:42:41 +02:00
parent 1b767b38d6
commit 848d7f1938
5 changed files with 97 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/numeric/odeint/stepper/adaptive_adams_bashforth_moulton.hpp
View File

@ -124,7 +124,8 @@ public:
m_coeff.do_step(m_dxdt.m_v);
m_coeff.confirm();
t += dt/static_cast< Time >(order_value);
if(m_coeff.m_eo < order_value)
m_coeff.m_eo ++;
}
};

4
include/boost/numeric/odeint/stepper/detail/adaptive_adams_coefficients.hpp
View File

@ -123,8 +123,8 @@ public:
size_t m_eo;
rotating_buffer<boost::array<value_type, (order_value+1)>, 2> beta; // beta[0] = beta(n)
rotating_buffer<boost::array<wrapped_deriv_type, (order_value + 2)>, 3> phi; // phi[0] = phi(n+1)
rotating_buffer<boost::array<value_type, order_value+1>, 2> beta; // beta[0] = beta(n)
rotating_buffer<boost::array<wrapped_deriv_type, order_value+2>, 3> phi; // phi[0] = phi(n+1)
boost::array<value_type, order_value + 2> g;
private:

2
include/boost/numeric/odeint/stepper/detail/pid_step_adjuster.hpp
View File

@ -30,7 +30,7 @@ public:
typedef rotating_buffer<time_type, 3> time_storage_type;
typedef pid_step_adjuster_coefficients<Type> coeff_type;
pid_step_adjuster(double tol = 1e-5, time_type dtmax = 1.0)
pid_step_adjuster(double tol = 1e-6, time_type dtmax = 1.0)
:m_dtmax(dtmax), m_error_storage(), m_time_storage(), m_init(0), m_tol(tol)
{};

110
test/adaptive_adams_coefficients.cpp
View File

@ -25,58 +25,96 @@ BOOST_AUTO_TEST_SUITE( adaptive_adams_coefficients_test )
typedef boost::mpl::range_c< size_t , 2 , 10 > vector_of_steps;
BOOST_AUTO_TEST_CASE_TEMPLATE( test_step, step_type, vector_of_steps )
{
// const static size_t steps = step_type::value;
const static size_t steps = step_type::value;
// typedef std::vector<double> deriv_type;
// typedef double time_type;
typedef std::vector<double> deriv_type;
typedef double time_type;
// typedef detail::adaptive_adams_coefficients<steps, deriv_type, time_type> aac_type;
typedef detail::adaptive_adams_coefficients<steps, deriv_type, time_type> aac_type;
// std::vector<double> deriv;
// deriv.push_back(-1);
std::vector<double> deriv;
deriv.push_back(-1);
// aac_type coeff;
// for(size_t i=0; i<steps; ++i)
// {
// coeff.step(deriv, i);
// BOOST_CHECK_EQUAL(coeff.m_tts[0], i);
time_type t = 0.0;
time_type dt = 0.1;
// coeff.confirm();
// BOOST_CHECK_EQUAL(coeff.m_ts[0], i);
// }
aac_type coeff;
for(size_t i=0; i<steps; ++i)
{
coeff.predict(t, dt);
coeff.do_step(deriv);
coeff.confirm();
// BOOST_CHECK_EQUAL(coeff.m_ss[0][0].m_v[0], -1);
// BOOST_CHECK_EQUAL(coeff.m_ss[1][0].m_v[0], 0);
t+= dt;
if(coeff.m_eo < steps)
coeff.m_eo ++;
}
std::vector<value_type> v(10);
v[0] = 1.0/1.0;
v[1] = 1.0/2.0;
v[2] = 5.0/12.0;
v[3] = 9.0/24.0;
v[4] = 251.0/720.0;
v[5] = 95.0/288.0;
v[6] = 19087.0/60480.0;
v[7] = 5257.0/17280.0;
v[8] = 5311869667636789.0/18014398509481984.0;
for(size_t i=0; i<steps; ++i)
{
BOOST_CHECK_SMALL(coeff.beta[1][i] - 1.0, 1e-15);
if(i == 0)
BOOST_CHECK_SMALL(coeff.phi[2][i].m_v[0] + 1, 1e-15);
else if (i == steps-1 && steps%2 == 1)
BOOST_CHECK_SMALL(coeff.phi[2][i].m_v[0] - 1, 1e-14);
else if (i == steps-1 && steps%2 == 0)
BOOST_CHECK_SMALL(coeff.phi[2][i].m_v[0] + 1, 1e-14);
else
BOOST_CHECK_SMALL(coeff.phi[2][i].m_v[0], 1e-15);
BOOST_CHECK_SMALL(coeff.g[i] - v[i], 1e-15);
}
}
BOOST_AUTO_TEST_CASE( test_copy )
{
// typedef std::vector<double> deriv_type;
// typedef double time_type;
typedef std::vector<double> deriv_type;
typedef double time_type;
// typedef detail::adaptive_adams_coefficients<3, deriv_type, time_type> aac_type;
// aac_type c1;
typedef detail::adaptive_adams_coefficients<3, deriv_type, time_type> aac_type;
aac_type c1;
// deriv_type deriv(1);
// deriv[0] = 1.0;
deriv_type deriv(1);
deriv[0] = 1.0;
// c1.step(deriv, 0.0);
// c1.confirm();
// c1.step(deriv, 1.0);
// c1.confirm();
// c1.step(deriv, 2.0);
// c1.confirm();
time_type t = 0.0;
time_type dt = 0.01;
// aac_type c2(c1);
// BOOST_CHECK_EQUAL(c1.m_ss[0][0].m_v[0], c2.m_ss[0][0].m_v[0]);
// BOOST_CHECK(&(c1.m_ss[0][0].m_v) != &(c2.m_ss[0][0].m_v));
for(size_t i=0; i<3; ++i)
{
c1.predict(t, dt);
c1.do_step(deriv);
c1.confirm();
// aac_type c3;
// deriv_type *p1 = &(c3.m_ss[0][0].m_v);
t+= dt;
// c3 = c1;
// // BOOST_CHECK(p1 == (&(c3.m_ss[0][0].m_v)));
// BOOST_CHECK_EQUAL(c1.m_ss[0][0].m_v[0], c3.m_ss[0][0].m_v[0]);
if(c1.m_eo < 3)
c1.m_eo ++;
}
aac_type c2(c1);
BOOST_CHECK_EQUAL(c1.phi[0][0].m_v[0], c2.phi[0][0].m_v[0]);
BOOST_CHECK(&(c1.phi[0][0].m_v) != &(c2.phi[0][0].m_v));
aac_type c3;
deriv_type *p1 = &(c3.phi[0][0].m_v);
c3 = c1;
BOOST_CHECK(p1 == (&(c3.phi[0][0].m_v)));
BOOST_CHECK_EQUAL(c1.phi[0][0].m_v[0], c3.phi[0][0].m_v[0]);
}
BOOST_AUTO_TEST_SUITE_END()

25
test/integrate.cpp
View File

@ -17,6 +17,8 @@
#define BOOST_TEST_MODULE odeint_integrate_functions
#include <boost/type_traits.hpp>
#include <vector>
#include <cmath>
#include <iostream>
@ -240,7 +242,12 @@ class stepper_methods : public mpl::vector<
controlled_runge_kutta< runge_kutta_dopri5< state_type > > ,
controlled_runge_kutta< runge_kutta_fehlberg78< state_type > > ,
bulirsch_stoer< state_type > ,
dense_output_runge_kutta< controlled_runge_kutta< runge_kutta_dopri5< state_type > > >
dense_output_runge_kutta< controlled_runge_kutta< runge_kutta_dopri5< state_type > > >,
adaptive_adams_bashforth_moulton<3, state_type>,
adaptive_adams_bashforth_moulton<5, state_type>,
adaptive_adams_bashforth_moulton<7, state_type>,
controlled_adams_bashforth_moulton<adaptive_adams_bashforth_moulton<3, state_type> >,
controlled_adams_bashforth_moulton<adaptive_adams_bashforth_moulton<5, state_type> >
//bulirsch_stoer_dense_out< state_type >
> { };
@ -277,12 +284,16 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( integrate_times_test_case , Stepper, stepper_meth
BOOST_AUTO_TEST_CASE_TEMPLATE( integrate_n_steps_test_case , Stepper, stepper_methods )
{
perform_integrate_n_steps_test< Stepper > tester;
tester();
tester( 200 , 0.01 );
tester( 200 , 0.01 );
tester( 200 , 0.01 );
tester( 200 , -0.01 );
if(!boost::is_same<Stepper, controlled_adams_bashforth_moulton<adaptive_adams_bashforth_moulton<3, state_type> > >::value &&
!boost::is_same<Stepper, controlled_adams_bashforth_moulton<adaptive_adams_bashforth_moulton<5, state_type> > >::value)
{
perform_integrate_n_steps_test< Stepper > tester;
tester();
tester( 200 , 0.01 );
tester( 200 , 0.01 );
tester( 200 , 0.01 );
tester( 200 , -0.01 );
}
}
BOOST_AUTO_TEST_SUITE_END()