Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r70117 - in sandbox/odeint/branches/karsten/libs/numeric/odeint: doc doc/html doc/html/boost_sandbox_numeric_odeint examples
From: karsten.ahnert_at_[hidden]
Date: 2011-03-18 06:24:03

Next message: barend.gehrels_at_[hidden]: "[Boost-commit] svn:boost r70118 - trunk/libs/geometry/example"
Previous message: erwann.rogard_at_[hidden]: "[Boost-commit] svn:boost r70116 - sandbox/assign_v2/boost/assign/v2/detail/traits/type"

Author: karsten
Date: 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
New Revision: 70117
URL: http://svn.boost.org/trac/boost/changeset/70117

Log:
documentation
Text files modified:
   sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/getting_started.qbk | 4
   sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/concepts.html | 275 ++++++++++++++++++---------------------
   sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/extend_odeint.html | 4
   sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/getting_started.html | 88 +++++++++++-
   sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/reference.html | 6
   sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/tutorial.html | 42 ++++-
   sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/index.html | 8
   sandbox/odeint/branches/karsten/libs/numeric/odeint/examples/harmonic_oscillator.cpp | 35 ++++
   8 files changed, 277 insertions(+), 185 deletions(-)

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/getting_started.qbk
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/getting_started.qbk (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/getting_started.qbk 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -48,6 +48,10 @@

The integrate function expects as parameters the rhs of the ode as defined above, the initial state x, the start-and end-time of the integration as well as the initial time step. Note, that [funcref boost::numeric::odeint::integrate integrate] uses an adaptive stepsize during the integration steps so the time points will not be equally spaced. The integration returns the number of steps that were applied.

+[integrate_observer]
+
+[integrate_observ]
+
It is, of course, also possible to implement the ode system as a class. The rhs must then be implemented as a functor having defined the ()-operator:

[rhs_class]

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/concepts.html
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/concepts.html (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/concepts.html 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -13,7 +13,7 @@
<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="extend_odeint.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="extend_odeint.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -59,8 +59,12 @@
</colgroup>
<thead><tr>
<th>
+ 
+ 
 </th>
<th>
+ 
+ 
 </th>
<th>
 
@@ -145,25 +149,23 @@
 
<div class="itemizedlist"><ul type="disc">
<li>
- <code class="computeroutput">Stepper()</code>
- Constructor.
- </li>
-<li>
- <code class="computeroutput">Stepper(
- container_type &x )</code>
- Constructor that allocates internal memory to store intermediate results
- of the same size as <code class="computeroutput">x</code>.
- </li>
-<li>
- <code class="computeroutput">void do_step( DynamicalSystem
- &system
- , container_type
- &x
- , time_type
- t ,
- time_type dt
- )</code>
- </li>
+<code class="computeroutput">Stepper()</code>
+ Constructor.
+ </li>
+<li>
+<code class="computeroutput">Stepper(
+ container_type &x )</code> Constructor
+ that allocates internal memory to store intermediate results of the same
+ size as <code class="computeroutput">x</code>.
+ </li>
+<li><code class="computeroutput">void do_step( DynamicalSystem
+ &system
+ , container_type
+ &x
+ , time_type
+ t ,
+ time_type dt
+ )</code></li>
</ul></div>

 Executes one timestep with the given parameters:
@@ -266,16 +268,14 @@
 The result of this method is the (approximate) state of the system x(t+dt) and is stored in the variable <code class="computeroutput">x</code> (in-place). Note, that the time <code class="computeroutput">t</code> is not automatically increased by this
 method.
 
-<div class="itemizedlist"><ul type="disc"><li>
- <code class="computeroutput">void do_step( DynamicalSystem
- &system
- , container_type
- &x
- , const
- container_type &dxdt , time_type t
- , time_type
- dt )</code>
- </li></ul></div>
+<div class="itemizedlist"><ul type="disc"><li><code class="computeroutput">void do_step( DynamicalSystem
+ &system
+ , container_type
+ &x
+ , const
+ container_type &dxdt , time_type t
+ , time_type
+ dt )</code></li></ul></div>

 The same as above but with the additional parameter <code class="computeroutput">dxdt</code>
 that represents the derivative x'(t) = f(x,t)
@@ -283,33 +283,26 @@
 
<div class="itemizedlist"><ul type="disc">
<li>
- <code class="computeroutput">void adjust_size( const container_type &x )</code>
- Adjusts the internal memory to store intermediate results of the same
- size as <code class="computeroutput">x</code>. This function
- must be called whenever the system size changes
- during the integration.
- </li>
-<li>
- <code class="computeroutput">order_type order_step()</code> Returns the order of the algorithm.
- If n is the order of a method, then
- the result of one iteration with the timestep dt
- is accurate up to dt^n. That means the
- error made by the time discretization is of order dt^(n+1).
- </li>
+<code class="computeroutput">void adjust_size( const container_type &x )</code> Adjusts
+ the internal memory to store intermediate results of the same size as
+ <code class="computeroutput">x</code>. This function must
+ be called whenever the system size changes during the integration.
+ </li>
+<li>
+<code class="computeroutput">order_type order_step()</code> Returns the order of the algorithm. If
+ n is the order of a method, then the result
+ of one iteration with the timestep dt
+ is accurate up to dt^n. That means the
+ error made by the time discretization is of order dt^(n+1).
+ </li>
</ul></div>

 Stepper that model this concept
 
<div class="itemizedlist"><ul type="disc">
-<li>
- <code class="computeroutput">stepper_euler</code>
- </li>
-<li>
- <code class="computeroutput">stepper_rk4</code>
- </li>
-<li>
- <code class="computeroutput">stepper_rk78_fehlberg</code>
- </li>
+<li><code class="computeroutput">stepper_euler</code></li>
+<li><code class="computeroutput">stepper_rk4</code></li>
+<li><code class="computeroutput">stepper_rk78_fehlberg</code></li>
</ul></div>
</div>
<div class="section" lang="en">
@@ -339,26 +332,24 @@
 
<div class="itemizedlist"><ul type="disc">
<li>
- <code class="computeroutput">Error_Stepper()</code>
- Constructor.
- </li>
-<li>
- <code class="computeroutput">Error_Stepper(
- container_type &x )</code>
- Constructor that allocates internal memory to store intermediate results
- of the same size as <code class="computeroutput">x</code>.
- </li>
-<li>
- <code class="computeroutput">void do_step( DynamicalSystem
- &system
- , container_type
- &x
- , time_type
- t ,
- time_type dt
- , container_type
- &xerr)</code>
- </li>
+<code class="computeroutput">Error_Stepper()</code>
+ Constructor.
+ </li>
+<li>
+<code class="computeroutput">Error_Stepper(
+ container_type &x )</code> Constructor
+ that allocates internal memory to store intermediate results of the same
+ size as <code class="computeroutput">x</code>.
+ </li>
+<li><code class="computeroutput">void do_step( DynamicalSystem
+ &system
+ , container_type
+ &x
+ , time_type
+ t ,
+ time_type dt
+ , container_type
+ &xerr)</code></li>
</ul></div>

 Executes one timestep with the given parameters:
@@ -480,17 +471,15 @@
 Note, that the time <code class="computeroutput">t</code> is
 not automatically increased by this method.
 
-<div class="itemizedlist"><ul type="disc"><li>
- <code class="computeroutput">void do_step( DynamicalSystem
- &system
- , container_type
- &x
- , const
- container_type &dxdt , time_type t
- , time_type
- dt ,
- container_type &xerr)</code>
- </li></ul></div>
+<div class="itemizedlist"><ul type="disc"><li><code class="computeroutput">void do_step( DynamicalSystem
+ &system
+ , container_type
+ &x
+ , const
+ container_type &dxdt , time_type t
+ , time_type
+ dt ,
+ container_type &xerr)</code></li></ul></div>

 The same as above but with the additional parameter <code class="computeroutput">dxdt</code>
 that represents the derivative x'(t) = f(x,t)
@@ -498,33 +487,26 @@
 
<div class="itemizedlist"><ul type="disc">
<li>
- <code class="computeroutput">void adjust_size( const container_type &x )</code>
- Adjusts the internal memory to store intermediate results of the same
- size as <code class="computeroutput">x</code>. This function
- must be called whenever the system size changes
- during the integration.
- </li>
-<li>
- <code class="computeroutput">order_type order_error_step()</code> Returns the order of the result x(t+dt) of the algorithm.
- </li>
-<li>
- <code class="computeroutput">order_type order_error()</code> Returns the order of the error estimation
- of the algorithm.
- </li>
+<code class="computeroutput">void adjust_size( const container_type &x )</code> Adjusts
+ the internal memory to store intermediate results of the same size as
+ <code class="computeroutput">x</code>. This function must
+ be called whenever the system size changes during the integration.
+ </li>
+<li>
+<code class="computeroutput">order_type order_error_step()</code> Returns the order of the result x(t+dt) of the algorithm.
+ </li>
+<li>
+<code class="computeroutput">order_type order_error()</code> Returns the order of the error estimation
+ of the algorithm.
+ </li>
</ul></div>

 Stepper that model this concept
 
<div class="itemizedlist"><ul type="disc">
-<li>
- <code class="computeroutput">stepper_rk5_ck</code>
- </li>
-<li>
- <code class="computeroutput">stepper_rk78_fehlberg</code>
- </li>
-<li>
- <code class="computeroutput">stepper_half_step</code>
- </li>
+<li><code class="computeroutput">stepper_rk5_ck</code></li>
+<li><code class="computeroutput">stepper_rk78_fehlberg</code></li>
+<li><code class="computeroutput">stepper_half_step</code></li>
</ul></div>
</div>
<div class="section" lang="en">
@@ -547,13 +529,11 @@

 Methods
 
-<div class="itemizedlist"><ul type="disc"><li>
- <code class="computeroutput">Controlled_Stepper(
- time_type abs_err, time_type
- rel_err,
- time_type factor_x, time_type
- factor_dxdt )</code>
- </li></ul></div>
+<div class="itemizedlist"><ul type="disc"><li><code class="computeroutput">Controlled_Stepper(
+ time_type abs_err, time_type
+ rel_err,
+ time_type factor_x, time_type
+ factor_dxdt )</code></li></ul></div>

 Constructor that initializes the controlled stepper with several parameters
 of the error control. The controlled stepper assures that the error done
@@ -574,18 +554,20 @@
 
<div class="itemizedlist"><ul type="disc">
<li>
- <code class="computeroutput">Controlled_Stepper(
- container_type &x, time_type abs_err, time_type
- rel_err,
- time_type factor_x, time_type
- factor_dxdt )</code>
- Same as above, but with additional allocation of the internal memory
- to store intermediate results of the same size as <code class="computeroutput">x</code>.
- </li>
-<li>
- <code class="computeroutput">controlled_step_result try_step(
- DynamicalSystem &system, container_type &x, time_type &t, time_type &dt )</code>
- </li>
+<code class="computeroutput">Controlled_Stepper(
+ container_type &x, time_type
+ abs_err,
+ time_type rel_err, time_type
+ factor_x,
+ time_type factor_dxdt
+ )</code> Same as above, but with additional
+ allocation of the internal memory to store intermediate results of the
+ same size as <code class="computeroutput">x</code>.
+ </li>
+<li><code class="computeroutput">controlled_step_result try_step( DynamicalSystem &system, container_type &x, time_type
+ &t, time_type
+ &dt
+ )</code></li>
</ul></div>

 Tries one timestep with the given parameters
@@ -700,37 +682,30 @@
 
<div class="itemizedlist"><ul type="disc">
<li>
- <code class="computeroutput">controlled_step_result try_step(
- DynamicalSystem &system, container_type &x, const container_type
- &dxdt, time_type
- &t, time_type
- &dt
- )</code> Same as above but with the additional
- parameter <code class="computeroutput">dxdt</code> that that
- represents the derivative x'(t) = f(x,t)
- at the time t.
- </li>
-<li>
- <code class="computeroutput">void adjust_size( const container_type &x )</code>
- Adjusts the internal memory to store intermediate results of the same
- size as <code class="computeroutput">x</code>. This function
- must be called whenever the system size changes
- during the integration.
- </li>
+<code class="computeroutput">controlled_step_result try_step( DynamicalSystem &system, container_type &x, const
+ container_type &dxdt, time_type &t, time_type
+ &dt
+ )</code> Same as above but with the additional
+ parameter <code class="computeroutput">dxdt</code> that that
+ represents the derivative x'(t) = f(x,t)
+ at the time t.
+ </li>
+<li>
+<code class="computeroutput">void adjust_size( const container_type &x )</code> Adjusts
+ the internal memory to store intermediate results of the same size as
+ <code class="computeroutput">x</code>. This function must
+ be called whenever the system size changes during the integration.
+ </li>
<li>
- <code class="computeroutput">order_type order_error_step()</code> Returns the order of the result x(t+dt) of the algorithm.
- </li>
+<code class="computeroutput">order_type order_error_step()</code> Returns the order of the result x(t+dt) of the algorithm.
+ </li>
</ul></div>

 Stepper that model this concept
 
<div class="itemizedlist"><ul type="disc">
-<li>
- <code class="computeroutput">controlled_stepper_standard</code>
- </li>
-<li>
- <code class="computeroutput">controlled_stepper_bs</code>
- </li>
+<li><code class="computeroutput">controlled_stepper_standard</code></li>
+<li><code class="computeroutput">controlled_stepper_bs</code></li>
</ul></div>
</div>
<div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title">
@@ -758,7 +733,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="extend_odeint.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="extend_odeint.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/extend_odeint.html
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/extend_odeint.html (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/extend_odeint.html 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -13,7 +13,7 @@
<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="tutorial.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="concepts.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="tutorial.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -60,7 +60,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="tutorial.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="concepts.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="tutorial.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="concepts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/getting_started.html
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/getting_started.html (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/getting_started.html 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -13,7 +13,7 @@
<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -48,7 +48,7 @@
 as illustrative example. In odeint, the following algorithms are implemented:
 
<div class="table">
-<a name="id518202"></a>Table 1.1. Stepper Algorithms
+<a name="id326495"></a>Table 1.1. Stepper Algorithms
<div class="table-contents"><table class="table" summary="Stepper Algorithms">
<colgroup>
<col>
@@ -331,7 +331,9 @@
 hand side of the equation w' = f(w) where in this case w = (x,p):
 

-
+ 
+
+

<pre class="programlisting">/* The type of container used to hold the state vector */
typedef std::vector< double > state_type;
@@ -346,6 +348,8 @@
}
</pre>

+ 
+
 

 Here we chose <code class="computeroutput">vector<double></code>
@@ -361,13 +365,17 @@
 start:
 

-
+ 
+
+

<pre class="programlisting">state_type x(2);
x[0] = 1.0; // start at x=1.0, p=0.0
x[1] = 0.0;
</pre>

+ 
+
 

 For the integration itself we'll use the <code class="computeroutput">integrate</code>
@@ -376,16 +384,17 @@
 stepper (5th order) and uses adaptive stepsize.
 

-
+ 
+
+

-<pre class="programlisting">vector<double> times;
-vector<state_type> x_t_vec;
-
-size_t steps = integrate( harmonic_oscillator ,
+<pre class="programlisting">size_t steps = integrate( harmonic_oscillator ,
 x , 0.0 , 10.0 , 0.1
 );
</pre>

+ 
+
 

 The integrate function expects as parameters the rhs of the ode as defined
@@ -396,11 +405,60 @@
 were applied.
 

+ 
+
+
+
+<pre class="programlisting">struct push_back_state_and_time
+{
+ vector< state_type >& m_states;
+ vector< double >& m_time;
+
+ push_back_state_and_time( vector< state_type > &states , vector< double > &times )
+ : m_states( states ) , m_times( times ) { }
+
+ void operator()( const state_type &x , double t )
+ {
+ m_states.push_back( x );
+ m_times.push_back( t );
+ }
+};
+</pre>
+
+ 
+
+ 
+
+ 
+
+
+
+<pre class="programlisting">vector<state_type> x_vec;
+vector<double> times;
+
+size_t steps = integrate( harmonic_oscillator ,
+ x , 0.0 , 10.0 , 0.1 ,
+ push_back_state_and_time( x_vec , times )
+ );
+
+// output
+for( size_t i=0; i<=steps; i++ )
+{
+ cout << times[i] << '\t' << x_t_vec[i][0] << '\t' << x_t_vec[i][1] << '\n';
+}
+</pre>
+
+ 
+
+ 
+
 It is, of course, also possible to implement the ode system as a class. The
 rhs must then be implemented as a functor having defined the ()-operator:
 

-
+ 
+
+

<pre class="programlisting">class harm_osc {

@@ -417,12 +475,16 @@
};
</pre>

+ 
+
 

 which can be used via
 

-
+ 
+
+

<pre class="programlisting">harm_osc ho(0.15);
steps = integrate( ho ,
@@ -430,6 +492,8 @@
 );
</pre>

+ 
+
 
</div>
</div>
@@ -443,7 +507,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="../index.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="../index.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="tutorial.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/reference.html
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/reference.html (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/reference.html 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -12,7 +12,7 @@
<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="concepts.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
+<a accesskey="p" href="concepts.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a>
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -33,7 +33,7 @@
classes</a>
</h3></div></div></div>
<div class="table">
-<a name="id565007"></a>Table 1.3. Stepper Algorithms
+<a name="id374081"></a>Table 1.3. Stepper Algorithms
<div class="table-contents"><table class="table" summary="Stepper Algorithms">
<colgroup>
<col>
@@ -241,7 +241,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="concepts.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a>
+<a accesskey="p" href="concepts.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a>
</div>
</body>
</html>

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/tutorial.html
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/tutorial.html (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/boost_sandbox_numeric_odeint/tutorial.html 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -13,7 +13,7 @@
<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="getting_started.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="extend_odeint.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="getting_started.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="extend_odeint.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" lang="en">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -75,7 +75,9 @@
 to just define a function, e.g:
 

-
+ 
+
+

<pre class="programlisting">/* The type of container used to hold the state vector */
typedef std::vector< double > state_type;
@@ -90,6 +92,8 @@
}
</pre>

+ 
+
 

 The parameters of the function must follow the example above where x is the current state, dxdt
@@ -103,7 +107,9 @@
 parameter structure as above:
 

-
+ 
+
+

<pre class="programlisting">class harm_osc {

@@ -120,6 +126,8 @@
};
</pre>

+ 
+
 

 odeint can deal with instances of such classes instead of pure functions
@@ -143,7 +151,7 @@
 choose:
 
<div class="table">
-<a name="id560646"></a>Table 1.2. Stepper Algorithms
+<a name="id369858"></a>Table 1.2. Stepper Algorithms
<div class="table-contents"><table class="table" summary="Stepper Algorithms">
<colgroup>
<col>
@@ -406,12 +414,16 @@
 )</code> function from odeint:
 

-
+ 
+
+

<pre class="programlisting">explicit_rk4< state_type > stepper;
integrate_const( stepper , harmonic_oscillator , x , 0.0 , 10.0 , 0.01 );
</pre>

+ 
+
 

 This call integrates the system defined by <code class="computeroutput">harmonic_oscillator</code>
@@ -422,13 +434,17 @@
 method which can used directly. So, you write down the above example as
 

-
+ 
+
+

<pre class="programlisting">const double dt = 0.01;
for( double t=0.0 ; t<10.0 ; t+= dt )
 stepper.do_step( harmonic_oscillator , x , t , dt );
</pre>

+ 
+
 
</div>
<div class="section" lang="en">
@@ -446,12 +462,16 @@
 4th order error estimation and coefficients introduced by Cash-Karp.
 

-
+ 
+
+

<pre class="programlisting">typedef explicit_error_rk54_ck< state_type > error_stepper_type;
error_stepper_type rk54;
</pre>

+ 
+
 

 Given the error stepper, one still needs an instance that checks the error
@@ -475,13 +495,17 @@
 stepper create by <code class="computeroutput">make_controlled_stepper_standard</code>.
 

-
+ 
+
+

<pre class="programlisting">typedef controlled_error_stepper< error_stepper_type > controlled_stepper_type;
controlled_stepper_type controlled_stepper;
integrate_adaptive( controlled_stepper , harmonic_oscillator , x , 0.0 , 10.0 , 0.01 );
</pre>

+ 
+
 

 As above, this integrates the system defined by <code class="computeroutput">harmonic_oscillator</code>
@@ -844,7 +868,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="getting_started.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="extend_odeint.html"><img src="../images/next.png" alt="Next"></a>
+<a accesskey="p" href="getting_started.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="extend_odeint.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/index.html
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/index.html (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/doc/html/index.html 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -10,7 +10,7 @@
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
<hr>
-<div class="spirit-nav"><a accesskey="n" href="boost_sandbox_numeric_odeint/getting_started.html"><img src="images/next.png" alt="Next"></a></div>
+<div class="spirit-nav"><a accesskey="n" href="boost_sandbox_numeric_odeint/getting_started.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
<div class="chapter" lang="en">
<div class="titlepage"><div>
<div><h2 class="title">
@@ -23,7 +23,7 @@
</h3></div></div>
<div>Copyright © 2009 -2011 Karsten Ahnert and Mario Mulansky</div>
<div><div class="legalnotice">
-<a name="id549573"></a>
+<a name="id358081"></a>
 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)
 
@@ -93,10 +93,10 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: March 17, 2011 at 19:18:46 GMT</td>
+<td align="left">Last revised: March 18, 2011 at 09:58:43 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
-<div class="spirit-nav"><a accesskey="n" href="boost_sandbox_numeric_odeint/getting_started.html"><img src="images/next.png" alt="Next"></a></div>
+<div class="spirit-nav"><a accesskey="n" href="boost_sandbox_numeric_odeint/getting_started.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
</body>
</html>

Modified: sandbox/odeint/branches/karsten/libs/numeric/odeint/examples/harmonic_oscillator.cpp
==============================================================================
--- sandbox/odeint/branches/karsten/libs/numeric/odeint/examples/harmonic_oscillator.cpp (original)
+++ sandbox/odeint/branches/karsten/libs/numeric/odeint/examples/harmonic_oscillator.cpp 2011-03-18 06:23:49 EDT (Fri, 18 Mar 2011)
@@ -32,6 +32,25 @@
};
//]

+
+//[ integrate_observer
+struct push_back_state_and_time
+{
+ vector< state_type >& m_states;
+ vector< double >& m_time;
+
+ push_back_state_and_time( vector< state_type > &states , vector< double > &times )
+ : m_states( states ) , m_times( times ) { }
+
+ void operator()( const state_type &x , double t )
+ {
+ m_states.push_back( x );
+ m_times.push_back( t );
+ }
+};
+//]
+
+
int main(int argc, char **argv)
{
 using namespace std;
@@ -45,17 +64,23 @@

 //[ integration
- vector<double> times;
- vector<state_type> x_t_vec;
-
 size_t steps = integrate( harmonic_oscillator ,
 x , 0.0 , 10.0 , 0.1
 );
 //]

+ //[ integrate_observ
+ vector<state_type> x_vec;
+ vector<double> times;
+
+ size_t steps = integrate( harmonic_oscillator ,
+ x , 0.0 , 10.0 , 0.1 ,
+ push_back_state_and_time( x_vec , times )
+ );

- //[ output
- for( size_t i=0; i<=steps; i++ ) { //initial state is 0th entry
+ // output
+ for( size_t i=0; i<=steps; i++ )
+ {
 cout << times[i] << '\t' << x_t_vec[i][0] << '\t' << x_t_vec[i][1] << '\n';
 }
 //]

Next message: barend.gehrels_at_[hidden]: "[Boost-commit] svn:boost r70118 - trunk/libs/geometry/example"
Previous message: erwann.rogard_at_[hidden]: "[Boost-commit] svn:boost r70116 - sandbox/assign_v2/boost/assign/v2/detail/traits/type"

Date view	Thread view	Subject view	Author view

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