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

editoast: lmr towed max speed #9654

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Conversation

Wadjetz
Copy link
Member

@Wadjetz Wadjetz commented Nov 8, 2024

fix #9637

  • Add stdcm request validation
  • Handle max speed zero value in simulation computation (if it used in another place without request validation)
  • Add max_speed to towed rolling stock

The frontend validation done in another PR

@Wadjetz Wadjetz self-assigned this Nov 8, 2024
@codecov-commenter
Copy link

codecov-commenter commented Nov 8, 2024

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

Codecov Report

Attention: Patch coverage is 96.15385% with 1 line in your changes missing coverage. Please review.

Project coverage is 79.84%. Comparing base (d9369b0) to head (605246f).
Report is 8 commits behind head on dev.

Files with missing lines Patch % Lines
editoast/src/models/towed_rolling_stock.rs 0.00% 1 Missing ⚠️

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

Additional details and impacted files
@@           Coverage Diff           @@
##              dev    #9654   +/-   ##
=======================================
  Coverage   79.84%   79.84%           
=======================================
  Files        1048     1048           
  Lines      105058   105077   +19     
  Branches      756      756           
=======================================
+ Hits        83881    83901   +20     
+ Misses      21136    21135    -1     
  Partials       41       41           
Flag Coverage Δ
editoast 73.40% <95.65%> (+0.01%) ⬆️
front 89.33% <100.00%> (ø)
gateway 2.18% <ø> (ø)
osrdyne 3.28% <ø> (ø)
railjson_generator 87.49% <ø> (ø)
tests 87.00% <ø> (ø)

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.

@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch 2 times, most recently from 09f5d66 to c205a2a Compare November 8, 2024 09:46
@Wadjetz Wadjetz requested review from woshilapin and hamz2a November 8, 2024 09:48
@Wadjetz Wadjetz marked this pull request as ready for review November 8, 2024 10:29
@Wadjetz Wadjetz requested a review from a team as a code owner November 8, 2024 10:29
Copy link
Contributor

@woshilapin woshilapin left a comment

Choose a reason for hiding this comment

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

The code is fine (only some minor comments), but I'm questioning the original ticket #9637 in which I made a comment. I propose to not merge the current PR until we do have an answer.

editoast/src/core/simulation.rs Outdated Show resolved Hide resolved
editoast/src/views/timetable/stdcm.rs Outdated Show resolved Hide resolved
editoast/src/views/timetable/stdcm.rs Outdated Show resolved Hide resolved
editoast/src/views/timetable/stdcm.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@hamz2a hamz2a left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@Wadjetz Wadjetz added area:editoast Work on Editoast Service module:stdcm Short-Term DCM kind:bug Something isn't working labels Nov 8, 2024
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.

LGTM. Can you fixup your commits before merge.

@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch from 6f68ddc to e85238a Compare November 20, 2024 14:36
@github-actions github-actions bot removed the area:editoast Work on Editoast Service label Nov 20, 2024
@Wadjetz Wadjetz marked this pull request as draft December 3, 2024 13:44
@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch from e85238a to 674edc9 Compare December 3, 2024 15:02
@github-actions github-actions bot added the area:editoast Work on Editoast Service label Dec 3, 2024
@Wadjetz Wadjetz requested a review from woshilapin December 3, 2024 15:10
@Wadjetz Wadjetz marked this pull request as ready for review December 3, 2024 15:10
Copy link
Contributor

@woshilapin woshilapin left a comment

Choose a reason for hiding this comment

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

I don't think we should filter the zero, for the same reason I mentioned in #9637 (comment). The fact that the field is optional should be enough.

@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch from 674edc9 to 57dab96 Compare December 4, 2024 11:05
@Wadjetz Wadjetz changed the title editoast: stdcm max speed handle zero value editoast: stdcm towed max speed Dec 4, 2024
@Wadjetz Wadjetz changed the title editoast: stdcm towed max speed editoast: lmr towed max speed Dec 4, 2024
@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch 2 times, most recently from d7136ad to dab7ab4 Compare December 4, 2024 13:18
@github-actions github-actions bot added the area:front Work on Standard OSRD Interface modules label Dec 4, 2024
@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch from dab7ab4 to a9074f4 Compare December 4, 2024 13:34
@Wadjetz Wadjetz requested a review from a team as a code owner December 4, 2024 13:34
Copy link
Contributor

@woshilapin woshilapin left a comment

Choose a reason for hiding this comment

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

Thank you.

@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch 3 times, most recently from 6ac6fa7 to 3dffcff Compare December 4, 2024 14:24
@leovalais
Copy link
Contributor

Ping @Tristramg: changes in rolling stock speed calculations, probably best to rebase before typing quantities any further :)

@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch from 3dffcff to 32fae5c Compare December 4, 2024 14:48
Copy link
Contributor

@SharglutDev SharglutDev 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 front (not tested)

Signed-off-by: Egor Berezovskiy <egor@berezify.fr>
@Wadjetz Wadjetz force-pushed the ebe/editoast/stdcm/max_speed_is_not_zero branch from 32fae5c to 605246f Compare December 4, 2024 15:20
@Wadjetz Wadjetz added this pull request to the merge queue Dec 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 5, 2024
@Wadjetz Wadjetz added this pull request to the merge queue Dec 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 5, 2024
@Wadjetz Wadjetz added this pull request to the merge queue Dec 5, 2024
Merged via the queue into dev with commit 1b93bd4 Dec 5, 2024
27 checks passed
@Wadjetz Wadjetz deleted the ebe/editoast/stdcm/max_speed_is_not_zero branch December 5, 2024 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:editoast Work on Editoast Service area:front Work on Standard OSRD Interface modules kind:bug Something isn't working module:stdcm Short-Term DCM
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Towed rolling stocks with max speed at 0km/h mess up the consist building
7 participants