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 logic to handle non-feasibility in stdcm simulations #9419

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Add logic to handle non-feasibility in stdcm simulations #9419

merged 1 commit into from
Oct 31, 2024

Conversation

achrafmohye
Copy link
Contributor

@achrafmohye achrafmohye commented Oct 22, 2024 •
edited by clarani
Loading

Closes #9163

Can only be merged once this PR is merged: #9509

@codecov-commenter
Copy link

codecov-commenter commented Oct 22, 2024 •
edited
Loading

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

Codecov Report

Attention: Patch coverage is 4.27046% with 269 lines in your changes missing coverage. Please review.

Project coverage is 39.50%. Comparing base (aaae986) to head (a76c486).
Report is 1 commits behind head on dev.

Files with missing lines Patch % Lines
...c/applications/stdcm/hooks/useConflictsMessages.ts 0.00% 77 Missing and 1 partial ⚠️
...nt/src/applications/stdcm/utils/formatConflicts.ts 16.92% 49 Missing and 5 partials ⚠️
...ons/stdcm/components/StdcmResults/StdcmResults.tsx 0.00% 39 Missing ⚠️
front/src/applications/stdcm/views/StdcmView.tsx 0.00% 25 Missing ⚠️
front/src/applications/stdcm/hooks/useStdcm.ts 0.00% 24 Missing ⚠️
...nt/src/applications/stdcm/hooks/useStdcmResults.ts 0.00% 22 Missing ⚠️
...Schedule/ManageTrainScheduleMap/ItineraryLayer.tsx 0.00% 10 Missing ⚠️
front/scripts/i18n-checker.ts 0.00% 7 Missing ⚠️
.../applications/stdcm/utils/simulationOutputUtils.ts 0.00% 6 Missing ⚠️
...mponents/StdcmResults/StdcmSimulationNavigator.tsx 0.00% 2 Missing ⚠️
... and 1 more

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

Additional details and impacted files 
@@             Coverage Diff              @@
##                dev    #9419      +/-   ##
============================================
- Coverage     39.59%   39.50%   -0.09%     
  Complexity     2270     2270              
============================================
  Files          1306     1309       +3     
  Lines        100046   100242     +196     
  Branches       3289     3295       +6     
============================================
- Hits          39609    39605       -4     
- Misses        58498    58692     +194     
- Partials       1939     1945       +6
Flag Coverage Δ
core 75.06% <ø> (ø)
editoast 73.52% <ø> (-0.06%) ⬇️
front 10.10% <4.27%> (-0.02%) ⬇️
gateway 2.19% <ø> (ø)
osrdyne 3.28% <ø> (ø)
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.

@achrafmohye
Copy link
Contributor Author

achrafmohye commented Oct 22, 2024 •
edited
Loading

This PR is currently in draft mode and not ready for functionality testing. It has been created to have a first round of comments while awaiting the merge of the Editoast feature.

@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch 3 times, most recently from 90cbfbd to 74e6605 Compare October 22, 2024 11:52
@theocrsb theocrsb requested review from clarani and theocrsb October 22, 2024 12:46
@achrafmohye achrafmohye requested review from clarani and removed request for clarani October 22, 2024 13:07
@achrafmohye achrafmohye requested a review from theocrsb October 23, 2024 09:24
@clarani clarani self-assigned this Oct 29, 2024
@SharglutDev SharglutDev mentioned this pull request Oct 30, 2024
Merged
@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch 3 times, most recently from 2894828 to 77c584d Compare October 30, 2024 08:38
@achrafmohye achrafmohye marked this pull request as ready for review October 30, 2024 08:39
@achrafmohye achrafmohye requested a review from a team as a code owner October 30, 2024 08:39
@achrafmohye achrafmohye requested a review from theocrsb October 30, 2024 08:39
@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from 77c584d to faaff8a Compare October 30, 2024 09:23
@SharglutDev SharglutDev self-requested a review October 30, 2024 16:19
SharglutDev
SharglutDev reviewed Oct 30, 2024
View reviewed changes
Copy link
Contributor

@SharglutDev SharglutDev 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.

Just started the review, here are some trads comments

Please also rebase your branch to resolve conflicts as StdcmResults has change a little.

SharglutDev
SharglutDev reviewed Oct 30, 2024
View reviewed changes
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.

Not finished yet but here are some other comments

@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from faaff8a to 4cdc58c Compare October 31, 2024 09:50
SharglutDev
SharglutDev reviewed Oct 31, 2024
View reviewed changes
@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from 4cdc58c to 28167a8 Compare October 31, 2024 14:03
@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from 28167a8 to 88104b8 Compare October 31, 2024 14:13
theocrsb
theocrsb approved these changes Oct 31, 2024
View reviewed changes
Copy link
Contributor

@theocrsb theocrsb 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

@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from 3c3e957 to 8427d37 Compare October 31, 2024 16:06
SharglutDev
SharglutDev reviewed Oct 31, 2024
View reviewed changes
@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from f3d61a0 to b095a6d Compare October 31, 2024 18:56
SharglutDev
SharglutDev approved these changes Oct 31, 2024
View reviewed changes
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

@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from b095a6d to f33e22c Compare October 31, 2024 19:04
@achrafmohye achrafmohye force-pushed the ame/non-feasibility-handling-in-stdcm branch from f33e22c to a76c486 Compare October 31, 2024 19:17
@SharglutDev SharglutDev enabled auto-merge October 31, 2024 19:29
@SharglutDev SharglutDev added this pull request to the merge queue Oct 31, 2024
Merged via the queue into dev with commit c3d0409 Oct 31, 2024
24 checks passed
@SharglutDev SharglutDev deleted the ame/non-feasibility-handling-in-stdcm branch October 31, 2024 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hamz2a hamz2a hamz2a left review comments

@clarani clarani clarani left review comments

@maelysLeratRosso maelysLeratRosso maelysLeratRosso left review comments

@theocrsb theocrsb theocrsb approved these changes

@SharglutDev SharglutDev SharglutDev approved these changes

Assignees

@clarani clarani

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implementation of the front-end mockup of the explanation of the infeasibility of the simulation
7 participants
@achrafmohye @codecov-commenter @hamz2a @clarani @theocrsb @SharglutDev @maelysLeratRosso