[Boost-commit] svn:boost r59732 - in sandbox/odeint: boost/numeric/odeint libs/numeric/odeint/examples

Subject: [Boost-commit] svn:boost r59732 - in sandbox/odeint: boost/numeric/odeint libs/numeric/odeint/examples
From: mario.mulansky_at_[hidden]
Date: 2010-02-17 11:56:11

Author: mariomulansky
Date: 2010-02-17 11:56:10 EST (Wed, 17 Feb 2010)
New Revision: 59732
URL: http://svn.boost.org/trac/boost/changeset/59732

Log:
minor fix of doc_integrate
Text files modified: 
   sandbox/odeint/boost/numeric/odeint/controlled_stepper_standard.hpp |     9 +++++----                               
   sandbox/odeint/libs/numeric/odeint/examples/Jamfile                 |     2 +-                                      
   sandbox/odeint/libs/numeric/odeint/examples/doc_integrate.cpp       |     4 ++--                                    
   3 files changed, 8 insertions(+), 7 deletions(-)

Modified: sandbox/odeint/boost/numeric/odeint/controlled_stepper_standard.hpp
==============================================================================
--- sandbox/odeint/boost/numeric/odeint/controlled_stepper_standard.hpp	(original)
+++ sandbox/odeint/boost/numeric/odeint/controlled_stepper_standard.hpp	2010-02-17 11:56:10 EST (Wed, 17 Feb 2010)
@@ -177,13 +177,14 @@
     };
 
     template< class ErrorStepper >
-    controlled_stepper_standard< ErrorStepper > make_controlled_stepper_standard(
+    controlled_stepper_standard< ErrorStepper >& make_controlled_stepper_standard(
             ErrorStepper &stepper,
-            ErrorStepper::time_type abs_err, ErrorStepper::time_type rel_err, 
-            ErrorStepper::time_type factor_x, ErrorStepper::time_type factor_dxdt )
+            typename ErrorStepper::time_type abs_err, typename ErrorStepper::time_type rel_err, 
+            typename ErrorStepper::time_type factor_x, typename ErrorStepper::time_type factor_dxdt )
     {
-        return controlled_stepper_standard< ErrorStepper >(
+        controlled_stepper_standard< ErrorStepper > controlled_stepper(
                 stepper , abs_err , rel_err , factor_x , factor_dxdt );
+        return controlled_stepper;
     };
         
             

Modified: sandbox/odeint/libs/numeric/odeint/examples/Jamfile
==============================================================================
--- sandbox/odeint/libs/numeric/odeint/examples/Jamfile	(original)
+++ sandbox/odeint/libs/numeric/odeint/examples/Jamfile	2010-02-17 11:56:10 EST (Wed, 17 Feb 2010)
@@ -27,4 +27,4 @@
 exe dnls_stepper_compare : dnls_stepper_compare.cpp ;
 
 exe doc_harm_osc : doc_harm_osc.cpp ;
-exe doc_integrate_const : doc_integrate_const.cpp ;
\ No newline at end of file
+exe doc_integrate : doc_integrate.cpp ;

Modified: sandbox/odeint/libs/numeric/odeint/examples/doc_integrate.cpp
==============================================================================
--- sandbox/odeint/libs/numeric/odeint/examples/doc_integrate.cpp	(original)
+++ sandbox/odeint/libs/numeric/odeint/examples/doc_integrate.cpp	2010-02-17 11:56:10 EST (Wed, 17 Feb 2010)
@@ -37,7 +37,7 @@
     //]
 
     //[ integrate_const
-    integrate_const( rk4, harmonic_oscillator, 0.0, 0.01, x, 10.0 );
+    integrate_const( rk4, harmonic_oscillator, x , 0.0, 10.0 , 0.01);
     //]
 
 
@@ -52,7 +52,7 @@
 
     //[ integrate_adapt
     integrate_adaptive( make_controlled_stepper_standard( rk5 , 1E-6 , 1E-7 , 1.0 , 1.0 ),
-                        harmonic_oscillator, 0.0, 0.01, x, 10.0 );
+                        harmonic_oscillator, x, 0.0, 10.0, 0.01  );
     //]
     
     cout << x[0] << '\t' << x[1] << endl;