Subject: [Boost-commit] svn:boost r60070 - in sandbox/odeint: . boost/numeric/odeint
From: karsten.ahnert_at_[hidden]
Date: 2010-03-02 02:45:25
Author: karsten
Date: 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
New Revision: 60070
URL: http://svn.boost.org/trac/boost/changeset/60070
Log:
small changes
Binary files modified:
sandbox/odeint/boost/numeric/odeint/stepper_rk5_ck.hpp
Text files modified:
sandbox/odeint/ToDo | 12 ++++++------
sandbox/odeint/boost/numeric/odeint/stepper_euler.hpp | 5 +----
sandbox/odeint/boost/numeric/odeint/stepper_half_step.hpp | 9 +++++++--
sandbox/odeint/boost/numeric/odeint/stepper_midpoint.hpp | 4 ++--
sandbox/odeint/boost/numeric/odeint/stepper_rk4.hpp | 4 ++--
sandbox/odeint/boost/numeric/odeint/stepper_rk4_classical.hpp | 4 ++--
sandbox/odeint/boost/numeric/odeint/stepper_rk78_fehlberg.hpp | 4 ++--
sandbox/odeint/boost/numeric/odeint/stepper_rk_generic.hpp | 6 +++---
8 files changed, 25 insertions(+), 23 deletions(-)
Modified: sandbox/odeint/ToDo
==============================================================================
--- sandbox/odeint/ToDo (original)
+++ sandbox/odeint/ToDo 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -3,19 +3,19 @@
Karsten:
* Resizer functionality should be called explicitly and not in every call of do_step or try_step
* Add new order function (because we need three orders for rk78)
+ suggestion: * order_step()
+ * order_error_step()
+ * order_error()
* deriv every stepper from stepper_base< stepper >, because do_step( system , x , t , dt ) is only implemented once ( and calls the special do_step( system , x , dxdt , t , dt )
* In all steppers:
- * const unsigned short -> short
- * typedef typename traits_type::container_type container_type statt typedef Container container_type
+ * const unsigned short -> short - DONE
+ * typedef typename traits_type::container_type container_type statt typedef Container container_type - DONE
* in iterator algebra die funktionen welche maximas suchen durch die entsprechenden boost funktionen ersetzen
* Concept checks, für vernünftige Fehlermeldungen
* auch für checks ob abs() vorhanden ist
-* controlled stepper standard noncopyable machen
-* controlled stepper bs noncopyable
-* all stepper noncopyable
* check in all steppers the order
* rk78 die fehler implementieren
-* reference entfernen
+* references entfernen
Modified: sandbox/odeint/boost/numeric/odeint/stepper_euler.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/stepper_euler.hpp (original)
+++ sandbox/odeint/boost/numeric/odeint/stepper_euler.hpp 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -35,14 +35,12 @@
>
class stepper_euler
{
+
// provide basic typedefs
public:
-
-
typedef unsigned short order_type;
typedef Time time_type;
-
typedef Traits traits_type;
typedef typename traits_type::container_type container_type;
typedef typename traits_type::value_type value_type;
@@ -63,7 +61,6 @@
order_type order() const { return 1; }
-
template< class DynamicalSystem >
void do_step( DynamicalSystem &system ,
container_type &x ,
Modified: sandbox/odeint/boost/numeric/odeint/stepper_half_step.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/stepper_half_step.hpp (original)
+++ sandbox/odeint/boost/numeric/odeint/stepper_half_step.hpp 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -54,10 +54,15 @@
// public interface
public:
- order_type order() const { return m_stepper.order(); }
+ order_type order() const
+ {
+ /* */
+ return m_stepper.order();
+ }
order_type order_error() const
- { /* Order of the error term is the order of the underlying stepper + 1 */
+ {
+ /* Order of the error term is the order of the underlying stepper + 1 */
return m_stepper.order() + 1;
}
Modified: sandbox/odeint/boost/numeric/odeint/stepper_midpoint.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/stepper_midpoint.hpp (original)
+++ sandbox/odeint/boost/numeric/odeint/stepper_midpoint.hpp 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -37,10 +37,10 @@
// provide basic typedefs
public:
- typedef const unsigned short order_type;
- typedef Container container_type;
+ typedef unsigned short order_type;
typedef Time time_type;
typedef Traits traits_type;
+ typedef typename traits_type::container_type container_type;
typedef typename traits_type::value_type value_type;
typedef typename traits_type::iterator iterator;
typedef typename traits_type::const_iterator const_iterator;
Modified: sandbox/odeint/boost/numeric/odeint/stepper_rk4.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/stepper_rk4.hpp (original)
+++ sandbox/odeint/boost/numeric/odeint/stepper_rk4.hpp 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -34,10 +34,10 @@
// provide basic typedefs
public:
- typedef const unsigned short order_type;
- typedef Container container_type;
+ typedef unsigned short order_type;
typedef Time time_type;
typedef Traits traits_type;
+ typedef typename traits_type::container_type container_type;
typedef typename traits_type::value_type value_type;
typedef typename traits_type::iterator iterator;
typedef typename traits_type::const_iterator const_iterator;
Modified: sandbox/odeint/boost/numeric/odeint/stepper_rk4_classical.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/stepper_rk4_classical.hpp (original)
+++ sandbox/odeint/boost/numeric/odeint/stepper_rk4_classical.hpp 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -34,10 +34,10 @@
// provide basic typedefs
public:
- typedef const unsigned short order_type;
- typedef Container container_type;
+ typedef unsigned short order_type;
typedef Time time_type;
typedef Traits traits_type;
+ typedef typename traits_type::container_type container_type;
typedef typename traits_type::value_type value_type;
typedef typename traits_type::iterator iterator;
typedef typename traits_type::const_iterator const_iterator;
Modified: sandbox/odeint/boost/numeric/odeint/stepper_rk5_ck.hpp
==============================================================================
Binary files. No diff available.
Modified: sandbox/odeint/boost/numeric/odeint/stepper_rk78_fehlberg.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/stepper_rk78_fehlberg.hpp (original)
+++ sandbox/odeint/boost/numeric/odeint/stepper_rk78_fehlberg.hpp 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -29,10 +29,10 @@
// provide basic typedefs
public:
- typedef const unsigned short order_type;
- typedef Container container_type;
+ typedef unsigned short order_type;
typedef Time time_type;
typedef Traits traits_type;
+ typedef typename traits_type::container_type container_type;
typedef typename traits_type::value_type value_type;
typedef typename traits_type::iterator iterator;
typedef typename traits_type::const_iterator const_iterator;
Modified: sandbox/odeint/boost/numeric/odeint/stepper_rk_generic.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/stepper_rk_generic.hpp (original)
+++ sandbox/odeint/boost/numeric/odeint/stepper_rk_generic.hpp 2010-03-02 02:45:23 EST (Tue, 02 Mar 2010)
@@ -60,9 +60,9 @@
public:
typedef unsigned short order_type;
- typedef Container container_type;
typedef Time time_type;
typedef Traits traits_type;
+ typedef typename traits_type::container_type container_type;
typedef typename traits_type::value_type value_type;
typedef typename traits_type::iterator iterator;
typedef typename traits_type::const_iterator const_iterator;
@@ -271,10 +271,10 @@
// provide basic typedefs
public:
- typedef const unsigned short order_type;
- typedef Container container_type;
+ typedef unsigned short order_type;
typedef Time time_type;
typedef Traits traits_type;
+ typedef typename traits_type::container_type container_type;
typedef typename traits_type::value_type value_type;
typedef typename traits_type::iterator iterator;
typedef typename traits_type::const_iterator const_iterator;