Subject: [Boost-commit] svn:boost r69223 - in sandbox/odeint/branches/karsten: . boost/numeric/odeint/stepper/base
From: karsten.ahnert_at_[hidden]
Date: 2011-02-23 15:47:45
Author: karsten
Date: 2011-02-23 15:47:43 EST (Wed, 23 Feb 2011)
New Revision: 69223
URL: http://svn.boost.org/trac/boost/changeset/69223
Log:
comments and todos in base steppers
Text files modified:
sandbox/odeint/branches/karsten/TODO | 5 +++--
sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp | 16 ++++++++++------
sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_base.hpp | 21 +++++++++------------
sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_fsal_base.hpp | 17 ++++++++---------
sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp | 11 -----------
sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp | 8 ++++++++
6 files changed, 38 insertions(+), 40 deletions(-)
Modified: sandbox/odeint/branches/karsten/TODO
==============================================================================
--- sandbox/odeint/branches/karsten/TODO (original)
+++ sandbox/odeint/branches/karsten/TODO 2011-02-23 15:47:43 EST (Wed, 23 Feb 2011)
@@ -16,11 +16,12 @@
OK * move error_checker into controlled_stepper
* rename controlled_stepper to a more specific name
* ranges:
- * explicit_stepper_and_error_stepper_fsal_base
+ OK * explicit_stepper_and_error_stepper_fsal_base
* dense_output
* controlled_error_stepper
* integrate functions
- * check comments (spelling and if the comment is true, in some versions dxdt is already const)
+ * test ranges in symplectic_rkn_stepper
+ OK * check comments (spelling and if the comment is true, in some versions dxdt is already const)
OK * check names of the impl functions
* general:
* check if everywhere static_cast< value_type > is used
Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_error_stepper_base.hpp 2011-02-23 15:47:43 EST (Wed, 23 Feb 2011)
@@ -103,7 +103,7 @@
/*
* Version 1 : do_step( system , x , t , dt , xerr )
*
- * Solves for the forwading problem
+ * the two overloads are needed in order to solve the forwarding problem
*/
template< class System , class StateInOut , class Err >
void do_step( System system , StateInOut &x , const time_type &t , const time_type &dt , Err &xerr )
@@ -116,10 +116,12 @@
{
do_step_v1( system , x , t , dt , xerr );
}
+
+
/*
* Version 2 : do_step( system , x , dxdt , t , dt , xerr )
*
- * Does not solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateInOut , class DerivIn , class Err >
void do_step( System system , StateInOut &x , const DerivIn &dxdt , const time_type &t , const time_type &dt , Err &xerr )
@@ -127,10 +129,11 @@
this->stepper().do_step_impl( system , x , dxdt , t , x , dt , xerr );
}
+
/*
- * Version 2 : do_step( system , in , t , out , dt , xerr )
+ * Version 3 : do_step( system , in , t , out , dt , xerr )
*
- * Does not solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class StateOut , class Err >
void do_step( System system , const StateIn &in , const time_type &t , StateOut &out , const time_type &dt , Err &xerr )
@@ -141,10 +144,11 @@
this->stepper().do_step_impl( system , in , m_dxdt , t , out , dt , xerr );
}
+
/*
- * Version 2 : do_step( system , in , dxdt , t , out , dt , xerr )
+ * Version 4 : do_step( system , in , dxdt , t , out , dt , xerr )
*
- * Does not solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class DerivIn , class StateOut , class Err >
void do_step( System system , const StateIn &in , const DerivIn &dxdt , const time_type &t , StateOut &out , const time_type &dt , Err &xerr )
Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_base.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_base.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_base.hpp 2011-02-23 15:47:43 EST (Wed, 23 Feb 2011)
@@ -113,7 +113,7 @@
/*
* Version 1 : do_step( sys , x , t , dt )
*
- * Does solve for the forwarding problem
+ * the two overloads are needed in order to solve the forwarding problem
*/
template< class System , class StateInOut >
void do_step( System system , StateInOut &x , const time_type &t , const time_type &dt )
@@ -131,7 +131,7 @@
/*
* Version 2 : do_step( sys , x , dxdt , t , dt )
*
- * Does NOT solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateInOut , class DerivIn >
void do_step( System system , StateInOut &x , const DerivIn &dxdt , const time_type &t , const time_type &dt )
@@ -143,7 +143,7 @@
/*
* Version 3 : do_step( sys , in , t , out , dt )
*
- * Does NOT solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class StateOut >
void do_step( System system , const StateIn &in , const time_type &t , StateOut &out , const time_type &dt )
@@ -157,7 +157,7 @@
/*
* Version 4 :do_step( sys , in , dxdt , t , out , dt )
*
- * Does NOT solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class DerivIn , class StateOut >
void do_step( System system , const StateIn &in , const DerivIn &dxdt , const time_type &t , StateOut &out , const time_type &dt )
@@ -172,16 +172,12 @@
/*
* Version 5 :do_step( sys , x , t , dt , xerr )
*
- * Does solve for the forwarding problem
+ * the two overloads are needed in order to solve the forwarding problem
*/
template< class System , class StateInOut , class Err >
void do_step( System system , StateInOut &x , const time_type &t , const time_type &dt , Err &xerr )
{
do_step_v5( system , x , t , dt , xerr );
-// typename boost::unwrap_reference< System >::type &sys = system;
-// m_size_adjuster.adjust_size_by_policy( x , adjust_size_policy() );
-// sys( x , m_dxdt ,t );
-// this->stepper().do_step_impl( system , x , m_dxdt , t , x , dt , xerr );
}
template< class System , class StateInOut , class Err >
@@ -194,7 +190,7 @@
/*
* Version 6 :do_step( sys , x , dxdt , t , dt , xerr )
*
- * Does NOT solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateInOut , class DerivIn , class Err >
void do_step( System system , StateInOut &x , const DerivIn &dxdt , const time_type &t , const time_type &dt , Err &xerr )
@@ -206,7 +202,7 @@
/*
* Version 7 : do_step( sys , in , t , out , dt , xerr )
*
- * Does NOT solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class StateOut , class Err >
void do_step( System system , const StateIn &in , const time_type &t , StateOut &out , const time_type &dt , Err &xerr )
@@ -217,10 +213,11 @@
this->stepper().do_step_impl( system , in , m_dxdt , t , out , dt , xerr );
}
+
/*
* Version 8 : do_step( sys , in , dxdt , t , out , dt , xerr )
*
- * Does NOT solve for the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class DerivIn , class StateOut , class Err >
void do_step( System system , const StateIn &in , const DerivIn &dxdt , const time_type &t , StateOut &out , const time_type &dt , Err &xerr )
Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_fsal_base.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_fsal_base.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_fsal_base.hpp 2011-02-23 15:47:43 EST (Wed, 23 Feb 2011)
@@ -114,7 +114,7 @@
/*
* version 1 : do_step( sys , x , t , dt )
*
- * Solves the forwarding problem
+ * the two overloads are needed in order to solve the forwarding problem
*/
template< class System , class StateInOut >
void do_step( System system , StateInOut &x , const time_type &t , const time_type &dt )
@@ -132,7 +132,7 @@
/*
* version 2 : do_step( sys , x , dxdt , t , dt )
*
- * Does NOT solve the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateInOut , class DerivInOut >
void do_step( System system , StateInOut &x , DerivInOut &dxdt , const time_type &t , const time_type &dt )
@@ -145,7 +145,7 @@
/*
* version 3 : do_step( sys , in , t , out , dt )
*
- * Does NOT solve the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class StateOut >
void do_step( System system , const StateIn &in , const time_type &t , StateOut &out , const time_type &dt )
@@ -163,7 +163,7 @@
/*
* version 4 : do_step( sys , in , dxdt_in , t , out , dxdt_out , dt )
*
- * Does NOT solve the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class DerivIn , class StateOut , class DerivOut >
void do_step( System system , const StateIn &in , const DerivIn &dxdt_in , const time_type &t ,
@@ -180,7 +180,7 @@
/*
* version 5 : do_step( sys , x , t , dt , xerr )
*
- * Solves the forwarding problem
+ * the two overloads are needed in order to solve the forwarding problem
*/
template< class System , class StateInOut , class Err >
void do_step( System system , StateInOut &x , const time_type &t , const time_type &dt , Err &xerr )
@@ -195,11 +195,10 @@
}
-
/*
* version 6 : do_step( sys , x , dxdt , t , dt , xerr )
*
- * Does NOT solve the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateInOut , class DerivInOut , class Err >
void do_step( System system , StateInOut &x , DerivInOut &dxdt , const time_type &t , const time_type &dt , Err &xerr )
@@ -212,7 +211,7 @@
/*
* version 7 : do_step( sys , in , t , out , dt , xerr )
*
- * Does NOT solve the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class StateOut , class Err >
void do_step( System system , const StateIn &in , const time_type &t , StateOut &out , const time_type &dt , Err &xerr )
@@ -230,7 +229,7 @@
/*
* version 8 : do_step( sys , in , dxdt_in , t , out , dxdt_out , dt )
*
- * Does NOT solve the forwarding problem
+ * this version does not solve the forwarding problem, boost.range can not be used
*/
template< class System , class StateIn , class DerivIn , class StateOut , class DerivOut , class Err >
void do_step( System system , const StateIn &in , const DerivIn &dxdt_in , const time_type &t ,
Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/explicit_stepper_base.hpp 2011-02-23 15:47:43 EST (Wed, 23 Feb 2011)
@@ -112,12 +112,6 @@
}
-
-
-
-
-
-
/*
* Version 2 : do_step( sys , x , dxdt , t , dt )
*
@@ -130,9 +124,6 @@
}
-
-
-
/*
* Version 3 : do_step( sys , in , t , out , dt )
*
@@ -148,8 +139,6 @@
}
-
-
/*
* Version 4 : do_step( sys , in , dxdt , t , out , dt )
*
Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/symplectic_rkn_stepper_base.hpp 2011-02-23 15:47:43 EST (Wed, 23 Feb 2011)
@@ -127,6 +127,7 @@
do_step_impl( system , state , t , state , dt , typename detail::is_pair< system_type >::type() );
}
+
// for convenience
template< class System , class CoorInOut , class MomentumInOut >
void do_step( System system , CoorInOut &q , MomentumInOut &p , const time_type &t , const time_type &dt )
@@ -134,6 +135,13 @@
do_step( system , std::make_pair( boost::ref( q ) , boost::ref( p ) ) , t , dt );
}
+ // for convenience
+ template< class System , class CoorInOut , class MomentumInOut >
+ void do_step( System system , const CoorInOut &q , const MomentumInOut &p , const time_type &t , const time_type &dt )
+ {
+ do_step( system , std::make_pair( boost::ref( q ) , boost::ref( p ) ) , t , dt );
+ }
+