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: stdcm simulation convoy parameters #9106

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

Wadjetz
Copy link
Member

@Wadjetz Wadjetz commented Sep 30, 2024

part of #8670 and https://github.com/osrd-project/osrd-confidential/issues/368

  • Send simulation length and mass to Editoast.
  • If parameters are provided, send them to the core; otherwise, send the rolling stock mass and length.

How to test:

  • Create a new STDCM simulation with parameters and check the results.

@Wadjetz Wadjetz self-assigned this Sep 30, 2024
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch from 3e1d5c0 to f82a6f6 Compare September 30, 2024 09:03
@codecov-commenter
Copy link

codecov-commenter commented Sep 30, 2024

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

Codecov Report

Attention: Patch coverage is 56.94444% with 93 lines in your changes missing coverage. Please review.

Project coverage is 39.39%. Comparing base (8a66782) to head (3f5bd10).
Report is 18 commits behind head on dev.

Files with missing lines Patch % Lines
.../src/applications/stdcmV2/hooks/useStdcmConsist.ts 0.00% 33 Missing and 1 partial ⚠️
...c/applications/stdcmV2/components/StdcmConsist.tsx 0.00% 32 Missing ⚠️
.../src/applications/stdcm/utils/formatStdcmConfV2.ts 0.00% 10 Missing ⚠️
editoast/src/views/timetable/stdcm.rs 88.60% 9 Missing ⚠️
front/src/reducers/osrdconf/stdcmConf/index.ts 83.33% 0 Missing and 3 partials ⚠️
front/src/reducers/osrdconf/stdcmConf/selectors.ts 0.00% 3 Missing ⚠️
front/src/utils/physics.ts 60.00% 2 Missing ⚠️

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

Additional details and impacted files
@@             Coverage Diff              @@
##                dev    #9106      +/-   ##
============================================
+ Coverage     39.15%   39.39%   +0.24%     
- Complexity     2245     2267      +22     
============================================
  Files          1290     1302      +12     
  Lines         97316    98353    +1037     
  Branches       3280     3301      +21     
============================================
+ Hits          38100    38743     +643     
- Misses        57277    57658     +381     
- Partials       1939     1952      +13     
Flag Coverage Δ
core 74.97% <ø> (+0.03%) ⬆️
editoast 72.25% <92.10%> (-0.23%) ⬇️
front 10.39% <17.64%> (+0.06%) ⬆️
gateway 2.50% <ø> (ø)
osrdyne 3.52% <ø> (ø)
railjson_generator 87.49% <ø> (ø)
tests 86.71% <ø> (ø)

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-convoy-data branch 4 times, most recently from 928bd3c to 2e56d31 Compare September 30, 2024 09:33
@Wadjetz Wadjetz changed the title editoast: stdcm simulation parameters editoast: stdcm simulation convoy parameters Sep 30, 2024
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch 4 times, most recently from 97512ff to 1920dba Compare October 1, 2024 13:37
@Wadjetz Wadjetz added area:front Work on Standard OSRD Interface modules area:editoast Work on Editoast Service module:stdcm Short-Term DCM labels Oct 1, 2024
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch from 1920dba to 55fb369 Compare October 1, 2024 14:17
@Wadjetz Wadjetz marked this pull request as ready for review October 1, 2024 14:33
@Wadjetz Wadjetz requested review from a team as code owners October 1, 2024 14:33
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.

Thanks! A few comments:

editoast/src/core/simulation.rs Outdated Show resolved Hide resolved
editoast/src/core/simulation.rs Outdated Show resolved Hide resolved
editoast/src/views/timetable/stdcm.rs Outdated Show resolved Hide resolved
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch 2 times, most recently from 9dd25e0 to f6e616b Compare October 2, 2024 08:04
@Wadjetz Wadjetz requested a review from clarani October 2, 2024 08:05
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.

Thanks for this PR

editoast/src/views/timetable/stdcm.rs Outdated Show resolved Hide resolved
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch 2 times, most recently from 2f3113f to 577f67e Compare October 2, 2024 09:04
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch 3 times, most recently from 8f647a2 to ce6d40b Compare October 10, 2024 09:02
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.

Thanks for the tests and other fields.

@Wadjetz Wadjetz requested a review from Khoyo October 10, 2024 12:58
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch 3 times, most recently from d2b4329 to 69d506e Compare October 14, 2024 08:52
Copy link
Contributor

@Sh099078 Sh099078 left a comment

Choose a reason for hiding this comment

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

Great PR ! I left some comments (mostly typos)

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
editoast/src/views/timetable/stdcm.rs Outdated Show resolved Hide resolved
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.

Thank you for the PR, left some comments

@SharglutDev
Copy link
Contributor

Also depending on who finishes first, you might have conflicts with this PR : #9268

@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch 2 times, most recently from 2dc09eb to eb9e14d Compare October 15, 2024 14:58
@Wadjetz Wadjetz force-pushed the ebe/editoast-stdcm-convoy-data branch 3 times, most recently from 2d6a9d2 to 92f6141 Compare October 16, 2024 09:53
Signed-off-by: Egor Berezovskiy <egor@berezify.fr>
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 and tested, good job ! We can keep the negative input feature for another issue, as it needs another refacto of the style of this part of the form.

Issue here : #9374

@Wadjetz Wadjetz dismissed kmer2016’s stale review October 17, 2024 14:55

I fixed all comments and we need to merge

@Wadjetz Wadjetz added this pull request to the merge queue Oct 17, 2024
Merged via the queue into dev with commit 8ed63d0 Oct 17, 2024
24 checks passed
@Wadjetz Wadjetz deleted the ebe/editoast-stdcm-convoy-data branch October 17, 2024 15:13
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 module:stdcm Short-Term DCM
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants