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

Routing conflict detection #4628

Merged
merged 8 commits into from
Aug 22, 2023
Merged

Routing conflict detection #4628

merged 8 commits into from
Aug 22, 2023

Conversation

multun
Copy link
Contributor

@multun multun commented Jul 20, 2023

No description provided.

@multun multun requested a review from a team as a code owner July 20, 2023 12:22
@multun multun marked this pull request as draft July 20, 2023 12:22
@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #4628 (00ce5bb) into dev (2626967) will increase coverage by 0.70%.
Report is 9 commits behind head on dev.
The diff coverage is 90.39%.

@@             Coverage Diff              @@
##                dev    #4628      +/-   ##
============================================
+ Coverage     21.35%   22.05%   +0.70%     
- Complexity     2245     2273      +28     
============================================
  Files           876      856      -20     
  Lines         92104    90165    -1939     
  Branches       2304     2314      +10     
============================================
+ Hits          19667    19885     +218     
+ Misses        71154    69011    -2143     
+ Partials       1283     1269      -14     
Flag Coverage Δ
core 79.68% <94.95%> (+0.69%) ⬆️
editoast 73.11% <0.00%> (-0.10%) ⬇️
front 9.70% <ø> (+0.27%) ⬆️

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

Files Changed Coverage Δ
...in/fr/sncf/osrd/sim_infra/api/TrackNetworkInfra.kt 0.00% <ø> (ø)
.../sncf/osrd/standalone_sim/EnvelopeStopWrapper.java 97.43% <0.00%> (-2.57%) ⬇️
editoast/src/models/mod.rs 55.55% <ø> (ø)
editoast/src/models/train_schedule.rs 39.21% <ø> (ø)
editoast/src/views/timetable.rs 14.70% <0.00%> (-1.97%) ⬇️
.../src/main/java/fr/sncf/osrd/conflicts/Conflicts.kt 93.90% <93.05%> (+93.90%) ⬆️
...f/osrd/standalone_sim/ScheduleMetadataExtractor.kt 90.19% <95.61%> (+5.36%) ⬆️
...lin/fr/sncf/osrd/sim_infra/impl/RawInfraBuilder.kt 90.25% <100.00%> (+0.05%) ⬆️
...kotlin/fr/sncf/osrd/sim_infra/impl/RawInfraImpl.kt 69.94% <100.00%> (+0.83%) ⬆️
...va/fr/sncf/osrd/api/ConflictDetectionEndpoint.java 24.32% <100.00%> (+24.32%) ⬆️
... and 3 more

... and 29 files with indirect coverage changes

@multun multun force-pushed the routing-conflicts branch 3 times, most recently from 355afbc to 7c5df35 Compare July 20, 2023 12:41
@multun multun force-pushed the routing-conflicts branch 2 times, most recently from faf2d05 to c91c0e3 Compare July 25, 2023 16:37
@multun multun force-pushed the routing-conflicts branch from d6aaa75 to 2ed1005 Compare August 1, 2023 15:41
@multun multun marked this pull request as ready for review August 1, 2023 15:41
@multun multun requested a review from a team as a code owner August 1, 2023 15:41
@multun multun force-pushed the routing-conflicts branch 2 times, most recently from 2c7b382 to 8fa53ff Compare August 16, 2023 15:26
@multun multun force-pushed the routing-conflicts branch from 8fa53ff to c8fc8af Compare August 16, 2023 15:54
Copy link
Contributor

@leovalais leovalais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for the Editoast part

@Castavo Castavo requested a review from a team as a code owner August 21, 2023 10:33
@Castavo Castavo requested a review from Math-R August 21, 2023 12:04
@Castavo Castavo added this pull request to the merge queue Aug 22, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 22, 2023
@Castavo Castavo added this pull request to the merge queue Aug 22, 2023
Merged via the queue into dev with commit 328642c Aug 22, 2023
@Castavo Castavo deleted the routing-conflicts branch August 22, 2023 14:43
@multun multun linked an issue Sep 5, 2023 that may be closed by this pull request
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.

Implement route conflict detection in core
5 participants