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.

Sign up for GitHub

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

Jump to bottom

Integrate the new signaling engine #3473

Merged
merged 7 commits into from
Mar 30, 2023
Merged

Integrate the new signaling engine #3473

merged 7 commits into from
Mar 30, 2023

Conversation

Khoyo
Copy link
Contributor

@Khoyo Khoyo commented Mar 9, 2023 •
edited
Loading

TODO:

  • fix integration tests
  • fix schedulemetadataextractor tests
  • log block building errors
  • log block validation errors

@Khoyo Khoyo force-pushed the signaling-sim branch 2 times, most recently from 3f16231 to bc2f735 Compare March 10, 2023 15:05
@codecov
Copy link

codecov bot commented Mar 10, 2023 •
edited
Loading

Codecov Report

Merging #3473 (df10f98) into dev (a01c0f8) will increase coverage by 0.30%.
The diff coverage is 53.40%.

@@             Coverage Diff              @@
##                dev    #3473      +/-   ##
============================================
+ Coverage     68.57%   68.88%   +0.30%     
- Complexity     1928     2002      +74     
============================================
  Files           427      439      +12     
  Lines         21842    22289     +447     
  Branches       1577     1657      +80     
============================================
+ Hits          14979    15354     +375     
- Misses         6115     6141      +26     
- Partials        748      794      +46
Flag Coverage Δ
core 79.06% <53.40%> (+0.14%) ⬆️
front 57.48% <ø> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
...in/fr/sncf/osrd/sim_infra/api/InterlockingInfra.kt 77.77% <ø> (+16.66%) ⬆️
...ava/fr/sncf/osrd/api/SignalProjectionEndpoint.java 0.00% <0.00%> (ø)
...c/main/java/fr/sncf/osrd/cli/ApiServerCommand.java 0.00% <ø> (ø)
.../fr/sncf/osrd/cli/StandaloneSimulationCommand.java 0.00% <0.00%> (ø)
...va/fr/sncf/osrd/standalone_sim/SignalProjection.kt 0.00% <0.00%> (ø)
...ava/fr/sncf/osrd/standalone_sim/StandaloneSim.java 90.90% <ø> (ø)
...d/standalone_sim/result/ResultOccupancyTiming.java 50.00% <0.00%> (+7.14%) ⬆️
.../sncf/osrd/standalone_sim/result/SignalUpdate.java 0.00% <0.00%> (ø)
...nts/SimulationResults/ChartHelpers/ChartHelpers.ts 42.24% <ø> (+2.07%) ⬆️
front/src/common/api/osrdMiddlewareApi.ts 91.50% <ø> (-0.07%) ⬇️
... and 12 more

... and 17 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@multun multun force-pushed the signaling-sim branch 3 times, most recently from 16010e9 to 7371717 Compare March 22, 2023 13:29
@multun multun changed the title Signaling sim Integrate the new signaling engine Mar 23, 2023
@Khoyo Khoyo force-pushed the signaling-sim branch 3 times, most recently from 4f2ab58 to 1d4e1d7 Compare March 24, 2023 05:39
@multun multun force-pushed the signaling-sim branch 2 times, most recently from efd62b9 to 15d5c55 Compare March 24, 2023 10:01
@multun multun force-pushed the signaling-sim branch 4 times, most recently from cc4cb15 to f2e0ee4 Compare March 24, 2023 16:24
@Khoyo Khoyo force-pushed the signaling-sim branch 3 times, most recently from 8ba3db0 to 48e9b80 Compare March 28, 2023 08:24
@Khoyo Khoyo marked this pull request as ready for review March 28, 2023 08:25
@Khoyo Khoyo requested review from a team and eckter as code owners March 28, 2023 08:25
eckter
eckter reviewed Mar 28, 2023
View reviewed changes
Copy link
Contributor

@eckter eckter left a comment

Choose a reason for hiding this comment

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

Nice job!

  • Some old classes should be cleaned up, such as anything related to SignalizationEngine. But that can come later
  • When I test locally I always get an error on the "new import" infra (assert at LoadedSignalingInfra.kt:169)

core/src/main/java/fr/sncf/osrd/api/SignalProjectionEndpoint.java Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/standalone_sim/ScheduleMetadataExtractor.kt Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/standalone_sim/ScheduleMetadataExtractor.kt Outdated Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/standalone_sim/ScheduleMetadataExtractor.kt Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/standalone_sim/SignalProjection.kt Outdated Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/standalone_sim/SignalProjection.kt Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/standalone_sim/result/SignalUpdate.java Outdated Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/standalone_sim/result/SignalUpdate.java Outdated Show resolved Hide resolved
python/api/osrd_infra/views/timetable.py Outdated Show resolved Hide resolved
python/api/osrd_infra/views/train_schedule/standalone_simulation_report.py Outdated Show resolved Hide resolved
Khoyo and others added 3 commits March 30, 2023 07:54
@Khoyo @multun
Revert "front: block state: display on simulation's map"
aa60ffe 
This reverts commit cf2ecba.

Co-Authored-By: Victor "multun" Collod <victor.collod@epita.fr>
Co-Authored-By: Younes "Khoyo" Khoudli <younes.khoudli@epita.fr>
@multun @Khoyo
core: migrate standalone sim to the new signaling simulator
06ee796 
Co-Authored-By: Victor "multun" Collod <victor.collod@epita.fr>
Co-Authored-By: Younes "Khoyo" Khoudli <younes.khoudli@epita.fr>
@Khoyo @multun
core: add mock tvm signaling
0eda988 
Co-Authored-By: Victor "multun" Collod <victor.collod@epita.fr>
Co-Authored-By: Younes "Khoyo" Khoudli <younes.khoudli@epita.fr>
@Khoyo @multun
core: load kotlin infra when we load infras
cc773a4 
Co-Authored-By: Victor "multun" Collod <victor.collod@epita.fr>
Co-Authored-By: Younes "Khoyo" Khoudli <younes.khoudli@epita.fr>
Khoyo and others added 2 commits March 30, 2023 08:23
@Khoyo @multun
core: split the signal simulation out of the standalone sim endpoint
9a9378a 
Co-Authored-By: Victor "multun" Collod <victor.collod@epita.fr>
Co-Authored-By: Younes "Khoyo" Khoudli <younes.khoudli@epita.fr>
@multun @Khoyo
api: remove route_{begin,end}_occupancy
9844dad 
This API is a legacy from the time where routes, zones and blocks were
unified into a single weird blob. It's gone now.

Co-Authored-By: Victor "multun" Collod <victor.collod@epita.fr>
Co-Authored-By: Younes "Khoyo" Khoudli <younes.khoudli@epita.fr>
@eckter eckter mentioned this pull request Mar 30, 2023
Closed
flomonster
flomonster previously approved these changes Mar 30, 2023
View reviewed changes
Copy link
Contributor

@flomonster flomonster left a comment

Choose a reason for hiding this comment

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

Well done! 🎉

eckter
eckter reviewed Mar 30, 2023
View reviewed changes
core/openapi.yaml Outdated Show resolved Hide resolved
@Khoyo Khoyo mentioned this pull request Mar 30, 2023
Open
@Khoyo Khoyo merged commit dba2141 into dev Mar 30, 2023
@Khoyo Khoyo deleted the signaling-sim branch March 30, 2023 11:02
This was referenced Mar 31, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tguisnet Tguisnet Tguisnet approved these changes

@anisometropie anisometropie anisometropie approved these changes

@eckter eckter eckter approved these changes

@flomonster flomonster flomonster left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Khoyo @eckter @flomonster @anisometropie @Tguisnet @multun