core: change pathfinding errors on rolling-stock constraints #7953

bougue-pe · 2024-07-04T16:01:33Z

Change interface for pathfinding errors on rolling-stock constraints and project RS constraints on the relaxed path.
Not available for STDCM, only for operational studies.

⚠️ this breaks core interface and will be handled in another PR by editoast.
So: to be squashed with later work.

TODO:

test with holes between blocked ranges
test incompatible gauge
check if validate PR response is/should be done

Fix: #7719

codecov-commenter · 2024-07-04T16:04:15Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 72.67081% with 44 lines in your changes missing coverage. Please review.

Project coverage is 27.21%. Comparing base (bc3c002) to head (f629528).

Files	Patch %	Lines
.../api_v2/pathfinding/PathfindingBlocksEndpointV2.kt	83.49%	8 Missing and 9 partials ⚠️
...pi/api_v2/pathfinding/PathfindingPostProcessing.kt	38.46%	10 Missing and 6 partials ⚠️
...api/api_v2/pathfinding/PathfindingBlockResponse.kt	57.14%	2 Missing and 7 partials ⚠️
...r/sncf/osrd/signaling/impl/MockSigSystemManager.kt	0.00%	1 Missing ⚠️
...n/fr/sncf/osrd/api/api_v2/stdcm/STDCMEndpointV2.kt	0.00%	1 Missing ⚠️

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

Additional details and impacted files

@@                                  Coverage Diff                                   @@
##             display_pathfinding_constraints_on_shortest_path    #7953      +/-   ##
======================================================================================
+ Coverage                                               27.18%   27.21%   +0.03%     
- Complexity                                               2127     2129       +2     
======================================================================================
  Files                                                    1310     1310              
  Lines                                                  157738   157815      +77     
  Branches                                                 3257     3271      +14     
======================================================================================
+ Hits                                                    42881    42953      +72     
+ Misses                                                 112877   112867      -10     
- Partials                                                 1980     1995      +15

Flag	Coverage Δ
core	`75.59% <72.67%> (+0.14%)`	⬆️
editoast	`64.20% <ø> (-0.03%)`	⬇️
front	`10.38% <ø> (ø)`
gateway	`2.03% <ø> (ø)`
railjson_generator	`87.49% <ø> (ø)`
tests	`73.18% <ø> (ø)`

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.

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/pathfinding/PathfindingBlockResponse.kt

core/src/test/kotlin/fr/sncf/osrd/pathfinding/PathfindingV2Test.kt

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/pathfinding/PathfindingBlocksEndpointV2.kt

core/src/test/kotlin/fr/sncf/osrd/pathfinding/PathfindingV2Test.kt

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/pathfinding/PathfindingBlocksEndpointV2.kt

core/kt-osrd-utils/src/main/kotlin/fr/sncf/osrd/utils/DistanceRangeMap.kt

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/pathfinding/PathfindingBlocksEndpointV2.kt

core/src/main/kotlin/fr/sncf/osrd/api/pathfinding/constraints/ElectrificationConstraints.kt

front/public/locales/en/operationalStudies/manageTrainSchedule.json

shenriotpro

OK for tests/

…aints

also: * mutualize build of constraints' ranges * makes incompatibleGaugeRanges consistent with the rest (nest range) * use * in imports when > 5 * rename param for filterIntersection() of DistanceRangeMaps

front/public/locales/en/operationalStudies/manageTrainSchedule.json

bougue-pe requested review from sim51 and Erashin July 4, 2024 16:01

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch 2 times, most recently from 0e4eb4c to 0a2d394 Compare July 5, 2024 16:11

Erashin reviewed Jul 8, 2024

View reviewed changes

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/pathfinding/PathfindingBlockResponse.kt Outdated Show resolved Hide resolved

core/src/test/kotlin/fr/sncf/osrd/pathfinding/PathfindingV2Test.kt Show resolved Hide resolved

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch 5 times, most recently from 2f0ca04 to 2f67537 Compare July 9, 2024 12:58

Erashin reviewed Jul 11, 2024

View reviewed changes

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch from abccc44 to 8ee6553 Compare July 11, 2024 09:07

bougue-pe requested a review from Erashin July 11, 2024 09:29

bougue-pe commented Jul 11, 2024

View reviewed changes

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/pathfinding/PathfindingBlocksEndpointV2.kt Show resolved Hide resolved

