From 6fb768e3f3cb60c03f3e4383547e00a28ec58d3c Mon Sep 17 00:00:00 2001
From: mariomulansky <mario.mulansky@gmx.net>
Date: Sun, 3 Nov 2013 19:42:14 +0100
Subject: [PATCH] fixes #109 by adding explicit conversions from multiprecision
 expression templates to numbers

---
 .../odeint/integrate/detail/integrate_adaptive.hpp     |  2 +-
 .../odeint/integrate/detail/integrate_const.hpp        | 10 +++++-----
 .../odeint/integrate/detail/integrate_n_steps.hpp      | 10 +++++-----
 libs/numeric/odeint/examples/Jamfile.v2                |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp b/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp
index ebbe9e90..edc40ab1 100644
--- a/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp
+++ b/boost/numeric/odeint/integrate/detail/integrate_adaptive.hpp
@@ -130,7 +130,7 @@ size_t integrate_adaptive(
 
     while( less_with_sign( st.current_time() , end_time , st.current_time_step() ) )
     {
-        while( less_eq_with_sign( st.current_time() + st.current_time_step() ,
+        while( less_eq_with_sign( static_cast<Time>(st.current_time() + st.current_time_step()) ,
                end_time ,
                st.current_time_step() ) )
         {   //make sure we don't go beyond the end_time
diff --git a/boost/numeric/odeint/integrate/detail/integrate_const.hpp b/boost/numeric/odeint/integrate/detail/integrate_const.hpp
index 534f60b9..ab2ca289 100644
--- a/boost/numeric/odeint/integrate/detail/integrate_const.hpp
+++ b/boost/numeric/odeint/integrate/detail/integrate_const.hpp
@@ -50,8 +50,8 @@ size_t integrate_const(
     
     Time time = start_time;
     int step = 0;
-    
-    while( less_eq_with_sign( time+dt , end_time , dt ) )
+    // cast time+dt explicitely in case of expression templates (e.g. multiprecision)
+    while( less_eq_with_sign( static_cast<Time>(time+dt) , end_time , dt ) )
     {
         obs( start_state , time );
         st.do_step( system , start_state , time , dt );
@@ -80,7 +80,7 @@ size_t integrate_const(
     const Time time_step = dt;
     int step = 0;
     
-    while( less_eq_with_sign( time+time_step , end_time , dt ) )
+    while( less_eq_with_sign( static_cast<Time>(time+time_step) , end_time , dt ) )
     {
         obs( start_state , time );
         detail::integrate_adaptive( stepper , system , start_state , time , time+time_step , dt ,
@@ -115,7 +115,7 @@ size_t integrate_const(
     int obs_step( 1 );
     int real_step( 0 );
     
-    while( less_with_sign( time+dt , end_time , dt ) )
+    while( less_with_sign( static_cast<Time>(time+dt) , end_time , dt ) )
     {
         while( less_eq_with_sign( time , st.current_time() , dt ) )
         {
@@ -127,7 +127,7 @@ size_t integrate_const(
             time = start_time + static_cast< typename unit_value_type<Time>::type >(obs_step) * dt;
         }
         // we have not reached the end, do another real step
-        if( less_with_sign( st.current_time()+st.current_time_step() ,
+        if( less_with_sign( static_cast<Time>(st.current_time()+st.current_time_step()) ,
                             end_time ,
                             st.current_time_step() ) )
         {
diff --git a/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp b/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp
index 92effdee..6828348e 100644
--- a/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp
+++ b/boost/numeric/odeint/integrate/detail/integrate_n_steps.hpp
@@ -79,7 +79,7 @@ Time integrate_n_steps(
     for( size_t step = 0; step < num_of_steps ; ++step )
     {
         obs( start_state , time );
-        detail::integrate_adaptive( stepper , system , start_state , time , time+time_step , dt ,
+        detail::integrate_adaptive( stepper , system , start_state , time , static_cast<Time>(time+time_step) , dt ,
                 null_observer() , controlled_stepper_tag() );
         // direct computation of the time avoids error propagation happening when using time += dt
         // we need clumsy type analysis to get boost units working here
@@ -121,7 +121,7 @@ Time integrate_n_steps(
         }
 
         // we have not reached the end, do another real step
-        if( less_with_sign( st.current_time()+st.current_time_step() ,
+        if( less_with_sign( static_cast<Time>(st.current_time()+st.current_time_step()) ,
                             end_time ,
                             st.current_time_step() ) )
         {
@@ -129,7 +129,7 @@ Time integrate_n_steps(
         }
         else if( less_with_sign( st.current_time() , end_time , st.current_time_step() ) )
         { // do the last step ending exactly on the end point
-            st.initialize( st.current_state() , st.current_time() , end_time - st.current_time() );
+            st.initialize( st.current_state() , st.current_time() , static_cast<Time>(end_time - st.current_time()) );
             st.do_step( system );
         }
     }
@@ -137,9 +137,9 @@ Time integrate_n_steps(
     while( st.current_time() < end_time )
     {
         if( less_with_sign( end_time ,
-                            st.current_time()+st.current_time_step() ,
+                            static_cast<Time>(st.current_time()+st.current_time_step()) ,
                             st.current_time_step() ) )
-            st.initialize( st.current_state() , st.current_time() , end_time - st.current_time() );
+            st.initialize( st.current_state() , st.current_time() , static_cast<Time>(end_time - st.current_time()) );
         st.do_step( system );
     }
 
diff --git a/libs/numeric/odeint/examples/Jamfile.v2 b/libs/numeric/odeint/examples/Jamfile.v2
index bad21735..14b0390a 100644
--- a/libs/numeric/odeint/examples/Jamfile.v2
+++ b/libs/numeric/odeint/examples/Jamfile.v2
@@ -36,6 +36,7 @@ exe heun : heun.cpp ;
 exe bind_member_functions : bind_member_functions.cpp ;
 exe bind_member_functions_cpp11 : bind_member_functions_cpp11.cpp : <cxxflags>-std=c++0x ;
 
+build-project multiprecision ;
 # build-project mtl ;
 # build-project ublas ;
 # build-project gmpxx ;