boost/odeint
2
0
Fork 0
mirror of https://github.com/boostorg/odeint.git synced 2026-01-19 04:22:12 +00:00
Code Issues Projects Releases Wiki Activity

consistent counting of failed steps

Browse Source 
the code in integrate_times for a controlled stepper and in the dense out
stepper was inconsistent in terms of when exactly to throw the exception.
See #173 for some discussion on this.
This commit is contained in:
Mario Mulansky
2015-10-05 17:03:08 +02:00
parent 576068fc6b
commit 703350b223
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/numeric/odeint/integrate/detail/integrate_times.hpp
View File

@@ -99,6 +99,8 @@ size_t integrate_times(
if( st.try_step( system , start_state , current_time , current_dt ) == success )
{
++steps;
// successful step -> reset the fail counter, see #173
fail_steps = 0;
// continue with the original step size if dt was reduced due to observation
dt = max_abs( dt , current_dt );
}

2
include/boost/numeric/odeint/stepper/dense_output_runge_kutta.hpp
View File

@@ -329,7 +329,7 @@ public:
res = m_stepper.try_step( system , get_current_state() , get_current_deriv() , m_t ,
get_old_state() , get_old_deriv() , m_dt );
if( count++ == max_count )
BOOST_THROW_EXCEPTION( std::overflow_error( "dense_output_controlled_explicit : too much iterations!") );
BOOST_THROW_EXCEPTION( std::overflow_error( "dense_output_controlled_explicit : too many iterations!") );
}
while( res == fail );
toggle_current_state();