bougue-pe changed the title ~~core: change interface for pathfinding errors on rolling-stock constraints~~ core: change pathfinding errors on rolling-stock constraints Jul 11, 2024

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch from 8ee6553 to d20609e Compare July 11, 2024 12:22

Erashin reviewed Jul 12, 2024

View reviewed changes

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch 2 times, most recently from 65f3fe1 to fe3b779 Compare July 15, 2024 06:12

bougue-pe marked this pull request as ready for review July 15, 2024 06:16

bougue-pe requested a review from a team as a code owner July 15, 2024 06:16

bougue-pe requested a review from Khoyo July 15, 2024 06:16

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch from 9a63a73 to 2b292a0 Compare July 19, 2024 22:43

bougue-pe requested a review from a team as a code owner July 19, 2024 22:43

Erashin approved these changes Jul 23, 2024

View reviewed changes

Erashin reviewed Jul 23, 2024

View reviewed changes

front/public/locales/en/operationalStudies/manageTrainSchedule.json Outdated Show resolved Hide resolved

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch from 2b292a0 to 9cb0e9f Compare July 23, 2024 08:40

bougue-pe removed the request for review from Khoyo July 23, 2024 09:00

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch from 9cb0e9f to 44b15b3 Compare July 23, 2024 09:03

bougue-pe changed the base branch from dev to display_pathfinding_constraints_on_shortest_path July 23, 2024 09:07

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch from 44b15b3 to 2aaf84e Compare July 26, 2024 14:00

bougue-pe requested review from a team as code owners July 26, 2024 14:00

bougue-pe requested review from shenriotpro and removed request for a team July 26, 2024 14:00

shenriotpro approved these changes Jul 26, 2024

View reviewed changes

bougue-pe changed the base branch from display_pathfinding_constraints_on_shortest_path to dev July 26, 2024 15:59

bougue-pe changed the base branch from dev to display_pathfinding_constraints_on_shortest_path July 26, 2024 15:59

bougue-pe removed request for a team July 26, 2024 15:59

bougue-pe added 5 commits July 26, 2024 21:39

core: change interface for pathfinding errors on rolling-stock constr…

ab31c12

…aints

core: project RS constraints on the relaxed path

6dec0f5

core: add test on all type of incompatible RS constraints

4899f5e

also: * mutualize build of constraints' ranges * makes incompatibleGaugeRanges consistent with the rest (nest range) * use * in imports when > 5 * rename param for filterIntersection() of DistanceRangeMaps

core: add validation of relaxed path

344ef60

core: throw a dedicated error when relaxed path search timed out

2e412a0

bougue-pe force-pushed the peb/core/incompatible_rolling_stock_constraints_pathfinding branch from 2aaf84e to 2e412a0 Compare July 26, 2024 19:40

sim51 approved these changes Jul 29, 2024

View reviewed changes

front/public/locales/en/operationalStudies/manageTrainSchedule.json Outdated Show resolved Hide resolved

SharglutDev approved these changes Jul 29, 2024

View reviewed changes

front/public/locales/en/operationalStudies/manageTrainSchedule.json Outdated Show resolved Hide resolved

front: remove unused translations

f629528

bougue-pe merged commit f6d17cc into display_pathfinding_constraints_on_shortest_path Jul 30, 2024
20 checks passed

bougue-pe deleted the peb/core/incompatible_rolling_stock_constraints_pathfinding branch July 30, 2024 14:03

bougue-pe mentioned this pull request Aug 7, 2024

Display pathfinding constraints on shortest path #8356

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core: change pathfinding errors on rolling-stock constraints #7953

core: change pathfinding errors on rolling-stock constraints #7953

bougue-pe commented Jul 4, 2024 •

edited

Loading

codecov-commenter commented Jul 4, 2024 •

edited

Loading

shenriotpro left a comment

core: change pathfinding errors on rolling-stock constraints #7953

core: change pathfinding errors on rolling-stock constraints #7953

Conversation

bougue-pe commented Jul 4, 2024 • edited Loading

codecov-commenter commented Jul 4, 2024 • edited Loading

Codecov Report

shenriotpro left a comment

Choose a reason for hiding this comment

bougue-pe commented Jul 4, 2024 •

edited

Loading

codecov-commenter commented Jul 4, 2024 •

edited

Loading