[Boost-commit] svn:boost r66982 - in sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper: . base

Subject: [Boost-commit] svn:boost r66982 - in sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper: . base
From: karsten.ahnert_at_[hidden]
Date: 2010-12-03 03:21:28

Author: karsten
Date: 2010-12-03 03:21:27 EST (Fri, 03 Dec 2010)
New Revision: 66982
URL: http://svn.boost.org/trac/boost/changeset/66982

Log:
* mini changes
Added:
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/stepper_categories.hpp   (contents, props changed)
      - copied, changed from r66979, /sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/stepper_categories.hpp
Removed:
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/stepper_categories.hpp
Text files modified: 
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/controlled_error_stepper.hpp |     2 +-                                      
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/dense_output_dopri5.hpp      |     8 ++++----                                
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_dopri5.hpp    |     2 +-                                      
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_rk54_ck.hpp   |     2 +-                                      
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/stepper_categories.hpp       |     3 +++                                     
   5 files changed, 10 insertions(+), 7 deletions(-)

Deleted: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/stepper_categories.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/stepper_categories.hpp	2010-12-03 03:21:27 EST (Fri, 03 Dec 2010)
+++ (empty file)
@@ -1,33 +0,0 @@
-/*
-   boost header: numeric/odeint/stepper_categories.hpp
-
-   Copyright 2009 Karsten Ahnert
-   Copyright 2009 Mario Mulansky
-
-   Distributed under the Boost Software License, Version 1.0.
-   (See accompanying file LICENSE_1_0.txt or
-   copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_NUMERIC_ODEINT_STEPPER_CATEGORIES_HPP_
-#define BOOST_NUMERIC_ODEINT_STEPPER_CATEGORIES_HPP_
-
-namespace boost {
-namespace numeric {
-namespace odeint {
-
-/*
- * Tags to specify stepper types
- */
-
-struct error_stepper_tag {};
-
-struct explicit_error_stepper_tag : error_stepper_tag {};
-struct explicit_error_stepper_fsal_tag : error_stepper_tag {};
-
-} // odeint
-} // numeric
-} // boost
-
-
-#endif /* BOOST_NUMERIC_ODEINT_STEPPER_CATEGORIES_HPP_ */

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/controlled_error_stepper.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/controlled_error_stepper.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/controlled_error_stepper.hpp	2010-12-03 03:21:27 EST (Fri, 03 Dec 2010)
@@ -19,7 +19,7 @@
 
 #include <boost/numeric/odeint/stepper/adjust_size.hpp>
 #include <boost/numeric/odeint/stepper/error_checker.hpp>
-#include <boost/numeric/odeint/stepper/base/stepper_categories.hpp>
+#include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 
 namespace boost {
 namespace numeric {

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/dense_output_dopri5.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/dense_output_dopri5.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/dense_output_dopri5.hpp	2010-12-03 03:21:27 EST (Fri, 03 Dec 2010)
@@ -97,7 +97,10 @@
                 const size_t max_count = 1000;
 
                 if( !m_is_deriv_initialized )
+		{
                         system( *m_current_state , *m_current_deriv , m_t );
+			m_is_deriv_initialized = true;
+		}
 
                 controlled_step_result res = step_size_decreased;
                 m_t_old = m_t;
@@ -112,7 +115,6 @@
                 std::swap( m_current_state , m_old_state );
                 std::swap( m_current_deriv , m_old_deriv );
                 return std::make_pair( m_t_old , m_t );
-
         }
 
         /*
@@ -178,9 +180,7 @@
                 const state_type &k7 = *m_current_deriv;
 
                 algebra_type::for_each8( x , *m_old_state , k1 , k3 , k4 , k5 , k6 , k7 ,
-				typename operations_type::scale_sum7( 1.0 , dt * b1_theta , dt * b3_theta , dt * b4_theta , dt * b5_theta , dt * b6_theta , dt * b7_theta ) );
-//		algebra_type::for_each3( x , *m_old_state , k1 ,
-//				typename operations_type::scale_sum2( 1.0 , dt * theta ) );
+			typename operations_type::scale_sum7( 1.0 , dt * b1_theta , dt * b3_theta , dt * b4_theta , dt * b5_theta , dt * b6_theta , dt * b7_theta ) );
         }
 
         const state_type& current_state( void ) const

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_dopri5.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_dopri5.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_dopri5.hpp	2010-12-03 03:21:27 EST (Fri, 03 Dec 2010)
@@ -17,7 +17,7 @@
 #include <boost/numeric/odeint/algebra/standard_resize.hpp>
 
 #include <boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_fsal_base.hpp>
-#include <boost/numeric/odeint/stepper/base/stepper_categories.hpp>
+#include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/stepper/detail/macros.hpp>
 
 namespace boost {

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_rk54_ck.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_rk54_ck.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_error_rk54_ck.hpp	2010-12-03 03:21:27 EST (Fri, 03 Dec 2010)
@@ -19,7 +19,7 @@
 #include <boost/numeric/odeint/algebra/standard_resize.hpp>
 
 #include <boost/numeric/odeint/stepper/base/explicit_stepper_and_error_stepper_base.hpp>
-#include <boost/numeric/odeint/stepper/base/stepper_categories.hpp>
+#include <boost/numeric/odeint/stepper/stepper_categories.hpp>
 #include <boost/numeric/odeint/stepper/detail/macros.hpp>
 
 namespace boost {

Copied: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/stepper_categories.hpp (from r66979, /sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/stepper_categories.hpp)
==============================================================================
--- /sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/base/stepper_categories.hpp	(original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/stepper_categories.hpp	2010-12-03 03:21:27 EST (Fri, 03 Dec 2010)
@@ -16,11 +16,14 @@
 namespace numeric {
 namespace odeint {
 
+
 /*
  * Tags to specify stepper types
  */
 
+struct stepper_tag {};
 struct error_stepper_tag {};
+struct dense_output_stepper_tag {} ;
 
 struct explicit_error_stepper_tag : error_stepper_tag {};
 struct explicit_error_stepper_fsal_tag : error_stepper_tag {};