Skip to content

Commit 14a970c

Browse files
committed
fixup! fixup! tests: add ETCS LoA (slowdown) tests on speed-space chart
remove anticipation of MRSP from driver behavior Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>
1 parent 4f9f4c8 commit 14a970c

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

tests/tests/test_train_schedule.py

+13-11
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,13 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
375375
# Check that the braking curves for limits of Authority (LoA = slowdowns of the MRSP) start and end at the
376376
# expected offset.
377377
# Also check a bending point for the first curve (where Guidance curve's influence stops).
378-
# Note: the end of the braking is upstream of the actual MRSP slowdown's target as per the offset applied to
379-
# LoA braking curves.
378+
# Notes:
379+
# * the end of the braking is upstream of the actual MRSP slowdown's target as per the offset applied to
380+
# LoA braking curves.
381+
# * the initial target for ETCS is the actual MRSP, not adding any anticipation from driver behavior.
380382

381383
# First slowdown
382-
offset_start_brake_288_to_142 = 35_051_929
384+
offset_start_brake_288_to_142 = 35_151_929
383385
speed_before_brake_288_to_142 = _get_current_or_next_speed_at(
384386
simulation_final_output, offset_start_brake_288_to_142
385387
)
@@ -389,13 +391,13 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
389391
< speed_before_brake_288_to_142
390392
)
391393

392-
offset_bending_guidance_point = 38_176_509
394+
offset_bending_guidance_point = 38_276_509
393395
speed_at_bending_guidance_point = _get_current_or_next_speed_at(
394396
simulation_final_output, offset_bending_guidance_point
395397
)
396398
_assert_equal_speeds(speed_at_bending_guidance_point, kph2ms(235.901_491_880_851_1))
397399

398-
offset_end_brake_288_to_142 = 40_724_374
400+
offset_end_brake_288_to_142 = 40_824_374
399401
speed_after_brake_288_to_142 = _get_current_or_next_speed_at(simulation_final_output, offset_end_brake_288_to_142)
400402
assert (
401403
_get_current_or_prev_speed_at(simulation_final_output, offset_end_brake_288_to_142 - 1)
@@ -404,7 +406,7 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
404406
_assert_equal_speeds(speed_after_brake_288_to_142, SPEED_LIMIT_142)
405407

406408
# Second slowdown
407-
offset_start_brake_142_to_120 = 44_313_934
409+
offset_start_brake_142_to_120 = 44_413_934
408410
speed_before_brake_142_to_120 = _get_current_or_next_speed_at(
409411
simulation_final_output, offset_start_brake_142_to_120
410412
)
@@ -413,7 +415,7 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
413415
_get_current_or_next_speed_at(simulation_final_output, offset_start_brake_142_to_120 + 1)
414416
< speed_before_brake_142_to_120
415417
)
416-
offset_end_brake_142_to_120 = 44_848_053
418+
offset_end_brake_142_to_120 = 44_948_053
417419
speed_after_brake_142_to_120 = _get_current_or_next_speed_at(simulation_final_output, offset_end_brake_142_to_120)
418420
assert (
419421
_get_current_or_prev_speed_at(simulation_final_output, offset_end_brake_142_to_120 - 1)
@@ -422,14 +424,14 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
422424
_assert_equal_speeds(speed_after_brake_142_to_120, SPEED_LIMIT_112)
423425

424426
# Slowdown for Safety Speed stop: should probably disappear for ETCS at some point.
425-
offset_start_brake_120_to_30 = 45_536_480
427+
offset_start_brake_120_to_30 = 45_636_480
426428
speed_before_brake_120_to_30 = _get_current_or_next_speed_at(simulation_final_output, offset_start_brake_120_to_30)
427429
_assert_equal_speeds(speed_before_brake_120_to_30, SPEED_LIMIT_112)
428430
assert (
429431
_get_current_or_next_speed_at(simulation_final_output, offset_start_brake_120_to_30 + 1)
430432
< speed_before_brake_120_to_30
431433
)
432-
offset_end_brake_120_to_30 = 46_554_045
434+
offset_end_brake_120_to_30 = 46_654_045
433435
speed_after_brake_120_to_30 = _get_current_or_next_speed_at(simulation_final_output, offset_end_brake_120_to_30)
434436
assert (
435437
_get_current_or_prev_speed_at(simulation_final_output, offset_end_brake_120_to_30 - 1)
@@ -438,14 +440,14 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
438440
_assert_equal_speeds(speed_after_brake_120_to_30, SAFE_SPEED_30)
439441

440442
# Slowdown for short slip stop: should probably disappear for ETCS at some point.
441-
offset_start_brake_30_to_10 = 46_597_240
443+
offset_start_brake_30_to_10 = 46_697_240
442444
speed_before_brake_30_to_10 = _get_current_or_next_speed_at(simulation_final_output, offset_start_brake_30_to_10)
443445
_assert_equal_speeds(speed_before_brake_30_to_10, SAFE_SPEED_30)
444446
assert (
445447
_get_current_or_next_speed_at(simulation_final_output, offset_start_brake_30_to_10 + 1)
446448
< speed_before_brake_30_to_10
447449
)
448-
offset_end_brake_30_to_10 = 46_748_388
450+
offset_end_brake_30_to_10 = 46_848_388
449451
speed_after_brake_30_to_10 = _get_current_or_next_speed_at(simulation_final_output, offset_end_brake_30_to_10)
450452
assert (
451453
_get_current_or_prev_speed_at(simulation_final_output, offset_end_brake_30_to_10 - 1)

0 commit comments

Comments
 (0)