18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-20 22:04:59 +01:00

AI: shunting brakes for a stop point again; test mode: no false SPAD for a train set across a signal (#409)

* fix(ai): shunting AI brakes for a stop point again, the braking curve doesn't plan from a brake table left at zero

The braking curve outside the final approach plans from the consist brake table since ce87aa0e (#187, merged
with #264) whenever the brake is pneumatic. That table is worked out only for train running (Obey_train, Bank);
in shunting it stays at zero, the planned full braking falls to its floor of 0.01 m/s2, and the demand comes out
at a few hundredths of a m/s2, above the shunting brake threshold of -0.2. A shunting engine then rolled on
without braking until the final approach, too late, and ran through the signal it was to stop at (seed
480873929 of l053_poranek: ep07p-2003 at sandomierz_g4_sem_info, sm42-1096, et22-654).

With no worked out table the curve is again the constant deceleration over the distance left, as it was before
ce87aa0e and as #187 meant to keep it for shunting. Train running is unchanged.

The curve moves out of TController into vehicle/brakingcurve.{h,cpp} so that it is unit tested:
tests/unit/test_braking_curve.cpp checks a shunting engine braking to a stop point with the zeroed table, and
that a train with a worked out table gets the same demand as before.

* test(ai): pin the train braking-curve demand to the results of the code before the move

A brake table that grips harder as the train slows and a gradient, so that a wrong gravity sign, table index or a dropped term in the shaped demand shows; the expected values were worked out with the code removed from TController::adjust_desired_speed_for_braking_curve.

* fix(test): a train set across a signal doesn't pass it at danger the moment the AI first looks at it

The speed table takes in events up to a train length behind the head, so a signal the train stands across at the start of a scenario is found already behind the head, becomes elapsed on its first update, and the test mode reported it as passed at danger (calkowo_lotos: st43-189 at mac_daleko3_sem_info, manewrowo3: st43-100 at suw_szopa_a02_sem_info, both at 13.6 s with the train at a stand, the signal 20 m behind the head). A point now counts as passed only when the head of the train had it ahead once; the blackbox record of passed signals follows the same rule.

* fix(test): a signal found up to 5 m behind the head still counts as seen ahead

The distance to an event is found in steps of a metre from the position of its memory cell, so a signal just ahead of the head (a train stopped short of it when the autopilot takes over, or set right at it at the start) could come out slightly behind it, and passing it would not be reported. The trains set across a signal that the previous commit is about stood 20 m past it.

Still not reported: a signal crossed while the speed table is being traced anew in motion (a Timetable: command to a running train, the autopilot taking over in motion), as it is found behind the head when the trace is made.

* docs(test): say what the seen-ahead tolerance gives up

A train set less than 5 m past a signal at stop is still reported to pass it at danger: standing that close it can't be told from a train stopped just short of the signal, which the tolerance is there for.

---------

Co-authored-by: maj00r <maj00r@host>
This commit is contained in:
maj00r
2026-11-19 04:55:33 +01:00
committed by GitHub
parent 80fd5aad2b
commit 267d5b3a8f
6 changed files with 366 additions and 86 deletions

View File

@@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/.
#include "utilities/physicslog.h"
#include "vehicle/Train.h"
#include "vehicle/brakesetting.h"
#include "vehicle/brakingcurve.h"
#include "vehicle/handover.h"
#include "world/mtable.h"
#include "vehicle/DynObj.h"
@@ -210,6 +211,7 @@ void TSpeedPos::Clear()
fSectionVelocityDist = 0.0; //brak długości
fPointDist = 0.0;
fDist = 0.0;
bSeenAhead = false;
vPos = glm::dvec3(0, 0, 0);
trTrack = nullptr; // brak wskaźnika
};
@@ -326,6 +328,9 @@ bool TSpeedPos::Update()
// trzeba zazanaczyć, że minięty
iFlags |= spElapsed;
}
else {
bSeenAhead = true;
}
if (iFlags & spTrack) {
// road/track
if (trTrack) {
@@ -411,9 +416,18 @@ bool TSpeedPos::IsProperSemaphor(TOrders order)
return false; // true gdy zatrzymanie, wtedy nie ma po co skanować dalej
}
// how far behind the head an event found in the scan may lie and still count as one the head had ahead [m]
constexpr double SeenAheadTolerance { 5.0 };
bool TSpeedPos::Set(basic_event *event, double dist, double length, TOrders order)
{ // zapamiętanie zdarzenia
fDist = dist;
// an event already behind the head when found (under a train set across a signal) wasn't passed by it. the
// distance is found in steps of a metre from the position of the memory cell, so a signal just ahead of the head
// may come out a few metres behind it: those still count as seen ahead. the price is that a train set less than
// the tolerance past a signal at stop is still reported to pass it; a train standing that close to a signal can't
// be told from one stopped just short of it, which really passes the signal if it goes on
bSeenAhead = ( dist >= -SeenAheadTolerance );
iFlags = spEvent;
evEvent = event;
vPos = event->input_location(); // współrzędne eventu albo komórki pamięci (zrzutować na tor?)
@@ -908,6 +922,7 @@ void TController::CheckSignalPassed( TSpeedPos const &Point, bool const Passedbe
{
if( Passedbefore
|| false == TestFlag( Point.iFlags, spElapsed )
|| false == Point.bSeenAhead // found already behind the head: the train stood across it, it didn't pass it
|| ( mvOccupied->CategoryFlag & 1 ) == 0 ) { // railway only
return;
}
@@ -8189,54 +8204,6 @@ uphill_coasting_speed( double const Distance, double const Gravity ) {
return 3.6 * std::sqrt( 2.0 * std::max( 0.01, -Gravity ) * std::max( 0.0, Distance ) );
}
// resultant acceleration [m/s2] to ask for now so that a steady application of the pneumatic brake takes the train
// from Velocity down to Target [km/h] over Distance [m], with the brake force following the speed the way the
// consist brake table says it does (cast iron blocks grip harder as the train slows)
struct consist_brake_table {
double const *a0; // deceleration at handle position 1, by speed
double const *a1; // deceleration added by each quarter of a position, by speed
int size; // entries, up to the vehicle's top speed
double vmax; // the vehicle's top speed [km/h]
// deceleration [m/s2] of a full service application at Kmh
double full_braking( double const Kmh ) const {
auto const index { std::clamp( static_cast<int>( size * Kmh / std::max( 1.0, vmax ) ), 1, size ) };
return std::max( 0.01, a0[ index ] + 12.0 * a1[ index ] ); }
};
static double
shaped_braking_demand(
double const Velocity, double const Target, double const Distance, double const Gravity,
consist_brake_table const &Table ) {
auto const fullbraking = [&Table]( double const Kmh ) {
return Table.full_braking( Kmh ); };
auto const travel = [Velocity, Target, Gravity, &fullbraking]( double const Ratio ) {
auto const steps { 24 };
auto const step { ( Velocity - Target ) / steps };
auto distance { 0.0 };
for( auto i { 0 }; i < steps; ++i ) {
auto const kmh { Target + ( i + 0.5 ) * step };
auto const deceleration { Ratio * fullbraking( kmh ) - Gravity };
if( deceleration <= 0.001 ) {
return std::numeric_limits<double>::max();
}
distance += ( kmh / 3.6 ) * ( step / 3.6 ) / deceleration;
}
return distance; };
auto low { 0.0 };
auto high { 3.0 };
if( travel( high ) > Distance ) {
return Gravity - high * fullbraking( Velocity );
}
for( auto i { 0 }; i < 30; ++i ) {
auto const middle { 0.5 * ( low + high ) };
( travel( middle ) > Distance ? low : high ) = middle;
}
return Gravity - high * fullbraking( Velocity );
}
// outside of max safe range: follow the braking curve down to the speed ahead, Vel is the present speed in the
// direction of travel
void
@@ -8263,43 +8230,19 @@ TController::adjust_desired_speed_for_braking_curve( double const Vel ) {
( VelNext == 0.0 ) && is_train() && ( OrderCurrentGet() & Obey_train ) ?
stopping_margin() : // the same stopping point as the final approach
VelNext * braking_distance_multiplier( static_cast<float>( VelNext ) ) );
// a pneumatic brake acts on the state the train will be in once it has responded; while the
// train is still speeding up, plan the deceleration from there, so more is asked for at once
auto velocity { Vel };
auto distance { ActualProximityDist };
if( ( BrakeSystem == TBrakeSystem::Pneumatic )
&& ( AbsAccS > 0.0 ) ) {
auto const horizon { brake_response_horizon( mvOccupied, BrakeSystem, AbsAccS, fBrake_a0[ 0 ] ) };
velocity = Vel + 3.6 * horizon * AbsAccS;
distance = std::max( 0.5 * ActualProximityDist, ActualProximityDist - ( Vel + velocity ) * 0.5 / 3.6 * horizon );
}
auto const brakingroom {
std::max(
distance - brakingpointoffset,
std::min(
distance,
brakingpointoffset ) ) };
auto deceleration { ( VelNext * VelNext - velocity * velocity ) / ( 25.92 * brakingroom + 0.1 ) };
if( ( BrakeSystem == TBrakeSystem::Pneumatic ) && ( velocity > VelNext ) ) {
// follow the shape of the consist brake force over speed rather than assume a constant
// deceleration, over the distance left once the brake has had time to fill (while the
// train is still speeding up, the prediction above has taken that off already)
auto room { brakingroom };
if( ( AbsAccS <= 0.0 )
&& ( BrakeCtrlPosition <= 0.0 ) ) { // only while the brake is still to be applied: once it acts, the room it needs to respond is behind
// making for a passenger stop only the time the brake takes to fill: the look-ahead the horizon
// keeps as its floor was set for the stops at a signal, and a vehicle that brakes with its
// independent brake, which leaves the train brake handle where it is, kept braking earlier
// and earlier the whole way in, to crawl the last tens of metres to the stop point
auto const brakea0 { bStopTargetIsPassengerStop ? 1.0 : fBrake_a0[ 0 ] };
room = std::max(
0.5 * brakingroom,
brakingroom - Vel / 3.6 * brake_response_horizon( mvOccupied, BrakeSystem, 1.0, brakea0 ) );
}
deceleration = shaped_braking_demand(
velocity, VelNext, room + 0.1 / 25.92, fAccGravity,
{ fBrake_a0, fBrake_a1, BrakeAccTableSize, mvOccupied->Vmax } );
}
// both plans of a pneumatic brake are made from the brake table of the consist; with none (in shunting it isn't
// worked out) the braking curve is the constant deceleration over the distance left, as before them
braking_curve::brake_table const braketable { fBrake_a0, fBrake_a1, BrakeAccTableSize, mvOccupied->Vmax };
// making for a passenger stop only the time the brake takes to fill: the look-ahead the horizon
// keeps as its floor was set for the stops at a signal, and a vehicle that brakes with its
// independent brake, which leaves the train brake handle where it is, kept braking earlier
// and earlier the whole way in, to crawl the last tens of metres to the stop point
auto const fillbrakea0 { bStopTargetIsPassengerStop ? 1.0 : fBrake_a0[ 0 ] };
braking_curve::approach const approach {
Vel, VelNext, ActualProximityDist, brakingpointoffset, fAccGravity, AbsAccS, BrakeCtrlPosition > 0.0,
brake_response_horizon( mvOccupied, BrakeSystem, AbsAccS, fBrake_a0[ 0 ] ),
brake_response_horizon( mvOccupied, BrakeSystem, 1.0, fillbrakea0 ) };
auto const deceleration { braking_curve::demand( approach, BrakeSystem == TBrakeSystem::Pneumatic ? &braketable : nullptr ) };
AccDesired = std::min( AccDesired, deceleration ); // najpierw hamuje mocniej, potem zluzuje
if( Vel <= VelNext ) {
return;
@@ -8350,7 +8293,7 @@ TController::adjust_desired_speed_for_final_approach( double const Vel ) {
AccDesired = (
BrakeSystem == TBrakeSystem::Pneumatic ?
// cast iron blocks grip harder as the train comes to a stand
shaped_braking_demand(
braking_curve::shaped_demand(
Vel, VelNext, stoppingroom, fAccGravity,
{ fBrake_a0, fBrake_a1, BrakeAccTableSize, mvOccupied->Vmax } ) :
( VelNext * VelNext - Vel * Vel ) / ( 25.92 * stoppingroom ) );

View File

@@ -164,6 +164,7 @@ class TSpeedPos
int iFlags{ spNone }; // flagi typu wpisu do tabelki
bool bMoved{ false }; // czy przesunięty (dotyczy punktu zatrzymania w peronie)
double fMoved{ 0.0 }; // ile przesunięty (dotyczy punktu zatrzymania w peronie)
bool bSeenAhead{ false }; // the head of the train had it ahead once: only such a point can be passed by the train
glm::dvec3 vPos; // współrzędne XYZ do liczenia odległości
struct
{

86
vehicle/brakingcurve.cpp Normal file
View File

@@ -0,0 +1,86 @@
/*
This Source Code Form is subject to the
terms of the Mozilla Public License, v.
2.0. If a copy of the MPL was not
distributed with this file, You can
obtain one at
http://mozilla.org/MPL/2.0/.
*/
#include "stdafx.h"
#include "vehicle/brakingcurve.h"
#include <algorithm>
#include <limits>
namespace braking_curve {
double brake_table::full_braking(double const Kmh) const {
auto const index{std::clamp(static_cast<int>(size * Kmh / std::max(1.0, vmax)), 1, size)};
return std::max(0.01, a0[index] + 12.0 * a1[index]);
}
bool brake_table::known() const {
// a worked out table holds at least the rolling resistance term at every speed
return a0[size] > 0.0;
}
double shaped_demand(double const Velocity, double const Target, double const Distance, double const Gravity, brake_table const &Table) {
auto const travel = [Velocity, Target, Gravity, &Table](double const Ratio) {
auto const steps{24};
auto const step{(Velocity - Target) / steps};
auto distance{0.0};
for (auto i{0}; i < steps; ++i) {
auto const kmh{Target + (i + 0.5) * step};
auto const deceleration{Ratio * Table.full_braking(kmh) - Gravity};
if (deceleration <= 0.001) {
return std::numeric_limits<double>::max();
}
distance += (kmh / 3.6) * (step / 3.6) / deceleration;
}
return distance;
};
auto low{0.0};
auto high{3.0};
if (travel(high) > Distance) {
return Gravity - high * Table.full_braking(Velocity);
}
for (auto i{0}; i < 30; ++i) {
auto const middle{0.5 * (low + high)};
(travel(middle) > Distance ? low : high) = middle;
}
return Gravity - high * Table.full_braking(Velocity);
}
double demand(approach const &Approach, brake_table const *Pneumatictable) {
// a pneumatic brake acts on the state the train will be in once it has responded; while the
// train is still speeding up, plan the deceleration from there, so more is asked for at once
// both plans are made from the brake table of the consist; with none (in shunting it isn't worked out, and planning
// from its zeroes would ask for no braking at all) the braking curve is the constant deceleration over the distance left
auto const *table{(Pneumatictable != nullptr) && Pneumatictable->known() ? Pneumatictable : nullptr};
auto velocity{Approach.speed};
auto distance{Approach.distance};
if ((table != nullptr) && (Approach.acceleration > 0.0)) {
auto const horizon{Approach.speedup_horizon};
velocity = Approach.speed + 3.6 * horizon * Approach.acceleration;
distance = std::max(0.5 * Approach.distance, Approach.distance - (Approach.speed + velocity) * 0.5 / 3.6 * horizon);
}
auto const brakingroom{std::max(distance - Approach.offset, std::min(distance, Approach.offset))};
if ((table == nullptr) || (velocity <= Approach.target)) {
return (Approach.target * Approach.target - velocity * velocity) / (25.92 * brakingroom + 0.1);
}
// follow the shape of the consist brake force over speed rather than assume a constant
// deceleration, over the distance left once the brake has had time to fill (while the
// train is still speeding up, the prediction above has taken that off already)
auto room{brakingroom};
if ((Approach.acceleration <= 0.0) && (false == Approach.brake_applied)) {
// only while the brake is still to be applied: once it acts, the room it needs to respond is behind
room = std::max(0.5 * brakingroom, brakingroom - Approach.speed / 3.6 * Approach.fill_horizon);
}
return shaped_demand(velocity, Approach.target, room + 0.1 / 25.92, Approach.gravity, *table);
}
} // namespace braking_curve

54
vehicle/brakingcurve.h Normal file
View File

@@ -0,0 +1,54 @@
/*
This Source Code Form is subject to the
terms of the Mozilla Public License, v.
2.0. If a copy of the MPL was not
distributed with this file, You can
obtain one at
http://mozilla.org/MPL/2.0/.
*/
#pragma once
// the deceleration the AI asks for on its way down to a lower speed or a stop ahead, outside of the final
// approach (TController::adjust_desired_speed_for_braking_curve)
namespace braking_curve {
// the deceleration table of the consist brake, by speed (TController::fBrake_a0, fBrake_a1). it is worked out
// for a train only (Obey_train, Bank); in shunting it stays at zero
struct brake_table {
double const *a0; // deceleration at handle position 1, by speed; a0[1..size]
double const *a1; // deceleration added by each quarter of a position, by speed
int size; // entries, up to the vehicle's top speed
double vmax; // the vehicle's top speed [km/h]
// deceleration [m/s2] of a full service application at Kmh
double full_braking(double Kmh) const;
// whether the table is worked out
bool known() const;
};
// resultant acceleration [m/s2] to ask for now so that a steady application of the pneumatic brake takes the train
// from Velocity down to Target [km/h] over Distance [m], with the brake force following the speed the way the
// table says it does (cast iron blocks grip harder as the train slows)
double shaped_demand(double Velocity, double Target, double Distance, double Gravity, brake_table const &Table);
// where the train is on its way down to Target
struct approach {
double speed; // present speed in the direction of travel [km/h]
double target; // speed to get down to [km/h]
double distance; // to where the speed is to be down [m]
double offset; // the braking point that far short of it [m]
double gravity; // tangential acceleration of the gradient [m/s2], negative uphill
double acceleration; // present acceleration of the train [m/s2]
bool brake_applied; // the train brake handle is past running
double speedup_horizon; // how long the present acceleration lasts while speeding up [s]
double fill_horizon; // how long the brake takes to fill once applied [s]
};
// acceleration [m/s2] to ask for now, negative to brake. with the worked out table of a pneumatic brake
// (Pneumatictable) the demand follows the brake: planned from the state the train is in once the brake has
// responded, along the shape of its force over speed. without one (nullptr for another brake, or a table left at
// zero, as in shunting) it is the constant deceleration over the distance left
double demand(approach const &Approach, brake_table const *Pneumatictable);
} // namespace braking_curve