Make sure that Run and Cleanup are called after Prepare #898
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
heplesser
added
ZC: Kernel
heplesser
approved these changes
Mar 7, 2018
apeyser
suggested changes
Mar 8, 2018
| @@ -430,6 +431,7 @@ nest::SimulationManager::prepare() | |||
| * kernel().connection_manager.get_min_delay(); | |||
| kernel().music_manager.enter_runtime( tick ); | |||
| } | |||
| prepared_ = true; | |||
There was a problem hiding this comment.
We should check at the top of the function that ! prepared_ and otherwise throw an exception like in the other checks.
nestkernel/simulation_manager.h
Outdated
| @@ -169,7 +169,8 @@ class SimulationManager : public ManagerInterface | |||
| delay to_step_; //!< update clock_+from_step<=T<clock_+to_step_ | |||
| timeval t_slice_begin_; //!< Wall-clock time at the begin of a time slice | |||
| timeval t_slice_end_; //!< Wall-clock time at the end of time slice | |||
| long t_real_; //!< Accumunated wall-clock time spent simulating (in us) | |||
| long t_real_; //!< Accumulated wall-clock time spent simulating (in us) | |||
| bool prepared_; //!< indicates whether the SimulationManager has already been | |||
There was a problem hiding this comment.
indicates whether the SimulationManager has already been seems to be missing a word or two.
| ResetKernel | ||
| Cleanup | ||
| } fail_or_die | ||
|
|
There was a problem hiding this comment.
And prepare after prepare test.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An error will now be raised if
Run()orCleanup()are called without callingPrepare()first.This fixes #659.