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

Subject: [Boost-commit] svn:boost r58353 - in sandbox/odeint: . libs libs/numeric/odeint/examples
From: karsten.ahnert_at_[hidden]
Date: 2009-12-13 08:42:01

Author: karsten
Date: 2009-12-13 08:42:01 EST (Sun, 13 Dec 2009)
New Revision: 58353
URL: http://svn.boost.org/trac/boost/changeset/58353

Log:
merged branches back into trunk
Added:
   sandbox/odeint/libs/numeric/odeint/examples/hamiltonian_test.cpp
      - copied unchanged from r58352, /sandbox/odeint/branches/karsten/libs/numeric/odeint/examples/hamiltonian_test.cpp
   sandbox/odeint/libs/numeric/odeint/examples/test_container_and_stepper.cpp
      - copied unchanged from r58352, /sandbox/odeint/branches/karsten/libs/numeric/odeint/examples/test_container_and_stepper.cpp
Properties modified: 
   sandbox/odeint/Jamroot   (props changed)
   sandbox/odeint/boost-build.jam   (props changed)
   sandbox/odeint/libs/   (props changed)
   sandbox/odeint/libs/numeric/odeint/examples/lorenz_stepper.cpp   (props changed)
Text files modified: 
   sandbox/odeint/libs/numeric/odeint/examples/Jamfile |     7 ++++++-                                 
   1 files changed, 6 insertions(+), 1 deletions(-)

Modified: sandbox/odeint/libs/numeric/odeint/examples/Jamfile
==============================================================================
--- sandbox/odeint/libs/numeric/odeint/examples/Jamfile	(original)
+++ sandbox/odeint/libs/numeric/odeint/examples/Jamfile	2009-12-13 08:42:01 EST (Sun, 13 Dec 2009)
@@ -8,12 +8,17 @@
     : requirements 
       <include>../../../..
       <include>$BOOST_ROOT
+      <include>$BLITZ_ROOT
+      <include>$MTL4_ROOT
       <define>BOOST_ALL_NO_LIB=1
     : build-dir .
     ;
 
 exe harmonic_oscillator : harmonic_oscillator.cpp ;
-exe lorenz_cmp_rk4_rk_generic : lorenz_cmp_rk4_rk_generic.cpp ;
+exe test_container_and_stepper : test_container_and_stepper.cpp ;
+exe hamiltonian_test : hamiltonian_test.cpp ;
+
+# exe lorenz_cmp_rk4_rk_generic : lorenz_cmp_rk4_rk_generic.cpp ;
 exe lorenz_controlled : lorenz_controlled.cpp ;
 exe lorenz_integrate_constant_step : lorenz_integrate_constant_step.cpp ;
 exe lorenz_integrator : lorenz_integrator.cpp ;