Skip to content

Commit

Permalink
fixup! core: add etcs svl logic
Browse files Browse the repository at this point in the history 
Signed-off-by: Erashin <[email protected]>
  • Loading branch information
@Erashin
Erashin committed Feb 26, 2025
1 parent 390b821 commit ce5a895
Show file tree
Hide file tree
Showing 2 changed files with 201 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/Constants.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ package fr.sncf.osrd.envelope_sim.etcs
const val qNvinhsmicperm = false

/**
* National Default Value: permission to follow release speed at 40km/h near the EoA.
* See Subset 026: table in Appendix A.3.2.
* National Default Value: permission to follow release speed at 40km/h near the EoA. See Subset
* 026: table in Appendix A.3.2.
*/
const val releaseSpeed = 40.0 / 3.6 // m/s

Expand Down
199 changes: 199 additions & 0 deletions tests/tests/test_train_schedule.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,205 @@ def test_etcs_schedule_result_stop_brake_from_mrsp(etcs_scenario: Scenario, etcs
)


def test_etcs_schedule_result_stop_with_eoa_and_svl_at_same_location(etcs_scenario: Scenario, etcs_rolling_stock: int):
rolling_stock_response = requests.get(EDITOAST_URL + f"light_rolling_stock/{etcs_rolling_stock}")
etcs_rolling_stock_name = rolling_stock_response.json()["name"]
ts_response = requests.post(
f"{EDITOAST_URL}timetable/{etcs_scenario.timetable}/train_schedules/",
json=[
{
"train_name": "brake from MRSP: max_speed + EoA and SvL at same location",
"labels": [],
"rolling_stock_name": etcs_rolling_stock_name,
"start_time": "2024-01-01T07:00:00Z",
"path": [
{"id": "zero", "track": "TA0", "offset": 862_000},
{"id": "first", "track": "TH0", "offset": 1_000_000},
{"id": "last", "track": "TH1", "offset": 3_922_000},
],
"schedule": [
{"at": "zero", "stop_for": "P0D"},
{"at": "first", "stop_for": "PT10S"},
{"at": "last", "stop_for": "P0D"},
],
"margins": {"boundaries": [], "values": ["0%"]},
"initial_speed": 0,
"comfort": "STANDARD",
"constraint_distribution": "STANDARD",
"speed_limit_tag": "foo",
"power_restrictions": [],
}
],
)

schedule = ts_response.json()[0]
schedule_id = schedule["id"]
ts_id_response = requests.get(f"{EDITOAST_URL}train_schedule/{schedule_id}/")
ts_id_response.raise_for_status()
simu_response = requests.get(
f"{EDITOAST_URL}train_schedule/{schedule_id}/simulation?infra_id={etcs_scenario.infra}"
)
simulation_final_output = simu_response.json()["final_output"]

assert len(simulation_final_output["positions"]) == len(simulation_final_output["speeds"])

# To debug this test: please add a breakpoint then use front to display speed-space chart
# (activate Context for Slopes and Speed limits).

# This case hits an LoA curve (slowdown of the MRSP), but it's not the point to test it here.

# Check that the curves does respect the EoA + SvL (EoA = stops), and that there is an
# acceleration then deceleration in between (maintain speed when reach the MRSP).
first_stop_offset = 41_138_000
final_stop_offset = 45_060_000
stop_offsets = [
0,
first_stop_offset,
final_stop_offset,
]

# Check null speed at stops
for stop_offset in stop_offsets:
assert _get_current_or_next_speed_at(simulation_final_output, stop_offset) == 0

# Check only one acceleration then only one deceleration between stops
for offset_index in range(1, len(stop_offsets) - 1):
accelerating = True
prev_speed = 0
start_pos_index = bisect.bisect_left(simulation_final_output["positions"], stop_offsets[offset_index - 1])
end_pos_index = bisect.bisect_left(simulation_final_output["positions"], stop_offsets[offset_index])
for pos_index in range(start_pos_index, end_pos_index):
current_speed = simulation_final_output["speeds"][pos_index]
if accelerating:
if prev_speed > current_speed:
accelerating = False
else:
assert prev_speed >= current_speed
prev_speed = current_speed

# Check that the braking curve starts and ends at the expected offsets.
offset_start_first_brake = 33_461_545
speed_before_first_brake = _get_current_or_next_speed_at(simulation_final_output, offset_start_first_brake)
_assert_equal_speeds(speed_before_first_brake, MAX_SPEED_288)
assert (
_get_current_or_next_speed_at(simulation_final_output, offset_start_first_brake + 1) < speed_before_first_brake
)
# Check a bending point for the first stop's braking curve (where the Guidance curve's influence stops).
offset_bending_guidance_point = 37_279_507
speed_at_bending_guidance_point = _get_current_or_next_speed_at(
simulation_final_output, offset_bending_guidance_point
)
_assert_equal_speeds(speed_at_bending_guidance_point, kph2ms(223.112_006_6))
# Check that the release part (where the speed stays at 40km/h) starts and ends at the expected offsets.
offset_start_release_speed = 40_827_882
speed_at_start_release_speed = _get_current_or_next_speed_at(simulation_final_output, offset_start_release_speed)
_assert_equal_speeds(speed_at_start_release_speed, kph2ms(40))
offset_end_release_speed = 40_892_792
speed_at_end_release_speed = _get_current_or_next_speed_at(simulation_final_output, offset_end_release_speed)
_assert_equal_speeds(speed_at_end_release_speed, kph2ms(40))


