renamed do_nothing_observer -> null_observer

This commit is contained in:
Mario Mulansky 2011-08-19 21:49:40 +02:00
parent 687cc4de01
commit cb0263d085
7 changed files with 22 additions and 22 deletions

View File

@ -77,7 +77,7 @@ size_t integrate_const(
Time next_time = start_time + time_step;
count += detail::integrate_adaptive(
stepper , system , start_state , start_time , next_time , dt ,
do_nothing_observer() , controlled_stepper_tag() );
null_observer() , controlled_stepper_tag() );
}
obs( start_state , start_time );
return count;

View File

@ -20,7 +20,7 @@
#include <boost/numeric/odeint/stepper/runge_kutta_cash_karp54_classic.hpp>
#include <boost/numeric/odeint/stepper/controlled_error_stepper.hpp>
#include <boost/numeric/odeint/integrate/do_nothing_observer.hpp>
#include <boost/numeric/odeint/integrate/null_observer.hpp>
#include <boost/numeric/odeint/integrate/integrate_adaptive.hpp>
@ -61,13 +61,13 @@ size_t integrate( System system , const State &start_state , Time start_time , T
template< class System , class State , class Time >
size_t integrate( System system , State &start_state , Time start_time , Time end_time , Time dt )
{
return integrate( system , start_state , start_time , end_time , dt , do_nothing_observer() );
return integrate( system , start_state , start_time , end_time , dt , null_observer() );
}
template< class System , class State , class Time >
size_t integrate( System system , const State &start_state , Time start_time , Time end_time , Time dt )
{
return integrate( system , start_state , start_time , end_time , dt , do_nothing_observer() );
return integrate( system , start_state , start_time , end_time , dt , null_observer() );
}

View File

@ -21,7 +21,7 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/numeric/odeint/stepper/stepper_categories.hpp>
#include <boost/numeric/odeint/integrate/do_nothing_observer.hpp>
#include <boost/numeric/odeint/integrate/null_observer.hpp>
#include <boost/numeric/odeint/integrate/detail/integrate_const.hpp>
#include <boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp>
@ -68,7 +68,7 @@ size_t integrate_adaptive(
Stepper stepper , System system , State &start_state ,
Time start_time , Time end_time , Time dt )
{
return integrate_adaptive( stepper , system , start_state , start_time , end_time , dt , do_nothing_observer() );
return integrate_adaptive( stepper , system , start_state , start_time , end_time , dt , null_observer() );
}
template< class Stepper , class System , class State , class Time >
@ -76,7 +76,7 @@ size_t integrate_adaptive(
Stepper stepper , System system , const State &start_state ,
Time start_time , Time end_time , Time dt )
{
return integrate_adaptive( stepper , system , start_state , start_time , end_time , dt , do_nothing_observer() );
return integrate_adaptive( stepper , system , start_state , start_time , end_time , dt , null_observer() );
}

View File

@ -22,7 +22,7 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/numeric/odeint/stepper/stepper_categories.hpp>
#include <boost/numeric/odeint/integrate/do_nothing_observer.hpp>
#include <boost/numeric/odeint/integrate/null_observer.hpp>
#include <boost/numeric/odeint/integrate/detail/integrate_const.hpp>
#include <boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp>
@ -45,7 +45,7 @@ size_t integrate_const(
)
{
// we want to get as fast as possible to the end
if( boost::is_same< do_nothing_observer , Observer >::value )
if( boost::is_same< null_observer , Observer >::value )
{
return detail::integrate_adaptive(
stepper , system , start_state ,
@ -70,7 +70,7 @@ size_t integrate_const(
)
{
// we want to get as fast as possible to the end
if( boost::is_same< do_nothing_observer , Observer >::value )
if( boost::is_same< null_observer , Observer >::value )
{
return detail::integrate_adaptive(
stepper , system , start_state ,
@ -99,7 +99,7 @@ size_t integrate_const(
Time start_time , Time end_time , Time dt
)
{
return integrate_const( stepper , system , start_state , start_time , end_time , dt , do_nothing_observer() );
return integrate_const( stepper , system , start_state , start_time , end_time , dt , null_observer() );
}
template< class Stepper , class System , class State , class Time >
@ -108,7 +108,7 @@ size_t integrate_const(
Time start_time , Time end_time , Time dt
)
{
return integrate_const( stepper , system , start_state , start_time , end_time , dt , do_nothing_observer() );
return integrate_const( stepper , system , start_state , start_time , end_time , dt , null_observer() );
}

View File

@ -21,7 +21,7 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/numeric/odeint/stepper/stepper_categories.hpp>
#include <boost/numeric/odeint/integrate/do_nothing_observer.hpp>
#include <boost/numeric/odeint/integrate/null_observer.hpp>
#include <boost/numeric/odeint/integrate/detail/integrate_const.hpp>
#include <boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp>
@ -87,7 +87,7 @@ Time integrate_n_steps(
Stepper stepper , System system , State &start_state ,
Time start_time , Time dt , size_t num_of_steps )
{
return integrate_n_steps( stepper , system , start_state , start_time , dt , num_of_steps , do_nothing_observer() );
return integrate_n_steps( stepper , system , start_state , start_time , dt , num_of_steps , null_observer() );
}
template< class Stepper , class System , class State , class Time >
@ -95,7 +95,7 @@ Time integrate_n_steps(
Stepper stepper , System system , const State &start_state ,
Time start_time , Time dt , size_t num_of_steps )
{
return integrate_n_steps( stepper , system , start_state , start_time , dt , num_of_steps , do_nothing_observer() );
return integrate_n_steps( stepper , system , start_state , start_time , dt , num_of_steps , null_observer() );
}

View File

@ -21,7 +21,7 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/numeric/odeint/stepper/stepper_categories.hpp>
#include <boost/numeric/odeint/integrate/do_nothing_observer.hpp>
#include <boost/numeric/odeint/integrate/null_observer.hpp>
#include <boost/numeric/odeint/integrate/detail/integrate_times.hpp>
namespace boost {

View File

@ -1,9 +1,9 @@
/*
[auto_generated]
boost/numeric/odeint/integrate/do_nothing_observer.hpp
boost/numeric/odeint/integrate/null_observer.hpp
[begin_description]
null_observer or do_nothing_observer.
null_observer
[end_description]
Copyright 2009-2011 Karsten Ahnert
@ -15,14 +15,14 @@
*/
#ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_DO_NOTHING_OBSERVER_HPP_INCLUDED
#define BOOST_NUMERIC_ODEINT_INTEGRATE_DO_NOTHING_OBSERVER_HPP_INCLUDED
#ifndef BOOST_NUMERIC_ODEINT_INTEGRATE_NULL_OBSERVER_HPP_INCLUDED
#define BOOST_NUMERIC_ODEINT_INTEGRATE_NULL_OBSERVER_HPP_INCLUDED
namespace boost {
namespace numeric {
namespace odeint {
struct do_nothing_observer
struct null_observer
{
template< class State , class Time >
void operator()( const State& x , const Time &t ) const
@ -35,4 +35,4 @@ struct do_nothing_observer
} // namespace numeric
} // namespace boost
#endif // BOOST_NUMERIC_ODEINT_INTEGRATE_DO_NOTHING_OBSERVER_HPP_INCLUDED
#endif // BOOST_NUMERIC_ODEINT_INTEGRATE_NULL_OBSERVER_HPP_INCLUDED