eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 13:59:19 +02:00
Code Issues 123 Wiki Activity

ai braking logic tweaks and bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-07-19 22:11:22 +02:00
parent cd10b72821
commit 460bf6d382
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Driver.cpp
View File

@@ -1421,7 +1421,7 @@ TController::braking_distance_multiplier( float const Targetvelocity ) const {
&& ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) && ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 )
|| ( fAccGravity > 0.025 ) ) { || ( fAccGravity > 0.025 ) ) {
return interpolate( return interpolate(
1.f, 3.f, 1.f, 2.f,
clamp( clamp(
( fBrake_a0[ 0 ] - 0.2 ) / 0.2, ( fBrake_a0[ 0 ] - 0.2 ) / 0.2,
0.0, 1.0 ) ); 0.0, 1.0 ) );
@@ -2680,7 +2680,7 @@ bool TController::DecBrake()
} }
} }
if (!OK) if (!OK)
OK = mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); OK = mvOccupied->DecLocalBrakeLevel(2);
if (mvOccupied->PipePress < 3.0) if (mvOccupied->PipePress < 3.0)
Need_BrakeRelease = true; Need_BrakeRelease = true;
break; break;
@@ -2704,7 +2704,7 @@ bool TController::DecBrake()
else else
OK = false; OK = false;
if (!OK) if (!OK)
OK = mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); OK = mvOccupied->DecLocalBrakeLevel(2);
break; break;
} }
return OK; return OK;
@@ -2752,12 +2752,12 @@ bool TController::IncSpeed()
// na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag)
if (Ready || (iDrivigFlags & movePress)) { if (Ready || (iDrivigFlags & movePress)) {
// use series mode: // use series mode:
// to build up speed to 30/40 km/h for passenger/cargo train (less if going uphill, more if downhill) // to build up speed to 30/40 km/h for passenger/cargo train (10 km/h less if going uphill)
// if high threshold is set for motor overload relay, // if high threshold is set for motor overload relay,
// if the power station is heavily burdened // if the power station is heavily burdened
auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV };
auto const useseriesmode = ( auto const useseriesmode = (
( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) + ( fAccGravity * 100 ) ) ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) - ( ( fAccGravity < -0.025 ) ? 10 : 0 ) )
|| ( mvControlling->Imax > mvControlling->ImaxLo ) || ( mvControlling->Imax > mvControlling->ImaxLo )
|| ( fVoltage < useseriesmodevoltage ) ); || ( fVoltage < useseriesmodevoltage ) );
// when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train
@@ -4301,6 +4301,10 @@ TController::UpdateSituation(double dt) {
// additional safety margin for cargo consists // additional safety margin for cargo consists
fMinProximityDist *= 2.0; fMinProximityDist *= 2.0;
fMaxProximityDist *= 2.0; fMaxProximityDist *= 2.0;
if( fBrake_a0[ 0 ] >= 0.35 ) {
// cargo trains with high braking threshold may require even larger safety margin
fMaxProximityDist += 20.0;
}
} }
} }
fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania
@@ -4335,7 +4339,11 @@ TController::UpdateSituation(double dt) {
if( mvOccupied->BrakeDelayFlag == bdelay_G ) { if( mvOccupied->BrakeDelayFlag == bdelay_G ) {
// increase distances for cargo trains to take into account slower reaction to brakes // increase distances for cargo trains to take into account slower reaction to brakes
fMinProximityDist += 10.0; fMinProximityDist += 10.0;
fMaxProximityDist += 10.0; fMaxProximityDist += 15.0;
if( fBrake_a0[ 0 ] >= 0.35 ) {
// cargo trains with high braking threshold may require even larger safety margin
fMaxProximityDist += 20.0;
}
} }
} }
else { else {

3
Train.cpp
View File

@@ -4365,7 +4365,8 @@ bool TTrain::Update( double const Deltatime )
// Odskakiwanie hamulce EP // Odskakiwanie hamulce EP
if( false == ( if( false == (
( input::command == user_command::trainbrakeset ) ( input::command == user_command::trainbrakeset )
|| ( input::command == user_command::trainbrakedecrease ) ) ) { || ( input::command == user_command::trainbrakedecrease )
|| ( input::command == user_command::trainbrakecharging ) ) ) {
set_train_brake( 0 ); set_train_brake( 0 );
} }
} }