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

replace new clamps with std::clamp and to_string with std::string

Browse Source
This commit is contained in:
docentYT
2026-05-05 23:40:59 +02:00
parent 4a67b4b2a9
commit e06ae37f47
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
McZapkie/Mover.cpp
View File

@@ -3924,7 +3924,7 @@ bool TMoverParameters::DynamicBrakeLevelSet(double Position)
{ {
if (false == SplitEDPneumaticBrake) if (false == SplitEDPneumaticBrake)
return false; return false;
DynamicBrakeCtrlPos = clamp(Position, 0.0, 1.0); DynamicBrakeCtrlPos = std::clamp(Position, 0.0, 1.0);
return true; return true;
} }
@@ -3936,7 +3936,7 @@ double TMoverParameters::DynamicBrakeRatio(void) const
{ {
if (false == SplitEDPneumaticBrake) if (false == SplitEDPneumaticBrake)
return 0.0; return 0.0;
return clamp(DynamicBrakeCtrlPos, 0.0, 1.0); return std::clamp(DynamicBrakeCtrlPos, 0.0, 1.0);
} }
// ************************************************************************************************* // *************************************************************************************************
@@ -7339,7 +7339,7 @@ void TMoverParameters::CheckEIMIC(double dt)
double const vh1 = eimc[eimc_p_Vh1]; double const vh1 = eimc[eimc_p_Vh1];
if (vh1 > vh0 + 0.001) if (vh1 > vh0 + 0.001)
{ {
double const vhRamp = clamp((Vel - vh0) / (vh1 - vh0), 0.0, 1.0); double const vhRamp = std::clamp((Vel - vh0) / (vh1 - vh0), 0.0, 1.0);
brakeDemand *= vhRamp; brakeDemand *= vhRamp;
} }
} }
@@ -10237,7 +10237,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath)
modernDimmerPosition = modernDimmerDefaultPosition; modernDimmerPosition = modernDimmerDefaultPosition;
} }
WriteLog("CERROR: " + std::to_string(ConversionError) + ", SUCCES: " + to_string(result)); WriteLog("CERROR: " + std::to_string(ConversionError) + ", SUCCES: " + std::to_string(result));
return result; return result;
} }