[AERIE-2141] Add during expression by updating ForEach and Spans #402
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
adrienmaillard
changed the title
JoelCourtney
requested changes
Oct 24, 2022
There was a problem hiding this comment.
thanks! I have one major concern that I should have seen coming. I think we need to reverse how spans translate to violations. Otherwise we lose the activity metadata in the invert() call associated with specific spans. I saw in your implementation that you keep the IDs around and then associate all the violations with all of the IDs, which is better than nothing, but definitely a regression from Constraint.ForEachActivity. I messaged you on Slack because its probably easier to discuss this over huddle
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/time/Spans.java
Outdated
Show resolved
Hide resolved
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/time/Spans.java
Outdated
Show resolved
Hide resolved
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ActivityWindow.java
Outdated
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-ast.ts
Outdated
Show resolved
Hide resolved
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/time/Spans.java
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
adrienmaillard
force-pushed
the
feature/AERIE-2142-during-type-constraint
branch
from
b15a309 to
7939fae
Compare
adrienmaillard
force-pushed
the
feature/AERIE-2142-during-type-constraint
branch
from
7939fae to
70e99b6
Compare
mattdailis
reviewed
Oct 27, 2022
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/WindowsFromSpans.java
Outdated
Show resolved
Hide resolved
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/time/Spans.java
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
mattdailis
added
the
breaking change
mattdailis
reviewed
Oct 28, 2022
constraints/src/test/java/gov/nasa/jpl/aerie/constraints/tree/ASTTests.java
Show resolved
Hide resolved
adrienmaillard
force-pushed
the
feature/AERIE-2142-during-type-constraint
branch
2 times, most recently
from
bc5316f to
798fce4
Compare
1 task
JoelCourtney
reviewed
Nov 1, 2022
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/json/ConstraintParsers.java
Outdated
Show resolved
Hide resolved
JoelCourtney
reviewed
Nov 1, 2022
constraints/src/main/java/gov/nasa/jpl/aerie/constraints/tree/ViolationsOfSpans.java
Outdated
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/constraints-edsl-fluent-api.ts
Outdated
Show resolved
Hide resolved
merlin-server/constraints-dsl-compiler/src/libs/mission-model-generated-code.ts
Outdated
Show resolved
Hide resolved
adrienmaillard
force-pushed
the
feature/AERIE-2142-during-type-constraint
branch
from
798fce4 to
83f7ced
Compare
JoelCourtney
approved these changes
Nov 2, 2022
merlin-server/constraints-dsl-compiler/src/libs/mission-model-generated-code.ts
Outdated
Show resolved
Hide resolved
mattdailis
approved these changes
Nov 2, 2022
There was a problem hiding this comment.
Great work - I have one request (can be before or after merging): could you update the PR description to reflect the decisions made, separating the changes that are being merged from the ones that are now "future work"?
I forget why I added the breaking change label - if you don't think there are any breaking changes, we can remove that label.
adrienmaillard
force-pushed
the
feature/AERIE-2142-during-type-constraint
branch
from
83f7ced to
5d2ab8e
Compare
adrienmaillard
removed
the
breaking change
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
I have followed what was proposed by @JoelCourtney
Spans.ForEachActivityfunction/AST node has been added in the eDSL that allows the lambda to return aSpansobjectwindow(),start()andend()methods inActivityInstancein eDSL have been updated to returnSpanswith activity id metadataViolationsOfis nowViolationsOfWindows.Finally, the
Windows.During(ActivityTypes[]): Windowswas added to the constraints eDSL.Verification
Many tests were updated.
Documentation
Future work
The mutex global scheduling condition (AERIE-2142) in #410.