Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r65286 - in sandbox/odeint/branches/karsten: boost/numeric/odeint/stepper libs/numeric/odeint/test
From: karsten.ahnert_at_[hidden]
Date: 2010-09-05 05:51:00


Author: karsten
Date: 2010-09-05 05:50:59 EDT (Sun, 05 Sep 2010)
New Revision: 65286
URL: http://svn.boost.org/trac/boost/changeset/65286

Log:
* the stepper are now noncopyable
* note that due to this restriction some tests are ugly
Text files modified:
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/adjust_size.hpp | 7 ++++---
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/controlled_error_stepper.hpp | 4 +++-
   sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_stepper_base.hpp | 5 ++---
   sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_resize.cpp | 17 +++++++++--------
   4 files changed, 18 insertions(+), 15 deletions(-)

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/adjust_size.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/adjust_size.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/adjust_size.hpp 2010-09-05 05:50:59 EDT (Sun, 05 Sep 2010)
@@ -13,10 +13,11 @@
 #ifndef BOOST_NUMERIC_ODEINT_ADJUST_SIZE_HPP_INCLUDED
 #define BOOST_NUMERIC_ODEINT_ADJUST_SIZE_HPP_INCLUDED
 
+#include <boost/noncopyable.hpp>
+#include <boost/ptr_container/ptr_array.hpp>
+
 #include <boost/numeric/odeint/algebra/standard_resize.hpp>
 
-#include <boost/ptr_container/ptr_array.hpp>
-//#include <boost/utility.hpp>
 
 namespace boost {
 namespace numeric {
@@ -40,7 +41,7 @@
  * Adjust size functionality with policies and resizeability
  */
 template< class State , size_t Dim >
-class size_adjuster
+class size_adjuster : boost::noncopyable
 {
 public:
 

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-09-05 05:50:59 EDT (Sun, 05 Sep 2010)
@@ -15,6 +15,8 @@
 
 #include <cmath>
 
+#include <boost/noncopyable.hpp>
+
 #include <boost/numeric/odeint/stepper/adjust_size.hpp>
 #include <boost/numeric/odeint/stepper/error_checker.hpp>
 
@@ -37,7 +39,7 @@
                                                                                                    typename ErrorStepper::algebra_type ,
                                                                                                    typename ErrorStepper::operations_type >
>
-class controlled_error_stepper
+class controlled_error_stepper : boost::noncopyable
 {
 public:
 

Modified: sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_stepper_base.hpp
==============================================================================
--- sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_stepper_base.hpp (original)
+++ sandbox/odeint/branches/karsten/boost/numeric/odeint/stepper/explicit_stepper_base.hpp 2010-09-05 05:50:59 EDT (Sun, 05 Sep 2010)
@@ -14,8 +14,7 @@
 #define BOOST_BOOST_NUMERIC_ODEINT_EXPLICIT_STEPPER_BASE_HPP_INCLUDED
 
 
-//#include <boost/mem_fn.hpp>
-//#include <boost/bind.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <boost/numeric/odeint/stepper/adjust_size.hpp>
 #include <boost/numeric/odeint/algebra/standard_resize.hpp>
@@ -46,7 +45,7 @@
         class Operations ,
         class AdjustSizePolicy
>
-class explicit_stepper_base
+class explicit_stepper_base : boost::noncopyable
 {
 public:
 

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_resize.cpp
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_resize.cpp (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/test/check_resize.cpp 2010-09-05 05:50:59 EDT (Sun, 05 Sep 2010)
@@ -12,9 +12,10 @@
 
 #include <vector>
 #include <cmath>
-#include <boost/array.hpp>
 
+#include <boost/array.hpp>
 #include <boost/bind.hpp>
+#include <boost/utility.hpp>
 
 #include <boost/test/unit_test.hpp>
 
@@ -98,13 +99,13 @@
     rk4_always_type rk4_always;
 
 
- test->add( BOOST_TEST_CASE( boost::bind( &test_resize< euler_manual_type > , euler_manual , 1 , 0 ) ) );
- test->add( BOOST_TEST_CASE( boost::bind( &test_resize< euler_initially_type > , euler_initially , 1 , 1 ) ) );
- test->add( BOOST_TEST_CASE( boost::bind( &test_resize< euler_always_type > , euler_always , 1 , 3 ) ) );
-
- test->add( BOOST_TEST_CASE( boost::bind( &test_resize< rk4_manual_type > , rk4_manual , 5 , 0 ) ) );
- test->add( BOOST_TEST_CASE( boost::bind( &test_resize< rk4_initially_type > , rk4_initially , 5 , 1 ) ) );
- test->add( BOOST_TEST_CASE( boost::bind( &test_resize< rk4_always_type > , rk4_always , 5 , 3 ) ) );
+ test->add( BOOST_TEST_CASE( boost::bind( &test_resize< euler_manual_type > , boost::ref( euler_manual ) , 1 , 0 ) ) );
+ test->add( BOOST_TEST_CASE( boost::bind( &test_resize< euler_initially_type > , boost::ref( euler_initially ) , 1 , 1 ) ) );
+ test->add( BOOST_TEST_CASE( boost::bind( &test_resize< euler_always_type > , boost::ref( euler_always ) , 1 , 3 ) ) );
+
+ test->add( BOOST_TEST_CASE( boost::bind( &test_resize< rk4_manual_type > , boost::ref( rk4_manual ) , 5 , 0 ) ) );
+ test->add( BOOST_TEST_CASE( boost::bind( &test_resize< rk4_initially_type > , boost::ref( rk4_initially ) , 5 , 1 ) ) );
+ test->add( BOOST_TEST_CASE( boost::bind( &test_resize< rk4_always_type > , boost::ref( rk4_always ) , 5 , 3 ) ) );
 
     return test;
 }


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