Fix cycle checking when calculating min delay from nearest physical action #2459
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
edwardalee
requested changes
Jan 21, 2025
| TimeValue minDelay = TimeValue.MAX_VALUE; | ||
| for (TriggerInstance<? extends Variable> trigger : reaction.triggers) { | ||
| if (trigger.getDefinition() instanceof Action action) { | ||
| ActionInstance actionInstance = (ActionInstance) trigger; | ||
| if (action.getOrigin() == ActionOrigin.PHYSICAL) { | ||
| System.out.println("Physical action: " + action); |
There was a problem hiding this comment.
Suggest deleting this debug output.
Comment on lines
+714
to
+717
| } | ||
| else if (action.getOrigin() == ActionOrigin.LOGICAL) { | ||
| System.out.println("Logical action: " + action); | ||
| System.out.println("Depends on: " + actionInstance.getDependsOnReactions()); |
There was a problem hiding this comment.
Suggested change
| } | |
| else if (action.getOrigin() == ActionOrigin.LOGICAL) { | |
| System.out.println("Logical action: " + action); | |
| System.out.println("Depends on: " + actionInstance.getDependsOnReactions()); | |
| } else if (action.getOrigin() == ActionOrigin.LOGICAL) { |
You could also turn these into debug outputs.
| // Avoid a potentially deep loop by checking the visited set. | ||
| if (!visited.contains(uReaction)) { | ||
| visited.add(uReaction); // Mark the upstream reaction as visited. | ||
| System.out.println("Upstream reaction: " + uReaction); |
There was a problem hiding this comment.
Delete or convert to debug output.
| @@ -713,7 +735,8 @@ public TimeValue findNearestPhysicalActionTrigger(ReactionInstance reaction) { | |||
| // Outputs of contained reactions | |||
| PortInstance outputInstance = (PortInstance) trigger; | |||
| for (ReactionInstance uReaction : outputInstance.getDependsOnReactions()) { | |||
| TimeValue uMinDelay = findNearestPhysicalActionTrigger(uReaction); | |||
| visited.add(uReaction); // Mark the upstream reaction as visited. | |||
There was a problem hiding this comment.
Is this add premature? Won't the recursive call on the next line add it if it isn't there already? And if added here, won't the recursive call actually not do anything?
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.
As the title suggests, currently, when actions for a deep loop, the recursion never terminates and leads to stack overflow. This PR addresses the issue by introducing a
visitedset.