Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: use infra explorer in pathfinding endpoint #9153

Merged
merged 5 commits into from
Oct 17, 2024

Conversation

Erashin
Copy link
Contributor

@Erashin Erashin commented Oct 2, 2024

Fixes #6784.

Use infra explorer in pathfinding endpoint. This makes us explore the graph using both blocks and routes, ensuring that if we do find a block path, the corresponding routes exist.

As intended, corrects https://github.com/osrd-project/osrd-confidential/issues/333, a path is found between Metz and Nancy:
image

Benchmark run on same infra: results are slightly better (up by 0.3% for a payload insaaannee), and basically we're getting less repeated_tracks errors (instead the path is just not found):
image

@codecov-commenter
Copy link

codecov-commenter commented Oct 2, 2024

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 83.47107% with 40 lines in your changes missing coverage. Please review.

Project coverage is 39.34%. Comparing base (9a28069) to head (8bf1411).
Report is 13 commits behind head on dev.

Files with missing lines Patch % Lines
...thfinding/IncompatibleConstraintsPostProcessing.kt 87.50% 3 Missing and 7 partials ⚠️
.../osrd/api/pathfinding/PathfindingBlocksEndpoint.kt 57.14% 7 Missing and 2 partials ⚠️
.../api_v2/pathfinding/PathfindingBlocksEndpointV2.kt 92.18% 3 Missing and 2 partials ⚠️
...rc/main/kotlin/fr/sncf/osrd/utils/AppendOnlyMap.kt 69.23% 2 Missing and 2 partials ⚠️
.../src/main/kotlin/fr/sncf/osrd/utils/BloomFilter.kt 71.42% 0 Missing and 4 partials ⚠️
...main/kotlin/fr/sncf/osrd/graph/PathfindingGraph.kt 85.00% 3 Missing ⚠️
...sncf/osrd/stdcm/infra_exploration/InfraExplorer.kt 75.00% 1 Missing and 2 partials ⚠️
.../kotlin/fr/sncf/osrd/utils/AppendOnlyLinkedList.kt 60.00% 1 Missing and 1 partial ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff              @@
##                dev    #9153      +/-   ##
============================================
+ Coverage     39.31%   39.34%   +0.02%     
- Complexity     2245     2267      +22     
============================================
  Files          1293     1297       +4     
  Lines         97666    97770     +104     
  Branches       3280     3297      +17     
============================================
+ Hits          38398    38468      +70     
- Misses        57329    57354      +25     
- Partials       1939     1948       +9     
Flag Coverage Δ
core 74.98% <83.47%> (+0.04%) ⬆️
editoast 72.59% <ø> (-0.06%) ⬇️
front 10.37% <ø> (ø)
gateway 2.50% <ø> (ø)
osrdyne 3.52% <ø> (ø)
railjson_generator 87.49% <ø> (ø)
tests 86.71% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Erashin Erashin force-pushed the alch/use-infra_explorer-pathfinding branch 4 times, most recently from 8085592 to 9f9132c Compare October 2, 2024 15:31
@Erashin Erashin force-pushed the alch/use-infra_explorer-pathfinding branch 5 times, most recently from 8627816 to 492a92e Compare October 3, 2024 15:07
@Erashin Erashin force-pushed the alch/use-infra_explorer-pathfinding branch from 492a92e to 932836d Compare October 4, 2024 19:35
@Erashin Erashin force-pushed the alch/use-infra_explorer-pathfinding branch 2 times, most recently from 4253b18 to 2eb3dab Compare October 9, 2024 07:24
@Erashin Erashin marked this pull request as ready for review October 9, 2024 07:24
@Erashin Erashin requested a review from a team as a code owner October 9, 2024 07:24
@Erashin Erashin requested a review from eckter October 9, 2024 07:24
@Erashin Erashin force-pushed the alch/use-infra_explorer-pathfinding branch 7 times, most recently from aec165e to 7bd8551 Compare October 15, 2024 14:53
Signed-off-by: Erashin <alwenn.charpentier@gmail.com>
…art location

Signed-off-by: Erashin <alwenn.charpentier@gmail.com>
…d location

Signed-off-by: Erashin <alwenn.charpentier@gmail.com>
Signed-off-by: Eloi Charpentier <eloi.charpentier.42@gmail.com>
@Erashin Erashin force-pushed the alch/use-infra_explorer-pathfinding branch from fd943b2 to 5fa6d18 Compare October 17, 2024 09:11
Signed-off-by: Eloi Charpentier <eloi.charpentier.42@gmail.com>
@Erashin Erashin force-pushed the alch/use-infra_explorer-pathfinding branch from 5fa6d18 to 8bf1411 Compare October 17, 2024 09:12
@Erashin Erashin added this pull request to the merge queue Oct 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 17, 2024
@Erashin Erashin added this pull request to the merge queue Oct 17, 2024
Merged via the queue into dev with commit e38c591 Oct 17, 2024
24 checks passed
@Erashin Erashin deleted the alch/use-infra_explorer-pathfinding branch October 17, 2024 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

core: refacto: use InfraExplorer in the block pathfinding
3 participants