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

Adapt simulation to take into account electrical profiles and adapt endpoints #2886

Merged
merged 1 commit into from
Jan 26, 2023
Merged

Adapt simulation to take into account electrical profiles and adapt endpoints #2886

merged 1 commit into from
Jan 26, 2023

Conversation

Castavo
Copy link
Contributor

@Castavo Castavo commented Jan 13, 2023 •
edited

closes: #2778
closes: #2779

@Castavo Castavo force-pushed the bpt/adapt-sim-to-electrical-profiles branch from 56c88c7 to ece418c Compare January 18, 2023 11:35
@codecov
Copy link

codecov bot commented Jan 18, 2023 •
edited

Codecov Report

Merging #2886 (03f11a4) into dev (1ab2271) will increase coverage by 0.78%.
The diff coverage is 86.84%.

@@             Coverage Diff              @@
##                dev    #2886      +/-   ##
============================================
+ Coverage     38.03%   38.82%   +0.78%     
- Complexity     1664     1704      +40     
============================================
  Files           594      600       +6     
  Lines         18146    18392     +246     
  Branches       2452     2479      +27     
============================================
+ Hits           6902     7140     +238     
+ Misses        10847    10844       -3     
- Partials        397      408      +11
Flag Coverage Δ
core 83.91% <88.49%> (+0.58%) ⬆️
editoast 72.95% <78.84%> (+0.13%) ⬆️

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

Impacted Files Coverage Δ
...c/main/java/fr/sncf/osrd/cli/ApiServerCommand.java 0.00% <0.00%> (ø)
.../fr/sncf/osrd/cli/StandaloneSimulationCommand.java 0.00% <0.00%> (ø)
...implementation/tracks/directed/TrackRangeView.java 89.28% <ø> (ø)
editoast/src/schema/mod.rs 78.18% <ø> (ø)
core/src/main/java/fr/sncf/osrd/api/APIClient.java 61.53% <61.53%> (ø)
editoast/src/views/electrical_profiles.rs 78.43% <78.43%> (ø)
.../fr/sncf/osrd/api/ElectricalProfileSetManager.java 79.16% <79.16%> (ø)
...andalone_sim/result/ResultModeAndProfilePoint.java 85.18% <85.18%> (ø)
...src/main/java/fr/sncf/osrd/train/RollingStock.java 98.57% <95.83%> (+3.57%) ⬆️
...nal_generated_inputs/ElectricalProfileMapping.java 96.66% <96.66%> (ø)
... and 22 more

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

@Castavo Castavo force-pushed the bpt/adapt-sim-to-electrical-profiles branch 2 times, most recently from 51df84e to e76ea3e Compare January 19, 2023 13:15
@Castavo Castavo marked this pull request as ready for review January 19, 2023 13:19
@Castavo Castavo requested review from a team as code owners January 19, 2023 13:19
@Castavo Castavo force-pushed the bpt/adapt-sim-to-electrical-profiles branch from e76ea3e to 824b993 Compare January 19, 2023 13:33
flomonster
flomonster requested changes Jan 19, 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.

Thanks for this PR!

