mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-19 20:24:59 +01:00
AI: the passenger stop flag no longer turns itself on and off (#295)
Whether a train is at a passenger stop (IsAtPassengerStop) was checked against the final approach margins fMinProximityDist and fMaxProximityDist, which are themselves set from that flag: 10-15 m and 15-40 m at a stop, 8 m and 50 m otherwise. With the two sets different, the flag switched on and off on every other scan of the route on the way to a W4. Each time the train went from a final approach to a stop 50 m long to one 15 m long and back: braking in one scan, full power below the 10 km/h coasting speed in the next. Close to the stop the braking demand did not hold the train to a standstill, and below 1 km/h the stop counted as done, so an SN61 drove off without ever standing still (#290). The margins are now worked out in train_proximity_margins(), and the check of the stop uses the margins of a passenger stop whatever the flag is at the moment. A vehicle that is not a train keeps the present ones, as before.
This commit is contained in:
@@ -829,6 +829,45 @@ void TController::TableCheck(double fDistance)
|
|||||||
|
|
||||||
auto const passengerstopmaxdistance { 400.0 }; // maximum allowed distance between passenger stop point and consist head
|
auto const passengerstopmaxdistance { 400.0 }; // maximum allowed distance between passenger stop point and consist head
|
||||||
|
|
||||||
|
// the margins of the final approach of a train [m], closer than the first of which it stops at once and within the
|
||||||
|
// second of which it makes its final approach: at a passenger stop, or at a signal and anything else it stops at
|
||||||
|
std::pair<double, double>
|
||||||
|
TController::train_proximity_margins( bool const Passengerstop ) const {
|
||||||
|
|
||||||
|
auto minproximity { 0.0 };
|
||||||
|
auto maxproximity { 0.0 };
|
||||||
|
if( Passengerstop ) {
|
||||||
|
// a stop point keeps the margins its W4 parameters (head or middle of the consist,
|
||||||
|
// platform length) were set up against
|
||||||
|
minproximity = std::clamp( 5 + iVehicles, 10, 15 ) + ( IsCargoTrain ? 10.0 : 0.0 );
|
||||||
|
maxproximity = std::clamp( 10 + iVehicles, 15, 40 );
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// a train stops 8-15 m short of the signal whatever its length; closer than the lower
|
||||||
|
// edge it stops at once, the braking aims at the middle of the window, 3.5 m further out
|
||||||
|
minproximity = 8.0;
|
||||||
|
// the final approach begins far enough out to slow from the coasting speed down to the window,
|
||||||
|
// and at the same distance whether the train is moving or standing, so it does not flip
|
||||||
|
// between creeping closer and holding still when it comes to a stand short of the window
|
||||||
|
maxproximity = 50.0;
|
||||||
|
}
|
||||||
|
if( IsCargoTrain ) {
|
||||||
|
// start the final approach earlier for cargo trains, their brakes react more slowly
|
||||||
|
maxproximity += 10.0;
|
||||||
|
}
|
||||||
|
if( ( Global.FrictionWeatherFactor < 1.f )
|
||||||
|
&& ( iVehicles > 1 ) ) {
|
||||||
|
// take into account weather conditions
|
||||||
|
minproximity += 5.0;
|
||||||
|
maxproximity += 5.0;
|
||||||
|
}
|
||||||
|
if( mvOccupied->Vel < 0.1 ) {
|
||||||
|
// jak stanie za daleko, to niech nie dociąga paru metrów
|
||||||
|
maxproximity = std::max( maxproximity, 50.0 );
|
||||||
|
}
|
||||||
|
return { minproximity, maxproximity };
|
||||||
|
}
|
||||||
|
|
||||||
TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc)
|
TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc)
|
||||||
{ // ustalenie parametrów, zwraca typ komendy, jeśli sygnał podaje prędkość do jazdy
|
{ // ustalenie parametrów, zwraca typ komendy, jeśli sygnał podaje prędkość do jazdy
|
||||||
// fVelDes - prędkość zadana
|
// fVelDes - prędkość zadana
|
||||||
@@ -1152,14 +1191,20 @@ TController::TableUpdateStopPoint( TCommandType &Command, TSpeedPos &Point, doub
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// the margins of a passenger stop, whether the train is already making for it or not: the present ones
|
||||||
|
// depend on this very flag, and a check against them would turn it on and off every other scan
|
||||||
|
auto const [ stopminproximity, stopmaxproximity ] {
|
||||||
|
is_train() ?
|
||||||
|
train_proximity_margins( true ) :
|
||||||
|
std::pair{ fMinProximityDist, fMaxProximityDist } };
|
||||||
IsAtPassengerStop = Point.fDist <= passengerstopmaxdistance
|
IsAtPassengerStop = Point.fDist <= passengerstopmaxdistance
|
||||||
// Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości
|
// Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości
|
||||||
// peronu, chyba że pociąg jest dłuższy, to wtedy minimalna.
|
// peronu, chyba że pociąg jest dłuższy, to wtedy minimalna.
|
||||||
// jeśli długość peronu ((sSpeedTable[i].evEvent->ValueGet(2)) nie podana,
|
// jeśli długość peronu ((sSpeedTable[i].evEvent->ValueGet(2)) nie podana,
|
||||||
// przyjąć odległość fMinProximityDist
|
// przyjąć odległość fMinProximityDist
|
||||||
&& ((iDrivigFlags & moveStopCloser) != 0 ?
|
&& ((iDrivigFlags & moveStopCloser) != 0 ?
|
||||||
Point.fDist + fLength + (Point.fMoved - fMinProximityDist * 0.5f) <= std::max(std::abs(Point.evEvent->input_value(2)),
|
Point.fDist + fLength + (Point.fMoved - stopminproximity * 0.5f) <= std::max(std::abs(Point.evEvent->input_value(2)),
|
||||||
2.0 * fMaxProximityDist + fLength) : // fmaxproximitydist typically equals ~50 m
|
2.0 * stopmaxproximity + fLength) :
|
||||||
Point.fDist < Signaldistance);
|
Point.fDist < Signaldistance);
|
||||||
|
|
||||||
if( !eSignNext ) {
|
if( !eSignNext ) {
|
||||||
@@ -6677,47 +6722,9 @@ TController::determine_proximity_ranges() {
|
|||||||
// na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody
|
// na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody
|
||||||
// jeśli pociąg
|
// jeśli pociąg
|
||||||
if( is_train() ) {
|
if( is_train() ) {
|
||||||
if( IsAtPassengerStop ) {
|
auto const [ minproximity, maxproximity ] { train_proximity_margins( IsAtPassengerStop ) };
|
||||||
// a stop point keeps the margins its W4 parameters (head or middle of the consist,
|
fMinProximityDist = minproximity;
|
||||||
// platform length) were set up against
|
fMaxProximityDist = maxproximity;
|
||||||
fMinProximityDist = std::clamp( 5 + iVehicles, 10, 15 );
|
|
||||||
fMaxProximityDist = std::clamp( 10 + iVehicles, 15, 40 );
|
|
||||||
if( IsCargoTrain ) {
|
|
||||||
fMinProximityDist += 10.0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// a train stops 8-15 m short of the signal whatever its length; closer than the lower
|
|
||||||
// edge it stops at once, the braking aims at the middle of the window, 3.5 m further out
|
|
||||||
fMinProximityDist = 8.0;
|
|
||||||
// the final approach begins far enough out to slow from the coasting speed down to the window,
|
|
||||||
// and at the same distance whether the train is moving or standing, so it does not flip
|
|
||||||
// between creeping closer and holding still when it comes to a stand short of the window
|
|
||||||
fMaxProximityDist = 50.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( IsCargoTrain ) {
|
|
||||||
// start the final approach earlier for cargo trains, their brakes react more slowly
|
|
||||||
fMaxProximityDist += 10.0;
|
|
||||||
/*
|
|
||||||
if( IsHeavyCargoTrain ) {
|
|
||||||
// cargo trains with high braking threshold may require even larger safety margin
|
|
||||||
fMaxProximityDist += 20.0;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Global.FrictionWeatherFactor < 1.f
|
|
||||||
&& iVehicles > 1 ) {
|
|
||||||
// take into account weather conditions
|
|
||||||
fMinProximityDist += 5.0;
|
|
||||||
fMaxProximityDist += 5.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( mvOccupied->Vel < 0.1 ) {
|
|
||||||
// jak stanie za daleko, to niech nie dociąga paru metrów
|
|
||||||
fMaxProximityDist = std::max( fMaxProximityDist, 50.0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
if( iDrivigFlags & moveLate ) {
|
if( iDrivigFlags & moveLate ) {
|
||||||
// jeśli spóźniony, to gna
|
// jeśli spóźniony, to gna
|
||||||
|
|||||||
@@ -312,6 +312,7 @@ private:
|
|||||||
return mvOccupied->Vel * sign( iDirection * mvOccupied->V ); }
|
return mvOccupied->Vel * sign( iDirection * mvOccupied->V ); }
|
||||||
|
|
||||||
double brake_increase_margin() const;
|
double brake_increase_margin() const;
|
||||||
|
std::pair<double, double> train_proximity_margins( bool const Passengerstop ) const;
|
||||||
|
|
||||||
void update_timers( double const dt );
|
void update_timers( double const dt );
|
||||||
void update_logs( double const dt );
|
void update_logs( double const dt );
|
||||||
|
|||||||
Reference in New Issue
Block a user