|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68324 - in sandbox/odeint/branches/karsten: boost/numeric/odeint/algebra libs/numeric/odeint/test
From: karsten.ahnert_at_[hidden]
Date: 2011-01-20 15:20:24
Author: karsten
Date: 2011-01-20 15:20:17 EST (Thu, 20 Jan 2011)
New Revision: 68324
URL: http://svn.boost.org/trac/boost/changeset/68324
Log:
* unit test for operations
Text files modified:
sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/standard_operations.hpp | 3
sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_operations.cpp | 211 +++++++++++++++++++++++++++------------
2 files changed, 148 insertions(+), 66 deletions(-)
Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/standard_operations.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/standard_operations.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/algebra/standard_operations.hpp 2011-01-20 15:20:17 EST (Thu, 20 Jan 2011)
@@ -187,7 +187,8 @@
Fac1 operator()( const T1 &t1 , const T2 &t2 ) const
{
using std::max;
- return max( t1 , t2 );
+ using std::abs;
+ return max( abs( t1 ) , abs( t2 ) );
}
};
Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_operations.cpp
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_operations.cpp (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_operations.cpp 2011-01-20 15:20:17 EST (Thu, 20 Jan 2011)
@@ -5,136 +5,217 @@
* Author: karsten
*/
+#include <cmath>
+#include <complex>
#include <boost/test/unit_test.hpp>
#include <boost/test/floating_point_comparison.hpp>
+#include <boost/units/systems/si/length.hpp>
+#include <boost/units/systems/si/time.hpp>
+#include <boost/units/systems/si/velocity.hpp>
+#include <boost/units/systems/si/acceleration.hpp>
+#include <boost/units/systems/si/io.hpp>
+
+#include <boost/mpl/list.hpp>
+
#include <boost/numeric/odeint/algebra/standard_operations.hpp>
+namespace units = boost::units;
+namespace si = boost::units::si;
+namespace mpl = boost::mpl;
using boost::numeric::odeint::standard_operations;
-const double eps = 1.0e-13;
+template< class Value > struct internal_value_type { typedef Value type; };
+template< class T > struct internal_value_type< std::complex< T > > { typedef T type; };
+
+template< class T > struct default_eps;
+template<> struct default_eps< double > { static double def_eps( void ) { return 1.0e-10; } };
+template<> struct default_eps< float > { static float def_eps( void ) { return 1.0e-5; } };
+
+
+// const double eps = 1.0e-10;
+
+template< class Value , class Compare = typename internal_value_type< Value >::type >
struct double_fixture
{
- double_fixture( void )
- : res( 0.0 ) , x1( 1.0 ) , x2( 2.0 ) , x3( 3.0 ) , x4( 4.0 ) , x5( 5.0 ) , x6( 6.0 ) , x7( 7.0 ) , x8( 8.0 )
+ typedef Value value_type;
+ typedef Compare compare_type;
+
+ double_fixture( const compare_type &eps_ = default_eps< compare_type >::def_eps() )
+ : m_eps( eps_ ) , res( 0.0 ) , x1( 1.0 ) , x2( 2.0 ) , x3( 3.0 ) , x4( 4.0 ) , x5( 5.0 ) , x6( 6.0 ) , x7( 7.0 ) , x8( 8.0 )
{}
+
~double_fixture( void )
{
- BOOST_CHECK_CLOSE( x1 , double( 1.0 ) , eps );
- BOOST_CHECK_CLOSE( x2 , double( 2.0 ) , eps );
- BOOST_CHECK_CLOSE( x3 , double( 3.0 ) , eps );
- BOOST_CHECK_CLOSE( x4 , double( 4.0 ) , eps );
- BOOST_CHECK_CLOSE( x5 , double( 5.0 ) , eps );
- BOOST_CHECK_CLOSE( x6 , double( 6.0 ) , eps );
- BOOST_CHECK_CLOSE( x7 , double( 7.0 ) , eps );
- BOOST_CHECK_CLOSE( x8 , double( 8.0 ) , eps );
+ using std::abs;
+ BOOST_CHECK_SMALL( abs( x1 - value_type( 1.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( x2 - value_type( 2.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( x3 - value_type( 3.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( x4 - value_type( 4.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( x5 - value_type( 5.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( x6 - value_type( 6.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( x7 - value_type( 7.0 ) ) , m_eps );
}
- double res;
- double x1 , x2 , x3 , x4 , x5 , x6 , x7 , x8;
+
+ const compare_type m_eps;
+ value_type res;
+ value_type x1 , x2 , x3 , x4 , x5 , x6 , x7 , x8;
};
+template< class Value , class Compare = typename internal_value_type< Value >::type >
struct unit_fixture
{
- unit_fixture( void )
+ typedef Value value_type;
+ typedef Compare compare_type;
+ typedef units::quantity< si::length , value_type > length_type;
+ typedef units::quantity< si::time , value_type > time_type;
+ typedef units::quantity< si::velocity , value_type > velocity_type;
+ typedef units::quantity< si::acceleration , value_type > acceleration_type;
+
+ unit_fixture( const compare_type &eps_ = default_eps< compare_type >::def_eps() )
+ : m_eps( eps_ )
+ , res( 0.0 * si::meter )
+ , x( 1.0 * si::meter )
+ , d1x( 2.0 * si::meter / si::second )
+ , d2x( 3.0 * si::meter / si::second / si::second )
{}
+
~unit_fixture( void )
{
-
+ using std::abs;
+ BOOST_CHECK_SMALL( abs( x.value() - value_type( 1.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( d1x.value() - value_type( 2.0 ) ) , m_eps );
+ BOOST_CHECK_SMALL( abs( d2x.value() - value_type( 3.0 ) ) , m_eps );
}
-
+ compare_type m_eps;
+ length_type res;
+ length_type x;
+ velocity_type d1x;
+ acceleration_type d2x;
};
+typedef mpl::list< float , double , std::complex< double > > test_types;
+
BOOST_AUTO_TEST_SUITE( check_operations_test )
-BOOST_AUTO_TEST_CASE( scale_sum2_with_double )
+using std::abs;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum2_test , T , test_types )
{
- double_fixture f;
- double res = 0.0;
- typedef standard_operations::scale_sum2< double , double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ typedef typename standard_operations::scale_sum2< T , T > Op;
Op op( 1.25 , 9.81 );
- op( res , f.x1 , f.x2 );
- BOOST_CHECK_CLOSE( res , double( 20.87 ) , eps );
+ op( f.res , f.x1 , f.x2 );
+ BOOST_CHECK_SMALL( abs( f.res - T( 20.87 ) ) , f.m_eps );
}
-BOOST_AUTO_TEST_CASE( scale_sum3_with_double )
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum3_test , T , test_types )
{
- double_fixture f;
- double res = 0.0;
- typedef standard_operations::scale_sum3< double , double , double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ typedef standard_operations::scale_sum3< T , T , T > Op;
Op op( 1.25 , 9.81 , 0.87 );
- op( res , f.x1 , f.x2 , f.x3 );
- BOOST_CHECK_CLOSE( res , double( 23.48 ) , eps );
+ op( f.res , f.x1 , f.x2 , f.x3 );
+ BOOST_CHECK_SMALL( abs( f.res - T( 23.48 ) ) , f.m_eps );
}
-BOOST_AUTO_TEST_CASE( scale_sum4_with_double )
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum4_test , T , test_types )
{
- double_fixture f;
- double res = 0.0;
- typedef standard_operations::scale_sum4< double , double , double , double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ typedef standard_operations::scale_sum4< T , T , T , T > Op;
Op op( 1.25 , 9.81 , 0.87 , -0.15 );
- op( res , f.x1 , f.x2 , f.x3 , f.x4 );
- BOOST_CHECK_CLOSE( res , double( 22.88 ) , eps );
+ op( f.res , f.x1 , f.x2 , f.x3 , f.x4 );
+ BOOST_CHECK_SMALL( abs( f.res - T( 22.88 ) ) , f.m_eps );
}
-BOOST_AUTO_TEST_CASE( scale_sum5_with_double )
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum5_test , T , test_types )
{
- double_fixture f;
- double res = 0.0;
- typedef standard_operations::scale_sum5< double , double , double , double , double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ typedef standard_operations::scale_sum5< T , T , T , T , T > Op;
Op op( 1.25 , 9.81 , 0.87 , -0.15 , -3.3 );
- op( res , f.x1 , f.x2 , f.x3 , f.x4 , f.x5 );
- BOOST_CHECK_CLOSE( res , double( 6.38 ) , eps );
+ op( f.res , f.x1 , f.x2 , f.x3 , f.x4 , f.x5 );
+ BOOST_CHECK_SMALL( abs( f.res - T( 6.38 ) ) , f.m_eps );
}
-BOOST_AUTO_TEST_CASE( scale_sum6_with_double )
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum6_test , T , test_types )
{
- double_fixture f;
- double res = 0.0;
- typedef standard_operations::scale_sum6< double , double , double , double , double , double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ typedef standard_operations::scale_sum6< T , T , T , T , T , T > Op;
Op op( 1.25 , 9.81 , 0.87 , -0.15 , -3.3 , 4.2 );
- op( res , f.x1 , f.x2 , f.x3 , f.x4 , f.x5 , f.x6 );
- BOOST_CHECK_CLOSE( res , double( 31.58 ) , eps );
+ op( f.res , f.x1 , f.x2 , f.x3 , f.x4 , f.x5 , f.x6 );
+ BOOST_CHECK_SMALL( abs( f.res - T( 31.58 ) ) , f.m_eps );
}
-BOOST_AUTO_TEST_CASE( scale_sum7_with_double )
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum7_test , T , test_types )
{
- double_fixture f;
- double res = 0.0;
- typedef standard_operations::scale_sum7< double , double , double , double , double , double , double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ typedef standard_operations::scale_sum7< T , T , T , T , T , T , T > Op;
Op op( 1.25 , 9.81 , 0.87 , -0.15 , -3.3 , 4.2 , -0.22 );
- op( res , f.x1 , f.x2 , f.x3 , f.x4 , f.x5 , f.x6 , f.x7 );
- BOOST_CHECK_CLOSE( res , double( 30.04 ) , eps );
+ op( f.res , f.x1 , f.x2 , f.x3 , f.x4 , f.x5 , f.x6 , f.x7 );
+ BOOST_CHECK_SMALL( abs( f.res - T( 30.04 ) ) , f.m_eps );
}
-BOOST_AUTO_TEST_CASE( rel_error_with_double )
+BOOST_AUTO_TEST_CASE_TEMPLATE( rel_error_test , T , test_types )
{
- double_fixture f;
- double res = -1.1;
- typedef standard_operations::rel_error< double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ f.res = -1.1;
+ typedef standard_operations::rel_error< T > Op;
Op op( 0.1 , 0.2 , 0.15 , 0.12 );
- op( -f.x1 , -f.x2 , res );
- BOOST_CHECK_CLOSE( res , 6.17978 , 1.0e-4 );
+ op( -f.x1 , -f.x2 , f.res );
+ BOOST_CHECK_SMALL( abs( f.res - T( 6.17978 ) ) , typename fix_type::compare_type( 1.0e-4 ) );
}
-BOOST_AUTO_TEST_CASE( maximum )
+BOOST_AUTO_TEST_CASE_TEMPLATE( maximum_test , T , test_types )
{
- double_fixture f;
- double res = 0.0;
- typedef standard_operations::maximum< double > Op;
+ typedef double_fixture< T > fix_type;
+ fix_type f;
+ typedef standard_operations::maximum< typename fix_type::compare_type > Op;
Op op;
- res = op( f.x1 , f.x2 );
- BOOST_CHECK_CLOSE( res , 2.0 , eps );
+ f.res = op( f.x1 , f.x2 );
+ BOOST_CHECK_SMALL( abs( f.res - T( 2.0 ) ) , f.m_eps );
}
-BOOST_AUTO_TEST_CASE( scale_sum2_with_units )
+
+
+
+
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum2_units_test , T , test_types )
{
+ typedef unit_fixture< T > fix_type;
+ typedef typename fix_type::value_type value_type;
+ typedef typename fix_type::time_type time_type;
+ fix_type f;
+ typedef standard_operations::scale_sum2< value_type , time_type > Op;
+ Op op( 1.0 , time_type( 0.1 * si::second ) );
+ op( f.res , f.x , f.d1x );
+ BOOST_CHECK_SMALL( abs( f.res.value() - T( 1.2 ) ) , f.m_eps );
}
+BOOST_AUTO_TEST_CASE_TEMPLATE( scale_sum3_units_test , T , test_types )
+{
+ typedef unit_fixture< T > fix_type;
+ typedef typename fix_type::value_type value_type;
+ typedef typename fix_type::time_type time_type;
+
+ fix_type f;
+ typedef standard_operations::scale_sum2< value_type , time_type > Op;
+ Op op( 1.0 , time_type( 0.1 * si::second ) );
+ op( f.res , f.x , f.d1x );
+ BOOST_CHECK_SMALL( abs( f.res.value() - T( 1.2 ) ) , f.m_eps );
+}
+
+
BOOST_AUTO_TEST_SUITE_END()
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk