core, editoast: return conflict requirements #8758
Merged
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
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
from
9193c19 to
bb6ee07
Compare
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
from
bb6ee07 to
c8b9439
Compare
woshilapin
approved these changes
Sep 5, 2024
flomonster
approved these changes
Sep 5, 2024
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionResponse.kt
Outdated
Show resolved
Hide resolved
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
eckter
reviewed
Sep 6, 2024
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionResponse.kt
Outdated
Show resolved
Hide resolved
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
from
c8b9439 to
0e32823
Compare
Erashin
reviewed
Sep 10, 2024
core/src/main/java/fr/sncf/osrd/api/ConflictDetectionEndpoint.java
Outdated
Show resolved
Hide resolved
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
2 times, most recently
from
a8228b7 to
5208c44
Compare
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
2 times, most recently
from
095b8a3 to
9f42af5
Compare
|
Is this the kind of test that you had in mind? I just kind of abused the first test here, but could easily move it to another test (maybe one with multiple conflicts? which one? I also wouldn't want to hardcode tons of expected output fields...). |
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
from
9f42af5 to
d941c58
Compare
Erashin
approved these changes
Sep 17, 2024
core/src/test/java/fr/sncf/osrd/standalone_sim/ConflictDetectionTest.java
Outdated
Show resolved
Hide resolved
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
from
d941c58 to
018d1fa
Compare
Closes: #8680 Signed-off-by: Simon Ser <[email protected]>
emersion
force-pushed
the
emr/core-return-conflict-reqs
branch
from
018d1fa to
97091e0
Compare
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.
Closes: #8680
There are two TODOs left which are open questions for reviewers.