def test_etcs_schedule_result_stop_with_eoa_and_svl_at_different_locations(
etcs_scenario: Scenario, etcs_rolling_stock: int
):
rolling_stock_response = requests.get(EDITOAST_URL + f"light_rolling_stock/{etcs_rolling_stock}")
etcs_rolling_stock_name = rolling_stock_response.json()["name"]
ts_response = requests.post(
f"{EDITOAST_URL}timetable/{etcs_scenario.timetable}/train_schedules/",
json=[
{
"train_name": "brake from MRSP: max_speed + EoA and SvL 200m after EoA",
"labels": [],
"rolling_stock_name": etcs_rolling_stock_name,
"start_time": "2024-01-01T07:00:00Z",
"path": [
{"id": "zero", "track": "TA0", "offset": 862_000},
{"id": "first", "track": "TH0", "offset": 800_000},
{"id": "last", "track": "TH1", "offset": 3_922_000},
],
"schedule": [
{"at": "zero", "stop_for": "P0D"},
{"at": "first", "stop_for": "PT10S"},
{"at": "last", "stop_for": "P0D"},
],
"margins": {"boundaries": [], "values": ["0%"]},
"initial_speed": 0,
"comfort": "STANDARD",
"constraint_distribution": "STANDARD",
"speed_limit_tag": "foo",
"power_restrictions": [],
}
],
)

schedule = ts_response.json()[0]
schedule_id = schedule["id"]
ts_id_response = requests.get(f"{EDITOAST_URL}train_schedule/{schedule_id}/")
ts_id_response.raise_for_status()
simu_response = requests.get(
f"{EDITOAST_URL}train_schedule/{schedule_id}/simulation?infra_id={etcs_scenario.infra}"
)
simulation_final_output = simu_response.json()["final_output"]

assert len(simulation_final_output["positions"]) == len(simulation_final_output["speeds"])

# To debug this test: please add a breakpoint then use front to display speed-space chart
# (activate Context for Slopes and Speed limits).

# This case hits an LoA curve (slowdown of the MRSP), but it's not the point to test it here.

# Check that the curves does respect the EoA + SvL (EoA = stops), and that there is an
# acceleration then deceleration in between (maintain speed when reach the MRSP).
# Here, the EoA is at 40938m, and the SvL is at the switch at 41138m.
first_stop_offset = 40_938_000
final_stop_offset = 45_060_000
stop_offsets = [
0,
first_stop_offset,
final_stop_offset,
]

# Check null speed at stops
for stop_offset in stop_offsets:
assert _get_current_or_next_speed_at(simulation_final_output, stop_offset) == 0

# Check only one acceleration then only one deceleration between stops
for offset_index in range(1, len(stop_offsets) - 1):
accelerating = True
prev_speed = 0
start_pos_index = bisect.bisect_left(simulation_final_output["positions"], stop_offsets[offset_index - 1])
end_pos_index = bisect.bisect_left(simulation_final_output["positions"], stop_offsets[offset_index])
for pos_index in range(start_pos_index, end_pos_index):
current_speed = simulation_final_output["speeds"][pos_index]
if accelerating:
if prev_speed > current_speed:
accelerating = False
else:
assert prev_speed >= current_speed
prev_speed = current_speed

# Check that the braking curve starts and ends at the expected offsets.
offset_start_first_brake = 33_261_530
speed_before_first_brake = _get_current_or_next_speed_at(simulation_final_output, offset_start_first_brake)
_assert_equal_speeds(speed_before_first_brake, MAX_SPEED_288)
assert (
_get_current_or_next_speed_at(simulation_final_output, offset_start_first_brake + 1) < speed_before_first_brake
)
# Check the first bending point for the first stop's braking curve (where the Guidance curve's influence stops).
offset_bending_guidance_point = 37_240_601
speed_at_bending_guidance_point = _get_current_or_next_speed_at(
simulation_final_output, offset_bending_guidance_point
)
_assert_equal_speeds(speed_at_bending_guidance_point, kph2ms(219.751_941_6))
# Check the second bending point for the first stop's braking curve, where the indication curve followed switches
# from the SvL indication curve to the EoA indication curve.
offset_bending_point_svl_to_eoa = 40_269_286
speed_at_start_release_speed = _get_current_or_next_speed_at(
simulation_final_output, offset_bending_point_svl_to_eoa
)
_assert_equal_speeds(speed_at_start_release_speed, kph2ms(84.375_979_2))


def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_stock: int):
rolling_stock_response = requests.get(EDITOAST_URL + f"light_rolling_stock/{etcs_rolling_stock}")
etcs_rolling_stock_name = rolling_stock_response.json()["name"]
Expand Down

0 comments on commit ce5a895

Please sign in to comment.