[AERIE-1930] Include awaiting execution state activity tasks in results #367
+115
−0
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
pcrosemurgy
reviewed
Oct 11, 2022
merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java
Show resolved
Hide resolved
pcrosemurgy
approved these changes
Oct 11, 2022
patkenneally
force-pushed
the
bug/AERIE-1930--include-awaiting-children-in-results
branch
from
faeb159 to
2d6b0e5
Compare
patkenneally
force-pushed
the
bug/AERIE-1930--include-awaiting-children-in-results
branch
from
2d6b0e5 to
45f8308
Compare
mattdailis
approved these changes
Oct 11, 2022
patkenneally
deleted the
bug/AERIE-1930--include-awaiting-children-in-results
branch
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.
Description
ComputeResults incorrectly assumes that tasks are either in the Terminated or InProgress state. There is a third state, AwaitingChildren, which is like "Unfinished" in that it doesn't have an end time, but it's like "Finished" in that it has computed attributes. The check for Task state is extended to catch this third state so that all activities are included in simulation results.
Verification
Added a test which simulates a small plan which has been constructed such that there will always be a parent activity awaiting a child. A new activity type, which decomposes using spawn, is added to Banananation for this purpose.
Documentation
No changes or additions needed
Future work
None