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

Add scheduled points #4289

Merged
merged 5 commits into from
Jun 22, 2023
Merged

Add scheduled points #4289

merged 5 commits into from
Jun 22, 2023

Conversation

flomonster
Copy link
Contributor

@flomonster flomonster commented Jun 6, 2023 •
edited
Loading

close #4221
close #4272

@flomonster flomonster requested a review from a team as a code owner June 6, 2023 11:00
@codecov
Copy link

codecov bot commented Jun 6, 2023 •
edited
Loading

Codecov Report

Merging #4289 (e5ea653) into dev (cf9690b) will decrease coverage by 0.45%.
The diff coverage is 88.46%.

❗ Current head e5ea653 differs from pull request most recent head 1632127. Consider uploading reports for the commit 1632127 to get more accurate results

@@             Coverage Diff              @@
##                dev    #4289      +/-   ##
============================================
- Coverage     22.32%   21.88%   -0.45%     
- Complexity     2256     2266      +10     
============================================
  Files           850      851       +1     
  Lines         84111    83979     -132     
  Branches       2215     2222       +7     
============================================
- Hits          18776    18375     -401     
- Misses        64122    64390     +268     
- Partials       1213     1214       +1
Flag Coverage Δ
core 80.38% <92.00%> (+0.05%) ⬆️
editoast 68.85% <0.00%> (-0.95%) ⬇️

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

Impacted Files Coverage Δ
.../fr/sncf/osrd/cli/StandaloneSimulationCommand.java 78.78% <ø> (ø)
editoast/src/models/train_schedule.rs 0.00% <0.00%> (ø)
editoast/src/tables.rs 56.83% <0.00%> (-0.61%) ⬇️
...srd/railjson/schema/schedule/RJSSchedulePoint.java 80.00% <80.00%> (ø)
...c/main/java/fr/sncf/osrd/train/ScheduledPoint.java 80.00% <80.00%> (ø)
...ava/fr/sncf/osrd/standalone_sim/StandaloneSim.java 91.66% <91.30%> (-0.34%) ⬇️
...on/schema/schedule/RJSStandaloneTrainSchedule.java 95.23% <100.00%> (+2.38%) ⬆️
...ain/java/fr/sncf/osrd/api/stdcm/STDCMEndpoint.java 65.67% <100.00%> (+0.52%) ⬆️
...ljson/parser/RJSStandaloneTrainScheduleParser.java 72.94% <100.00%> (+2.05%) ⬆️
...va/fr/sncf/osrd/train/StandaloneTrainSchedule.java 100.00% <100.00%> (ø)

... and 19 files with indirect coverage changes

@flomonster flomonster marked this pull request as draft June 6, 2023 13:53
@flomonster flomonster force-pushed the fam/add-timed-waypoints branch 4 times, most recently from e88a6ba to 3e485a4 Compare June 15, 2023 11:44
@flomonster flomonster changed the title Add timed waypoints Add scheduled points Jun 15, 2023
@flomonster flomonster force-pushed the fam/add-timed-waypoints branch 7 times, most recently from 5358286 to 1cd3efa Compare June 16, 2023 16:15
@flomonster flomonster marked this pull request as ready for review June 16, 2023 16:15
@flomonster flomonster requested a review from a team as a code owner June 16, 2023 16:15
@flomonster flomonster force-pushed the fam/add-timed-waypoints branch 2 times, most recently from af6d064 to 51ee812 Compare June 16, 2023 16:51
younesschrifi
younesschrifi approved these changes Jun 18, 2023
View reviewed changes
Copy link
Contributor

@younesschrifi younesschrifi left a comment

Choose a reason for hiding this comment

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

I reviewed api and editoast. LGTM 😄

Castavo
Castavo approved these changes Jun 20, 2023
View reviewed changes
Copy link
Contributor

@Castavo Castavo left a comment

Choose a reason for hiding this comment

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

Nice PR, I only have some comments about some docstrings
I tested the core endpoint but not the api / editoast endpoint

multun
multun suggested changes Jun 20, 2023
View reviewed changes
@flomonster flomonster force-pushed the fam/add-timed-waypoints branch 2 times, most recently from e5ea653 to ea6927b Compare June 20, 2023 15:33
Tguisnet
Tguisnet approved these changes Jun 21, 2023
View reviewed changes
Copy link
Contributor

@Tguisnet Tguisnet left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM for Api and Editoast (but I have some doubts about the TrainSchedule part already merged : tests, urls, not working endpoints, ...)

@flomonster
Copy link
Contributor Author

Missing fixes for editoast/openapi.yaml

@flomonster flomonster force-pushed the fam/add-timed-waypoints branch 2 times, most recently from 900e43b to 07fa0ad Compare June 22, 2023 07:40
@flomonster flomonster force-pushed the fam/add-timed-waypoints branch from 07fa0ad to 86272dc Compare June 22, 2023 09:10
@flomonster flomonster force-pushed the fam/add-timed-waypoints branch from 86272dc to 773d14f Compare June 22, 2023 09:46
@flomonster flomonster requested a review from multun June 22, 2023 09:47
@flomonster flomonster force-pushed the fam/add-timed-waypoints branch from 773d14f to 1632127 Compare June 22, 2023 10:17
@flomonster flomonster merged commit f7e54dc into dev Jun 22, 2023
@flomonster flomonster deleted the fam/add-timed-waypoints branch June 22, 2023 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@multun multun multun approved these changes

@Tguisnet Tguisnet Tguisnet approved these changes

@Castavo Castavo Castavo approved these changes

@younesschrifi younesschrifi younesschrifi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@flomonster @multun @Tguisnet @Castavo @younesschrifi