api/openapi.yaml Outdated Show resolved Hide resolved
api/osrd_infra/migrations/0018_add_electrical_profiles_to_schedules.py Outdated Show resolved Hide resolved
api/osrd_infra/urls.py Outdated Show resolved Hide resolved
api/osrd_infra/models/external_generated_inputs.py Show resolved Hide resolved
api/osrd_infra/models/external_generated_inputs.py Outdated Show resolved Hide resolved
api/osrd_infra/views/electrical_profiles.py Outdated Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/cli/StandaloneSimulationCommand.java Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/external_generated_inputs/ElectricalProfileMapping.java Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/envelope_sim/EnvelopeSimContext.java Outdated Show resolved Hide resolved
multun
multun suggested changes Jan 23, 2023
View reviewed changes
api/openapi.yaml Show resolved Hide resolved
api/openapi.yaml Show resolved Hide resolved
api/osrd_infra/models/electrical_profiles.py Outdated Show resolved Hide resolved
api/osrd_infra/models/timetable.py Outdated Show resolved Hide resolved
api/osrd_infra/models/train_schedule.py Outdated Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/api/MiddleWareInteraction.java Outdated Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/api/StandaloneSimulationEndpoint.java Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/envelope_sim/EnvelopePath.java Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/envelope_sim/PhysicsPath.java Show resolved Hide resolved
core/src/main/java/fr/sncf/osrd/envelope_sim/PhysicsRollingStock.java Show resolved Hide resolved
@Castavo Castavo force-pushed the bpt/adapt-sim-to-electrical-profiles branch 3 times, most recently from 24deeaa to cf9a1ba Compare January 24, 2023 13:21
@flomonster flomonster mentioned this pull request Jan 25, 2023
Closed
2 tasks
multun
multun previously approved these changes Jan 25, 2023
View reviewed changes
@Castavo Castavo force-pushed the bpt/adapt-sim-to-electrical-profiles branch 2 times, most recently from 3c64cd6 to c041ddf Compare January 26, 2023 09:54
flomonster
flomonster requested changes Jan 26, 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.

Almost there!

api/osrd_infra/migrations/__init__.py Outdated Show resolved Hide resolved
api/osrd_infra/models/timetable.py Show resolved Hide resolved
core/examples/generated/lib/railjson_generator/external_generated_inputs.py Show resolved Hide resolved
editoast/openapi.yaml Outdated Show resolved Hide resolved
editoast/src/schema/electrical_profiles.rs Outdated Show resolved Hide resolved
editoast/src/views/electrical_profiles.rs Outdated Show resolved Hide resolved
@Castavo Castavo force-pushed the bpt/adapt-sim-to-electrical-profiles branch 2 times, most recently from b48b4ef to 92d8949 Compare January 26, 2023 12:57
Tguisnet
Tguisnet previously approved these changes Jan 26, 2023
View reviewed changes
api + core + editoast: take electrical profiles into account
03f11a4 
api: models: add profile order attribute to electrical profile sets

api: electrical profiles: add endpoint to retrieve level order

api: add endpoints and openAPI to use electrical profiles

core: api: load electrical profiles from api

core: api: add tests

core: api: create electrical profile mapping class

core: api: add power class to electrical profile mapping

core: infra-generator: add more power classes in electrical profiles

core: rolling-stock: adapt data model

core: rename catenary profiles to catenary modes

core: electrical profiles: improve cache management

core: simulation: take electrical profiles into account

core: test: add electrical profile mapping tests

core: tests: add sim test with electrical profiles

core: railjson: move rjselectricalprofile.java

core: gather modes and electrical profiles used by train

core: rolling stock: add get curve on path test

core: add electrical profiles used to the response

api: add electrical profiles seen to simulation result

core: envelope_path: merge rangemap ranges with same values

move electrical profile endpoints from api to editoast

include level order inside electrical profile set schema

editoast + core: update electrical profile exchange format

editoast: add electrical profile tests

core: make envelope_sim_context init simple again

core: rename middleware_interaction to api_client

api: change electrical profile set foreign key migration

electrical profiles: improve docs

github-actions: update tarpaulin

editoast: move electrical profile sets queryables to view

core: change electrical profile result format
@Castavo Castavo force-pushed the bpt/adapt-sim-to-electrical-profiles branch from 92d8949 to 03f11a4 Compare January 26, 2023 14:33
@flomonster flomonster merged commit f605724 into dev Jan 26, 2023
@flomonster flomonster deleted the bpt/adapt-sim-to-electrical-profiles branch January 26, 2023 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flomonster flomonster flomonster approved these changes

@multun multun multun left review comments

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

Add api endpoints for electrical profiles Adapt core - simulation for electrical profiles
4 participants
@Castavo @multun @flomonster @Tguisnet