Skip to content

Commit

Permalink
call resetSettings in base class for all derived solvers, fix #191
Browse files Browse the repository at this point in the history
  • Loading branch information
0u812 committed Sep 2, 2015
1 parent 3b234d9 commit d60e7b0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
4 changes: 1 addition & 3 deletions source/EulerIntegrator.h
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,7 @@ namespace rr
*/
void resetSettings()
{
settings.clear();
hints.clear();
descriptions.clear();
Solver::resetSettings();

// Euler integrator has no settings
}
Expand Down
4 changes: 1 addition & 3 deletions source/GillespieIntegrator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,7 @@ namespace rr

void GillespieIntegrator::resetSettings()
{
settings.clear();
hints.clear();
descriptions.clear();
Solver::resetSettings();

// Set default integrator settings.
addSetting("seed", defaultSeed(), "Set the seed into the random engine. (ulong)", "(ulong) Set the seed into the random engine.");
Expand Down
4 changes: 1 addition & 3 deletions source/NLEQSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ void NLEQSolver::loadConfigSettings()

void NLEQSolver::resetSettings()
{
settings.clear();
hints.clear();
descriptions.clear();
Solver::resetSettings();

// Set default settings.
addSetting("maximum_iterations", 100, "The maximum number of iterations the solver is allowed to use (int)", "(int) Iteration caps off at the maximum, regardless of whether a solution has been reached");
Expand Down
4 changes: 1 addition & 3 deletions source/RK4Integrator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,7 @@ namespace rr

void RK4Integrator::resetSettings()
{
settings.clear();
hints.clear();
descriptions.clear();
Solver::resetSettings();
}

// void RK4Integrator::setItem(const std::string& key,
Expand Down

0 comments on commit d60e7b0

Please sign in to comment.