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

fixes for .fiz file parsing and diesel engine momentum calculation

Browse Source
This commit is contained in:
tmj-fstate
2017-12-14 22:05:18 +01:00
parent 4e6e428cea
commit b70c265a1e
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
McZapkie/Mover.cpp
View File

@@ -47,7 +47,7 @@ inline long ROUND(float f)
return Trunc(f + 0.5f); return Trunc(f + 0.5f);
} }
inline double sqr(double val) // SQR() zle liczylo w current() ... inline double square(double val) // SQR() zle liczylo w current() ...
{ {
return val * val; return val * val;
} }
@@ -225,7 +225,7 @@ double TMoverParameters::Current(double n, double U)
// writepaslog("fi ", FloatToStr(MotorParam[SP].fi)); // writepaslog("fi ", FloatToStr(MotorParam[SP].fi));
Isf = Sign(U1) * MotorParam[SP].Isat; Isf = Sign(U1) * MotorParam[SP].Isat;
// writepaslog("Isf ", FloatToStr(Isf)); // writepaslog("Isf ", FloatToStr(Isf));
Delta = sqr(Isf * Rz + Mn * MotorParam[SP].fi * n - U1) + Delta = square(Isf * Rz + Mn * MotorParam[SP].fi * n - U1) +
4.0 * U1 * Isf * Rz; // 105 * 1.67 + Mn * 140.9 * 20.532 - U1 4.0 * U1 * Isf * Rz; // 105 * 1.67 + Mn * 140.9 * 20.532 - U1
// DeltaQ = Isf * Rz + Mn * MotorParam[SP].fi * n - U1 + 4 * U1 * Isf * Rz; // DeltaQ = Isf * Rz + Mn * MotorParam[SP].fi * n - U1 + 4 * U1 * Isf * Rz;
// writepaslog("Delta ", FloatToStr(Delta)); // writepaslog("Delta ", FloatToStr(Delta));
@@ -1272,7 +1272,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap
// przyspieszenie normalne // przyspieszenie normalne
if (abs(Shape.R) > 0.01) if (abs(Shape.R) > 0.01)
AccN = sqr(V) / Shape.R + g * Shape.dHrail / TrackW; // Q: zamieniam SQR() na sqr() AccN = square(V) / Shape.R + g * Shape.dHrail / TrackW; // Q: zamieniam SQR() na sqr()
else else
AccN = g * Shape.dHrail / TrackW; AccN = g * Shape.dHrail / TrackW;
@@ -3787,7 +3787,7 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer)
} }
if (nrot < 0.1) if (nrot < 0.1)
{ {
WheelFlat = sqrt(sqr(WheelFlat) + abs(Fwheels) / NAxles*Vel*0.000002); WheelFlat = sqrt(square(WheelFlat) + abs(Fwheels) / NAxles*Vel*0.000002);
} }
if (Sign(nrot * M_PI * WheelDiameter - V)*Sign(temp_nrot * M_PI * WheelDiameter - V) < 0) if (Sign(nrot * M_PI * WheelDiameter - V)*Sign(temp_nrot * M_PI * WheelDiameter - V) < 0)
{ {
@@ -4388,7 +4388,7 @@ double TMoverParameters::TractionForce(double dt)
dizel_Mstand * (0.2 * enrot / dizel_nmax); // dodatkowe opory z powodu sprezarki} dizel_Mstand * (0.2 * enrot / dizel_nmax); // dodatkowe opory z powodu sprezarki}
Mm = dizel_engage * dmoment; Mm = dizel_engage * dmoment;
Mw = Mm * dtrans; // dmoment i dtrans policzone przy okazji enginerotation Mw = Mm * dtrans; // dmoment i dtrans policzone przy okazji enginerotation
Fw = Mw * 2.0 / WheelDiameter; Fw = Mw * 2.0 / WheelDiameter / NPoweredAxles;
Ft = Fw * NPoweredAxles; // sila trakcyjna Ft = Fw * NPoweredAxles; // sila trakcyjna
Ft = Ft * DirAbsolute; // ActiveDir*CabNo; Ft = Ft * DirAbsolute; // ActiveDir*CabNo;
break; break;
@@ -4477,8 +4477,8 @@ double TMoverParameters::TractionForce(double dt)
else // charakterystyka pradnicy obcowzbudnej (elipsa) - twierdzenie Pitagorasa else // charakterystyka pradnicy obcowzbudnej (elipsa) - twierdzenie Pitagorasa
{ {
Voltage = sqrt(abs(sqr(DElist[MainCtrlPos].Umax) - Voltage = sqrt(abs(square(DElist[MainCtrlPos].Umax) -
sqr(DElist[MainCtrlPos].Umax * Im / square(DElist[MainCtrlPos].Umax * Im /
DElist[MainCtrlPos].Imax))) * DElist[MainCtrlPos].Imax))) *
(MainCtrlPos - 1) + (MainCtrlPos - 1) +
(1.0 - Im / DElist[MainCtrlPos].Imax) * DElist[MainCtrlPos].Umax * (1.0 - Im / DElist[MainCtrlPos].Imax) * DElist[MainCtrlPos].Umax *
@@ -4754,7 +4754,7 @@ double TMoverParameters::TractionForce(double dt)
0.001 * Voltage * (eimc[eimc_p_Imax] - eimc[eimc_f_I0]) * Pirazy2 * 0.001 * Voltage * (eimc[eimc_p_Imax] - eimc[eimc_f_I0]) * Pirazy2 *
eimc[eimc_s_cim] / eimc[eimc_s_p] / eimc[eimc_s_cfu]); eimc[eimc_s_cim] / eimc[eimc_s_p] / eimc[eimc_s_cfu]);
eimv[eimv_FMAXMAX] = eimv[eimv_FMAXMAX] =
0.001 * sqr(Min0R(eimv[eimv_fkr] / Max0R(abs(enrot) * eimc[eimc_s_p] + 0.001 * square(Min0R(eimv[eimv_fkr] / Max0R(abs(enrot) * eimc[eimc_s_p] +
eimc[eimc_s_dfmax] * eimv[eimv_ks], eimc[eimc_s_dfmax] * eimv[eimv_ks],
eimc[eimc_s_dfmax]), eimc[eimc_s_dfmax]),
1) * 1) *
@@ -5683,21 +5683,19 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt)
{ // liczy moment sily wytwarzany przez silnik spalinowy} { // liczy moment sily wytwarzany przez silnik spalinowy}
double Moment = 0, enMoment = 0, eps = 0, newn = 0, friction = 0; double Moment = 0, enMoment = 0, eps = 0, newn = 0, friction = 0;
// friction =dizel_engagefriction*(11-2*random)/10;
friction = dizel_engagefriction; friction = dizel_engagefriction;
if (enrot > 0) if( enrot > 0 ) {
{ // sqr TODO: sqr c++ // Moment = dizel_Mmax * dizel_fill - ( dizel_Mmax - dizel_Mnmax * dizel_fill ) * sqr( enrot / ( dizel_nmax - dizel_nMmax * dizel_fill ) ) - dizel_Mstand; // Q: zamieniam SQR() na sqr()
Moment = dizel_Mmax * dizel_fill - Moment = ( dizel_Mmax - ( dizel_Mmax - dizel_Mnmax ) * square( ( enrot - dizel_nMmax ) / ( dizel_nMmax - dizel_nmax ) ) ) * dizel_fill - dizel_Mstand;
(dizel_Mmax - dizel_Mnmax * dizel_fill) *
sqr(enrot / (dizel_nmax - dizel_nMmax * dizel_fill)) -
dizel_Mstand; // Q: zamieniam SQR() na sqr()
// Moment:=Moment*(1+sin(eAngle*4))-dizel_Mstand*(1+cos(eAngle*4));}
} }
else else {
Moment = -dizel_Mstand; Moment = -dizel_Mstand;
if (enrot < dizel_nmin / 10.0) }
if (eAngle < PI / 2.0) if( ( enrot < dizel_nmin / 10.0 )
Moment -= dizel_Mstand; // wstrzymywanie przy malych obrotach && ( eAngle < PI / 2.0 ) ) {
// wstrzymywanie przy malych obrotach
Moment -= dizel_Mstand;
}
//!! abs //!! abs
if (abs(abs(n) - enrot) < 0.1) if (abs(abs(n) - enrot) < 0.1)
{ {

7
McZapkie/mctools.h
View File

@@ -116,11 +116,12 @@ void win1250_to_ascii( std::string &Input );
inline inline
std::string std::string
extract_value( std::string const &Key, std::string const &Input ) { extract_value( std::string const &Key, std::string const &Input ) {
// NOTE, HACK: the leading space allows to uniformly look for " variable=" substring
std::string const input { " " + Input };
std::string value; std::string value;
auto lookup = Input.find( Key + "=" ); auto lookup = input.find( " " + Key + "=" );
if( lookup != std::string::npos ) { if( lookup != std::string::npos ) {
value = Input.substr( Input.find_first_not_of( ' ', lookup + Key.size() + 1 ) ); value = input.substr( input.find_first_not_of( ' ', lookup + Key.size() + 2 ) );
lookup = value.find( ' ' ); lookup = value.find( ' ' );
if( lookup != std::string::npos ) { if( lookup != std::string::npos ) {
// trim everything past the value // trim everything past the value