@@ -375,11 +375,13 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
375
375
# Check that the braking curves for limits of Authority (LoA = slowdowns of the MRSP) start and end at the
376
376
# expected offset.
377
377
# 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.
380
382
381
383
# First slowdown
382
- offset_start_brake_288_to_142 = 35_051_929
384
+ offset_start_brake_288_to_142 = 35_151_929
383
385
speed_before_brake_288_to_142 = _get_current_or_next_speed_at (
384
386
simulation_final_output , offset_start_brake_288_to_142
385
387
)
@@ -389,13 +391,13 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
389
391
< speed_before_brake_288_to_142
390
392
)
391
393
392
- offset_bending_guidance_point = 38_176_509
394
+ offset_bending_guidance_point = 38_276_509
393
395
speed_at_bending_guidance_point = _get_current_or_next_speed_at (
394
396
simulation_final_output , offset_bending_guidance_point
395
397
)
396
398
_assert_equal_speeds (speed_at_bending_guidance_point , kph2ms (235.901_491_880_851_1 ))
397
399
398
- offset_end_brake_288_to_142 = 40_724_374
400
+ offset_end_brake_288_to_142 = 40_824_374
399
401
speed_after_brake_288_to_142 = _get_current_or_next_speed_at (simulation_final_output , offset_end_brake_288_to_142 )
400
402
assert (
401
403
_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
404
406
_assert_equal_speeds (speed_after_brake_288_to_142 , SPEED_LIMIT_142 )
405
407
406
408
# Second slowdown
407
- offset_start_brake_142_to_120 = 44_313_934
409
+ offset_start_brake_142_to_120 = 44_413_934
408
410
speed_before_brake_142_to_120 = _get_current_or_next_speed_at (
409
411
simulation_final_output , offset_start_brake_142_to_120
410
412
)
@@ -413,7 +415,7 @@ def test_etcs_schedule_result_slowdowns(etcs_scenario: Scenario, etcs_rolling_st
413
415
_get_current_or_next_speed_at (simulation_final_output , offset_start_brake_142_to_120 + 1 )
414
416
< speed_before_brake_142_to_120
415
417
)
416
- offset_end_brake_142_to_120 = 44_848_053
418
+ offset_end_brake_142_to_120 = 44_948_053
417
419
speed_after_brake_142_to_120 = _get_current_or_next_speed_at (simulation_final_output , offset_end_brake_142_to_120 )
418
420
assert (
419
421
_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
422
424
_assert_equal_speeds (speed_after_brake_142_to_120 , SPEED_LIMIT_112 )
423
425
424
426
# 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
426
428
speed_before_brake_120_to_30 = _get_current_or_next_speed_at (simulation_final_output , offset_start_brake_120_to_30 )
427
429
_assert_equal_speeds (speed_before_brake_120_to_30 , SPEED_LIMIT_112 )
428
430
assert (
429
431
_get_current_or_next_speed_at (simulation_final_output , offset_start_brake_120_to_30 + 1 )
430
432
< speed_before_brake_120_to_30
431
433
)
432
- offset_end_brake_120_to_30 = 46_554_045
434
+ offset_end_brake_120_to_30 = 46_654_045
433
435
speed_after_brake_120_to_30 = _get_current_or_next_speed_at (simulation_final_output , offset_end_brake_120_to_30 )
434
436
assert (
435
437
_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
438
440
_assert_equal_speeds (speed_after_brake_120_to_30 , SAFE_SPEED_30 )
439
441
440
442
# 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
442
444
speed_before_brake_30_to_10 = _get_current_or_next_speed_at (simulation_final_output , offset_start_brake_30_to_10 )
443
445
_assert_equal_speeds (speed_before_brake_30_to_10 , SAFE_SPEED_30 )
444
446
assert (
445
447
_get_current_or_next_speed_at (simulation_final_output , offset_start_brake_30_to_10 + 1 )
446
448
< speed_before_brake_30_to_10
447
449
)
448
- offset_end_brake_30_to_10 = 46_748_388
450
+ offset_end_brake_30_to_10 = 46_848_388
449
451
speed_after_brake_30_to_10 = _get_current_or_next_speed_at (simulation_final_output , offset_end_brake_30_to_10 )
450
452
assert (
451
453
_get_current_or_prev_speed_at (simulation_final_output , offset_end_brake_30_to_10 - 1 )
0 commit comments