|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r61738 - sandbox/odeint/libs/numeric/odeint/examples
From: karsten.ahnert_at_[hidden]
Date: 2010-05-02 17:13:29
Author: karsten
Date: 2010-05-02 17:13:28 EDT (Sun, 02 May 2010)
New Revision: 61738
URL: http://svn.boost.org/trac/boost/changeset/61738
Log:
solar system example
Added:
sandbox/odeint/libs/numeric/odeint/examples/point_type.hpp
- copied, changed from r61736, /sandbox/odeint/libs/numeric/odeint/examples/solar_system.hpp
Removed:
sandbox/odeint/libs/numeric/odeint/examples/solar_system.hpp
Text files modified:
sandbox/odeint/libs/numeric/odeint/examples/point_type.hpp | 169 +++++++++++++++++++++------------------
sandbox/odeint/libs/numeric/odeint/examples/solar_system.cpp | 157 ++++++++++++++++++++-----------------
2 files changed, 176 insertions(+), 150 deletions(-)
Copied: sandbox/odeint/libs/numeric/odeint/examples/point_type.hpp (from r61736, /sandbox/odeint/libs/numeric/odeint/examples/solar_system.hpp)
==============================================================================
--- /sandbox/odeint/libs/numeric/odeint/examples/solar_system.hpp (original)
+++ sandbox/odeint/libs/numeric/odeint/examples/point_type.hpp 2010-05-02 17:13:28 EDT (Sun, 02 May 2010)
@@ -1,4 +1,4 @@
-/* Boost libs/numeric/odeint/examples/solar_system.hpp
+/* Boost libs/numeric/odeint/examples/point_type.hpp
Copyright 2009 Karsten Ahnert
Copyright 2009 Mario Mulansky
@@ -10,127 +10,134 @@
copy at http://www.boost.org/LICENSE_1_0.txt)
*/
-#ifndef SOLAR_SYSTEM_HPP_INCLUDED
-#define SOLAR_SYSTEM_HPP_INCLUDED
+#ifndef POINT_TYPE_HPP_INCLUDED
+#define POINT_TYPE_HPP_INCLUDED
#include <boost/operators.hpp>
#include <ostream>
+
//
// the point type
-//
+//
template< class T , size_t Dim >
-class point :
+class point :
boost::additive1< point< T , Dim > ,
boost::additive2< point< T , Dim > , T ,
boost::multiplicative2< point< T , Dim > , T
- > > >
-{
-public:
+ > > >
+{
+public:
const static size_t dim = Dim;
- typedef T value_type;
+ typedef T value_type;
typedef point< value_type , dim > point_type;
point( void )
- {
- for( size_t i=0 ; i<dim ; ++i ) m_val[i] = 0.0;
- }
- point( value_type val )
- {
- for( size_t i=0 ; i<dim ; ++i ) m_val[i] = val;
- }
+ {
+ for( size_t i=0 ; i<dim ; ++i ) m_val[i] = 0.0;
+ }
+ point( value_type val )
+ {
+ for( size_t i=0 ; i<dim ; ++i ) m_val[i] = val;
+ }
point( value_type x , value_type y , value_type z = 0.0 )
- {
- if( dim > 0 ) m_val[0] = x;
- if( dim > 1 ) m_val[1] = y;
- if( dim > 2 ) m_val[2] = z;
- }
-
- template< size_t i > T get( void ) const
- {
- BOOST_STATIC_ASSERT( i < dim );
- return m_val[i];
- }
- template< size_t i > T& get( void )
- {
- BOOST_STATIC_ASSERT( i < dim );
- return m_val[i];
- }
+ {
+ if( dim > 0 ) m_val[0] = x;
+ if( dim > 1 ) m_val[1] = y;
+ if( dim > 2 ) m_val[2] = z;
+ }
+
+/* template< size_t i > T get( void ) const
+ {
+ BOOST_STATIC_ASSERT( i < dim );
+ return m_val[i];
+ }
+ template< size_t i > T& get( void )
+ {
+ BOOST_STATIC_ASSERT( i < dim );
+ return m_val[i];
+ }*/
T operator[]( size_t i ) const { return m_val[i]; }
- T& operator[]( size_t i ) { return m_val[i]; }
-
+ T& operator[]( size_t i ) { return m_val[i]; }
+
+
point_type& operator+=( const point_type& p )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] += p[i];
- return *this;
- }
+ {
+ for( size_t i=0 ; i<dim ; ++i )
+ m_val[i] += p[i];
+ return *this;
+ }
point_type& operator-=( const point_type& p )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] -= p[i];
- return *this;
- }
+ {
+ for( size_t i=0 ; i<dim ; ++i )
+ m_val[i] -= p[i];
+ return *this;
+ }
point_type& operator+=( const value_type& val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] += val;
- return *this;
- }
+ {
+ for( size_t i=0 ; i<dim ; ++i )
+ m_val[i] += val;
+ return *this;
+ }
point_type& operator-=( const value_type& val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] -= val;
- return *this;
- }
+ {
+ for( size_t i=0 ; i<dim ; ++i )
+ m_val[i] -= val;
+ return *this;
+ }
point_type& operator*=( const value_type &val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] *= val;
- return *this;
- }
+ {
+ for( size_t i=0 ; i<dim ; ++i )
+ m_val[i] *= val;
+ return *this;
+ }
point_type& operator/=( const value_type &val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] /= val;
- return *this;
- }
+ {
+ for( size_t i=0 ; i<dim ; ++i )
+ m_val[i] /= val;
+ return *this;
+ }
private:
T m_val[dim];
-};
+};
+
//
// the - operator
-//
+//
template< class T , size_t Dim >
point< T , Dim > operator-( const point< T , Dim > &p )
-{
- point< T , Dim > tmp;
- for( size_t i=0 ; i<Dim ; ++i ) tmp[i] = -p[i];
- return tmp;
-}
+{
+ point< T , Dim > tmp;
+ for( size_t i=0 ; i<Dim ; ++i ) tmp[i] = -p[i];
+ return tmp;
+}
+
+
//
// scalar product
-//
+//
template< class T , size_t Dim >
T scalar_prod( const point< T , Dim > &p1 , const point< T , Dim > &p2 )
-{
- T tmp = 0.0;
- for( size_t i=0 ; i<Dim ; ++i ) tmp += p1[i] * p2[i];
- return tmp;
-}
+{
+ T tmp = 0.0;
+ for( size_t i=0 ; i<Dim ; ++i ) tmp += p1[i] * p2[i];
+ return tmp;
+}
+
+
//
// norm
@@ -141,6 +148,9 @@
return scalar_prod( p1 , p1 );
}
+
+
+
//
// absolute value
//
@@ -150,6 +160,9 @@
return sqrt( norm( p1 ) );
}
+
+
+
//
// output operator
//
@@ -163,4 +176,4 @@
-#endif //SOLAR_SYSTEM_HPP_INCLUDED
+#endif //POINT_TYPE_HPP_INCLUDED
Modified: sandbox/odeint/libs/numeric/odeint/examples/solar_system.cpp
==============================================================================
--- sandbox/odeint/libs/numeric/odeint/examples/solar_system.cpp (original)
+++ sandbox/odeint/libs/numeric/odeint/examples/solar_system.cpp 2010-05-02 17:13:28 EDT (Sun, 02 May 2010)
@@ -17,25 +17,24 @@
#include <boost/circular_buffer.hpp>
#include <boost/numeric/odeint.hpp>
-#include "solar_system.hpp"
+#include "point_type.hpp"
#define tab "\t"
using namespace std;
using namespace boost::numeric::odeint;
+// we simulate 5 planets and the sun
+const size_t n = 6;
-const size_t n = 3;
-typedef point< double ,3 > point_type;
+typedef point< double , 3 > point_type;
typedef std::tr1::array< point_type , n > state_type;
typedef std::tr1::array< double , n > mass_type;
-
typedef hamiltonian_stepper_rk< state_type > stepper_type;
-typedef boost::circular_buffer< point_type > buffer_type;
-const mass_type masses = {{ 1.0e9 , 1.0e9 , 1.0e12}};
-const double gravitational_constant = 6.657e-20;
+const double gravitational_constant = 2.95912208286e-4;
+
ostream& operator<<( ostream &out , const state_type &x )
{
@@ -45,98 +44,112 @@
return out;
}
-point_type get_mean( const state_type &x )
-{
- point_type mean( 0.0 );
- if( x.empty() ) return mean;
- for( size_t i=0 ; i<x.size() ; ++i ) mean += x[i];
- mean /= double( x.size() );
- return mean;
-}
-point_type get_center_of_mass( const state_type &x ,
- const mass_type &m )
+point_type center_of_mass( const state_type &x , const mass_type &m )
{
- point_type mean( 0.0 );
- if( x.empty() ) return mean;
double overall_mass = 0.0;
+ point_type mean( 0.0 );
for( size_t i=0 ; i<x.size() ; ++i )
{
overall_mass += m[i];
mean += m[i] * x[i];
}
- mean /= overall_mass;
+ if( x.size() != 0 ) mean /= overall_mass;
return mean;
-
-}
-
-void center_system( state_type &x , point_type mean )
-{
- for( size_t i=0 ; i<x.size() ; ++i ) x[i] -= mean;
}
-void solar_system( state_type &q , state_type &dpdt )
+double energy( const state_type &q , const state_type &p ,
+ const mass_type &masses )
{
- point_type diff , tmp;
- fill( dpdt.begin() , dpdt.end() , 0.0 );
+ const size_t n = q.size();
+ double e = 0.0;
for( size_t i=0 ; i<n ; ++i )
{
- for( size_t j=i+1 ; j<n ; ++j )
- {
- diff = q[j] - q[i];
- tmp = gravitational_constant * diff / pow( abs( diff ) , 3.0 );
- dpdt[i] += tmp * masses[j];
- dpdt[j] -= tmp * masses[i];
- }
+ e += 0.5 * norm( p[i] );
+ for( size_t j=i+1 ; j<n ; ++j )
+ {
+ double diff = abs( q[j] - q[i] );
+ e += gravitational_constant * masses[j] / diff;
+ }
}
+ return e;
}
+struct solar_system
+{
+ const mass_type &m_masses;
+
+ solar_system( const mass_type &masses ) : m_masses( masses ) { }
+
+ void operator()( state_type &q , state_type &dpdt )
+ {
+ const size_t n = q.size();
+ fill( dpdt.begin() , dpdt.end() , 0.0 );
+ for( size_t i=0 ; i<n ; ++i )
+ {
+ for( size_t j=i+1 ; j<n ; ++j )
+ {
+ point_type diff = q[j] - q[i];
+ diff = gravitational_constant * diff / pow( abs( diff ) , 3.0 );
+ dpdt[i] += diff * m_masses[j];
+ dpdt[j] -= diff * m_masses[i];
+ }
+ }
+ }
+};
+
int main( int argc , char **argv )
{
- state_type q , p;
- stepper_type stepper;
-
- fill( q.begin() , q.end() , 0.0 );
- fill( p.begin() , p.end() , 0.0 );
- q[0] = point_type( 0.0 , 1.0 , 0.0 );
- p[0] = point_type( 0.00001 , 0.0 , 0.0 );
- q[2] = point_type( 1.0 , 0.0 , 0.0 );
-
- center_system( q , get_center_of_mass( q , masses ) );
- center_system( p , get_center_of_mass( p , masses ) );
+ mass_type masses = {{
+ 1.00000597682 , // sun
+ 0.000954786104043 , // jupiter
+ 0.000285583733151 , // saturn
+ 0.0000437273164546 , // uranus
+ 0.0000517759138449 , // neptune
+ 1.0 / ( 1.3e8 ) // pluto
+ }};
+
+ state_type q = {{
+ point_type( 0.0 , 0.0 , 0.0 ) , // sun
+ point_type( -3.5023653 , -3.8169847 , -1.5507963 ) , // jupiter
+ point_type( 9.0755314 , -3.0458353 , -1.6483708 ) , // saturn
+ point_type( 8.3101420 , -16.2901086 , -7.2521278 ) , // uranus
+ point_type( 11.4707666 , -25.7294829 , -10.8169456 ) , // neptune
+ point_type( -15.5387357 , -25.2225594 , -3.1902382 ) // pluto
+ }};
+
+ state_type p = {{
+ point_type( 0.0 , 0.0 , 0.0 ) , // sun
+ point_type( 0.00565429 , -0.00412490 , -0.00190589 ) , // jupiter
+ point_type( 0.00168318 , 0.00483525 , 0.00192462 ) , // saturn
+ point_type( 0.00354178 , 0.00137102 , 0.00055029 ) , // uranus
+ point_type( 0.00288930 , 0.00114527 , 0.00039677 ) , // neptune
+ point_type( 0.00276725 , -0.00170702 , -0.00136504 ) // pluto
+ }};
+
+ point_type qmean = center_of_mass( q , masses );
+ point_type pmean = center_of_mass( p , masses );
+ for( size_t i=0 ; i<n ; ++i ) { q[i] -= qmean ; p[i] -= pmean; }
- const double dt = 1.0;
+ stepper_type stepper;
+ solar_system sol( masses );
- buffer_type buffers[n];
- for( size_t i=0 ; i<n ; ++i ) buffers[i].set_capacity( 100 );
- cout << "unset key\n";
- const size_t ilen = 1000;
+ const double dt = 0.001;
double t = 0.0;
- while( true )
+ while( t < 100000.0 )
{
- clog << get_mean( p ) << tab << get_mean( q ) << endl;
- for( size_t i=0 ; i<n ; ++i ) buffers[i].push_back( q[i] );
+ clog << t << tab << energy( q , p , masses ) << tab;
+ clog << center_of_mass( q , masses ) << tab;
+ clog << center_of_mass( p , masses ) << endl;
+
+ for( size_t i=0 ; i<n ; ++i )
+ cout << t << tab << q[i] << tab << p[i] << endl;
- cout << "p [-20:20][-20:20] '-' u 1:2 w l\n";
- for( size_t i=0 ; i<n ; ++i )
- {
- copy( buffers[i].begin() , buffers[i].end() ,
- ostream_iterator<point_type>( cout , "\n" ) );
- cout << "\n";
- }
- cout << "e" << endl;
-
-// getchar();
-
-// cout << "p [-2:2][-2:2] '-' u 1:2 pt 7 ps 5 \n" << q << "e" << endl;
-
- for( size_t ii=0 ; ii<ilen ; ++ii,t+=dt )
- {
- stepper.do_step( solar_system , q , p , dt );
- }
+ for( size_t i=0 ; i<1000 ; ++i ) stepper.do_step( sol , q , p , dt );
+ t += dt;
}
return 0;
Deleted: sandbox/odeint/libs/numeric/odeint/examples/solar_system.hpp
==============================================================================
--- sandbox/odeint/libs/numeric/odeint/examples/solar_system.hpp 2010-05-02 17:13:28 EDT (Sun, 02 May 2010)
+++ (empty file)
@@ -1,166 +0,0 @@
-/* Boost libs/numeric/odeint/examples/solar_system.hpp
-
- Copyright 2009 Karsten Ahnert
- Copyright 2009 Mario Mulansky
-
- solar system example for Hamiltonian stepper
-
- 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 SOLAR_SYSTEM_HPP_INCLUDED
-#define SOLAR_SYSTEM_HPP_INCLUDED
-
-
-#include <boost/operators.hpp>
-#include <ostream>
-
-//
-// the point type
-//
-template< class T , size_t Dim >
-class point :
- boost::additive1< point< T , Dim > ,
- boost::additive2< point< T , Dim > , T ,
- boost::multiplicative2< point< T , Dim > , T
- > > >
-{
-public:
-
- const static size_t dim = Dim;
- typedef T value_type;
- typedef point< value_type , dim > point_type;
-
- point( void )
- {
- for( size_t i=0 ; i<dim ; ++i ) m_val[i] = 0.0;
- }
- point( value_type val )
- {
- for( size_t i=0 ; i<dim ; ++i ) m_val[i] = val;
- }
- point( value_type x , value_type y , value_type z = 0.0 )
- {
- if( dim > 0 ) m_val[0] = x;
- if( dim > 1 ) m_val[1] = y;
- if( dim > 2 ) m_val[2] = z;
- }
-
- template< size_t i > T get( void ) const
- {
- BOOST_STATIC_ASSERT( i < dim );
- return m_val[i];
- }
- template< size_t i > T& get( void )
- {
- BOOST_STATIC_ASSERT( i < dim );
- return m_val[i];
- }
-
- T operator[]( size_t i ) const { return m_val[i]; }
- T& operator[]( size_t i ) { return m_val[i]; }
-
-
- point_type& operator+=( const point_type& p )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] += p[i];
- return *this;
- }
-
- point_type& operator-=( const point_type& p )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] -= p[i];
- return *this;
- }
-
- point_type& operator+=( const value_type& val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] += val;
- return *this;
- }
-
- point_type& operator-=( const value_type& val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] -= val;
- return *this;
- }
-
- point_type& operator*=( const value_type &val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] *= val;
- return *this;
- }
-
- point_type& operator/=( const value_type &val )
- {
- for( size_t i=0 ; i<dim ; ++i )
- m_val[i] /= val;
- return *this;
- }
-
-private:
-
- T m_val[dim];
-};
-
-//
-// the - operator
-//
-template< class T , size_t Dim >
-point< T , Dim > operator-( const point< T , Dim > &p )
-{
- point< T , Dim > tmp;
- for( size_t i=0 ; i<Dim ; ++i ) tmp[i] = -p[i];
- return tmp;
-}
-
-//
-// scalar product
-//
-template< class T , size_t Dim >
-T scalar_prod( const point< T , Dim > &p1 , const point< T , Dim > &p2 )
-{
- T tmp = 0.0;
- for( size_t i=0 ; i<Dim ; ++i ) tmp += p1[i] * p2[i];
- return tmp;
-}
-
-//
-// norm
-//
-template< class T , size_t Dim >
-T norm( const point< T , Dim > &p1 )
-{
- return scalar_prod( p1 , p1 );
-}
-
-//
-// absolute value
-//
-template< class T , size_t Dim >
-T abs( const point< T , Dim > &p1 )
-{
- return sqrt( norm( p1 ) );
-}
-
-//
-// output operator
-//
-template< class T , size_t Dim >
-std::ostream& operator<<( std::ostream &out , const point< T , Dim > &p )
-{
- if( Dim > 0 ) out << p[0];
- for( size_t i=1 ; i<Dim ; ++i ) out << " " << p[i];
- return out;
-}
-
-
-
-#endif //SOLAR_SYSTEM_HPP_INCLUDED
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