xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix bug on driver's compound in pit stop 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9166 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
torcs-ng 2023-10-26 21:17:11 +00:00
parent b723c8493e
commit 2819d5b948
4 changed files with 383 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/dandroid/src/pit.cpp
View File

@ -506,7 +506,7 @@ void Pit::pitCommand()
{
int remainingLaps = car->race.remainingLaps + 1;
if (RAIN < 2)
if (RAIN < 1)
{
if (remainingLaps + 1 < 15.0)
{
@ -518,11 +518,11 @@ void Pit::pitCommand()
car->pitcmd.tiresetChange = tCarPitCmd::MEDIUM;
LogDANDROID.info("Change Tire MEDIUM !\n");
}
else
{
car->pitcmd.tiresetChange = tCarPitCmd::HARD;
LogDANDROID.info("Change Tire HARD !\n");
}
}
else if (RAIN < 2 && car->priv.localTemperature > 28.0)
{
car->pitcmd.tiresetChange = tCarPitCmd::HARD;
LogDANDROID.info("Change Tire HARD !\n");
}
else if (RAIN < 3)
{

6
src/drivers/shadow/src/Strategy.cpp
View File

@ -354,19 +354,19 @@ void Strategy::Process( CarElt* pCar, TeamInfo::Item* pTeamInfo )
{
int remainingLaps = pCar->race.remainingLaps + 1;
if (remainingLaps <= 10 && m_Rain < 2)
if (remainingLaps <= 10 && m_Rain < 1)
{
pCar->pitcmd.tiresetChange = tCarPitCmd::SOFT;
mCompounds = 1;
LogSHADOW.info("Change Tire SOFT !\n");
}
else if (remainingLaps <= 25 && m_Rain < 2)
else if (remainingLaps <= 25 && m_Rain < 1)
{
pCar->pitcmd.tiresetChange = tCarPitCmd::MEDIUM;
mCompounds = 2;
LogSHADOW.info("Change Tire MEDIUM !\n");
}
else if(m_Rain < 2)
else if(m_Rain < 2 && pCar->priv.localTemperature > 28.0)
{
pCar->pitcmd.tiresetChange = tCarPitCmd::HARD;
mCompounds = 3;

742
src/drivers/simplix/src/unitstrategy.cpp
View File

@ -89,8 +89,8 @@ TSimpleStrategy::TSimpleStrategy():
//--------------------------------------------------------------------------*
TSimpleStrategy::~TSimpleStrategy()
{
if (oPit != NULL)
delete oPit;
if (oPit != NULL)
delete oPit;
}
//==========================================================================*
@ -99,13 +99,13 @@ TSimpleStrategy::~TSimpleStrategy()
//--------------------------------------------------------------------------*
void TSimpleStrategy::Init(TDriver *Driver)
{
oDriver = Driver;
oPit = new TPit(Driver);
oDriver = Driver;
oPit = new TPit(Driver);
oTireLimitFront = oDriver->TyreTreadDepthFront();
oTireLimitRear = oDriver->TyreTreadDepthRear();
oDegradationPerLap = 0.0;
oLaps = 0;
oTireLimitFront = oDriver->TyreTreadDepthFront();
oTireLimitRear = oDriver->TyreTreadDepthRear();
oDegradationPerLap = 0.0;
oLaps = 0;
}
//==========================================================================*
@ -117,10 +117,10 @@ bool TSimpleStrategy::IsPitFree()
bool IsFree = RtTeamIsPitFree(oDriver->TeamIndex());
if (IsFree)
LogSimplix.debug("#%s pit is free (%d)\n",
oDriver->GetBotName(),oDriver->TeamIndex());
oDriver->GetBotName(),oDriver->TeamIndex());
else
LogSimplix.debug("#%s pit is locked (%d)\n",
oDriver->GetBotName(),oDriver->TeamIndex());
oDriver->GetBotName(),oDriver->TeamIndex());
return IsFree;
}
//==========================================================================*
@ -130,42 +130,42 @@ bool TSimpleStrategy::IsPitFree()
//--------------------------------------------------------------------------*
bool TSimpleStrategy::NeedPitStop()
{
float FuelConsum; // Fuel consumption per m
if (oFuelPerM == 0.0) // If still undefined
FuelConsum = oExpectedFuelPerM; // use estimated value
else // If known
FuelConsum = oFuelPerM; // use it
float FuelConsum; // Fuel consumption per m
if (oFuelPerM == 0.0) // If still undefined
FuelConsum = oExpectedFuelPerM; // use estimated value
else // If known
FuelConsum = oFuelPerM; // use it
bool Result = RtTeamNeedPitStop(oDriver->TeamIndex(),
FuelConsum, RepairWanted(cPIT_DAMMAGE));
bool Result = RtTeamNeedPitStop(oDriver->TeamIndex(),
FuelConsum, RepairWanted(cPIT_DAMMAGE));
if (oDriver->oCarHasTYC)
{
double TdF = oDriver->TyreTreadDepthFront(); // Check tyre condition
double TdR = oDriver->TyreTreadDepthRear(); // Pit stop needed if
oDegradationPerLap = (oLaps * oDegradationPerLap
+ MAX(oTireLimitFront - TdF,oTireLimitRear - TdR));
oDegradationPerLap /= ++oLaps;
if (MIN(TdF,TdR) < 1.5 * oDegradationPerLap) // tyres become critical
if (oDriver->oCarHasTYC)
{
LogSimplix.warning("Tyre condition D: %.1f%% F: %.1f%% R: %.1f%% (%s)\n",
oDegradationPerLap,TdF,TdR,oDriver->GetBotName());
double TdF = oDriver->TyreTreadDepthFront(); // Check tyre condition
double TdR = oDriver->TyreTreadDepthRear(); // Pit stop needed if
oDegradationPerLap = (oLaps * oDegradationPerLap
+ MAX(oTireLimitFront - TdF,oTireLimitRear - TdR));
oDegradationPerLap /= ++oLaps;
if ((TdF < 1.1 * oDegradationPerLap)
|| (TdR < 1.1 * oDegradationPerLap))
{
Result = true; // to stop in pit
}
if (MIN(TdF,TdR) < 1.5 * oDegradationPerLap) // tyres become critical
{
LogSimplix.warning("Tyre condition D: %.1f%% F: %.1f%% R: %.1f%% (%s)\n",
oDegradationPerLap,TdF,TdR,oDriver->GetBotName());
if ((TdF < 1.1 * oDegradationPerLap)
|| (TdR < 1.1 * oDegradationPerLap))
{
Result = true; // to stop in pit
}
}
oTireLimitFront = TdF;
oTireLimitRear = TdR;
}
oTireLimitFront = TdF;
oTireLimitRear = TdR;
}
if (oDriver->oTestPitStop) // If defined, try
Result = true; // to stop in pit
if (oDriver->oTestPitStop) // If defined, try
Result = true; // to stop in pit
return Result;
return Result;
};
//==========================================================================*
@ -174,8 +174,8 @@ bool TSimpleStrategy::NeedPitStop()
//--------------------------------------------------------------------------*
void TAbstractStrategy::PitRelease()
{
RtTeamReleasePit(oDriver->TeamIndex());
CarRaceCmd = 0;
RtTeamReleasePit(oDriver->TeamIndex());
CarRaceCmd = 0;
};
//==========================================================================*
@ -184,44 +184,44 @@ void TAbstractStrategy::PitRelease()
//--------------------------------------------------------------------------*
float TSimpleStrategy::PitRefuel()
{
float FuelConsum; // Spritverbrauch kg/m
float Fuel; // Menge in kg
float FuelConsum; // Spritverbrauch kg/m
float Fuel; // Menge in kg
if (oFuelPerM == 0.0) // Wenn kein Messwert
FuelConsum = oExpectedFuelPerM; // vorliegt, sch<63>tzen
else // ansonsten
FuelConsum = oFuelPerM; // Messwert nehmen
if (oFuelPerM == 0.0) // Wenn kein Messwert
FuelConsum = oExpectedFuelPerM; // vorliegt, sch<63>tzen
else // ansonsten
FuelConsum = oFuelPerM; // Messwert nehmen
FuelConsum *= 1.10f; // ggf. ohne Windschatten!
FuelConsum *= 1.10f; // ggf. ohne Windschatten!
oRemainingDistance = // Restliche Strecke des
oRaceDistance - DistanceRaced; // Rennens ermitteln
oRemainingDistance = // Restliche Strecke des
oRaceDistance - DistanceRaced; // Rennens ermitteln
Fuel = // Bedarf an Treibstoff
(oRemainingDistance + oReserve) * FuelConsum;// f<>r restliche Strecke
Fuel = // Bedarf an Treibstoff
(oRemainingDistance + oReserve) * FuelConsum;// f<>r restliche Strecke
if (Fuel > oMaxFuel) // Wenn mehr als eine Tank-
{ // f<>llung ben<65>tigt wird
if (Fuel / 2 < oMaxFuel) // Bei zwei Tankf<6B>llungen
Fuel = Fuel / 2; // die H<>lfte tanken
else if (Fuel / 3 < oMaxFuel) // Bei drei Tankf<6B>llungen.
Fuel = Fuel / 3; // ein Drittel tanken
else if (Fuel / 4 < oMaxFuel) // Bei vier Tankf<6B>llungen.
Fuel = Fuel / 4; // ein Viertel tanken
else // Bei f<>nf Tankf<6B>llungen
Fuel = Fuel / 5; // ein F<>nftel tanken
};
if (Fuel > oMaxFuel) // Wenn mehr als eine Tank-
{ // f<>llung ben<65>tigt wird
if (Fuel / 2 < oMaxFuel) // Bei zwei Tankf<6B>llungen
Fuel = Fuel / 2; // die H<>lfte tanken
else if (Fuel / 3 < oMaxFuel) // Bei drei Tankf<6B>llungen.
Fuel = Fuel / 3; // ein Drittel tanken
else if (Fuel / 4 < oMaxFuel) // Bei vier Tankf<6B>llungen.
Fuel = Fuel / 4; // ein Viertel tanken
else // Bei f<>nf Tankf<6B>llungen
Fuel = Fuel / 5; // ein F<>nftel tanken
};
if (Fuel > oMaxFuel - CarFuel) // Menge ggf. auf freien
Fuel = oMaxFuel - CarFuel; // Tankinhalt begrenzen
else // ansonsten Bedarf
Fuel = Fuel - CarFuel; // abz<62>gl. Tankinhalt
if (Fuel > oMaxFuel - CarFuel) // Menge ggf. auf freien
Fuel = oMaxFuel - CarFuel; // Tankinhalt begrenzen
else // ansonsten Bedarf
Fuel = Fuel - CarFuel; // abz<62>gl. Tankinhalt
//Fuel = MIN(Fuel,10.0); // NUR ZUM TEST DES TEAMMANAGERS
//Fuel = MIN(Fuel,10.0); // NUR ZUM TEST DES TEAMMANAGERS
oLastPitFuel = (float) MAX(Fuel,0.0); // Wenn genug da ist = 0.0
oLastPitFuel = (float) MAX(Fuel,0.0); // Wenn genug da ist = 0.0
return oLastPitFuel; // Menge an TORCS melden
return oLastPitFuel; // Menge an TORCS melden
};
//==========================================================================*
@ -230,18 +230,18 @@ float TSimpleStrategy::PitRefuel()
//--------------------------------------------------------------------------*
int TSimpleStrategy::RepairWanted(int AcceptedDammage)
{
if (oCar->_dammage < AcceptedDammage)
return 0;
else if (oRemainingDistance > 5.5 * oTrackLength)
return oCar->_dammage;
else if (oRemainingDistance > 4.5 * oTrackLength)
return MAX(0,oCar->_dammage - cPIT_DAMMAGE);
else if (oRemainingDistance > 3.5 * oTrackLength)
return MAX(0,oCar->_dammage - cPIT_DAMMAGE - 1000);
else if (oRemainingDistance > 2.5 * oTrackLength)
return MAX(0,oCar->_dammage - cPIT_DAMMAGE - 2000);
else
return MAX(0,oCar->_dammage - cPIT_DAMMAGE - 3000);
if (oCar->_dammage < AcceptedDammage)
return 0;
else if (oRemainingDistance > 5.5 * oTrackLength)
return oCar->_dammage;
else if (oRemainingDistance > 4.5 * oTrackLength)
return MAX(0,oCar->_dammage - cPIT_DAMMAGE);
else if (oRemainingDistance > 3.5 * oTrackLength)
return MAX(0,oCar->_dammage - cPIT_DAMMAGE - 1000);
else if (oRemainingDistance > 2.5 * oTrackLength)
return MAX(0,oCar->_dammage - cPIT_DAMMAGE - 2000);
else
return MAX(0,oCar->_dammage - cPIT_DAMMAGE - 3000);
}
//==========================================================================*
@ -250,9 +250,9 @@ int TSimpleStrategy::RepairWanted(int AcceptedDammage)
//--------------------------------------------------------------------------*
int TSimpleStrategy::PitRepair()
{
oState = PIT_EXIT_WAIT;
oWasInPit = true;
return RepairWanted(0);
oState = PIT_EXIT_WAIT;
oWasInPit = true;
return RepairWanted(0);
}
//==========================================================================*
@ -260,67 +260,67 @@ int TSimpleStrategy::PitRepair()
// Tankf<6B>llung beim Start bestimmen
//--------------------------------------------------------------------------*
double TSimpleStrategy::SetFuelAtRaceStart
(PTrack Track, PCarSettings *CarSettings, PSituation Situation, float Fuel)
(PTrack Track, PCarSettings *CarSettings, PSituation Situation, float Fuel)
{
oTrack = Track; // Save TORCS pointer
oTrack = Track; // Save TORCS pointer
oTrackLength = oTrack->length; // L<>nge der Strecke merken
oRaceDistance = // Gesamtl<74>nge des Rennens
oTrackLength * Situation->_totLaps; // berechnen
oRemainingDistance = // Restliche Strecke des
oRaceDistance + oReserve; // Rennens ermitteln
Fuel = (float)
(Fuel * oRemainingDistance / 100000.0); // Gesamtbedarf in kg
oTrackLength = oTrack->length; // L<>nge der Strecke merken
oRaceDistance = // Gesamtl<74>nge des Rennens
oTrackLength * Situation->_totLaps; // berechnen
oRemainingDistance = // Restliche Strecke des
oRaceDistance + oReserve; // Rennens ermitteln
Fuel = (float)
(Fuel * oRemainingDistance / 100000.0); // Gesamtbedarf in kg
oExpectedFuelPerM = Fuel / oRemainingDistance; // Verbrauch in kg/m
oExpectedFuelPerM = Fuel / oRemainingDistance; // Verbrauch in kg/m
oMaxFuel =
GfParmGetNum(*CarSettings,TDriver::SECT_PRIV, // Maximal m<>glicher
PRV_MAX_FUEL,(char*) NULL,oMaxFuel); // Tankinhalt
LogSimplix.debug("#oMaxFuel (private) = %.1f\n",oMaxFuel);
oMaxFuel =
GfParmGetNum(*CarSettings,TDriver::SECT_PRIV, // Maximal m<>glicher
PRV_MAX_FUEL,(char*) NULL,oMaxFuel); // Tankinhalt
LogSimplix.debug("#oMaxFuel (private) = %.1f\n",oMaxFuel);
oStartFuel =
GfParmGetNum(*CarSettings,TDriver::SECT_PRIV, // Tankinhalt beim Start
PRV_START_FUEL,(char*) NULL,(float) oStartFuel);
LogSimplix.debug("#oStartFuel (private) = %.1f\n",oStartFuel);
oStartFuel =
GfParmGetNum(*CarSettings,TDriver::SECT_PRIV, // Tankinhalt beim Start
PRV_START_FUEL,(char*) NULL,(float) oStartFuel);
LogSimplix.debug("#oStartFuel (private) = %.1f\n",oStartFuel);
if ((!TDriver::Qualification) // F<>rs Rennen
&& (oStartFuel > 0))
{
oLastFuel = (float) oStartFuel; // volltanken
GfParmSetNum(*CarSettings,SECT_CAR,PRM_FUEL, // Gew<65>nschte Tankf<6B>llung
(char*) NULL, oLastFuel); // an TORCS melden
return oLastFuel;
}
if ((!TDriver::Qualification) // F<>rs Rennen
&& (oStartFuel > 0))
{
oLastFuel = (float) oStartFuel; // volltanken
GfParmSetNum(*CarSettings,SECT_CAR,PRM_FUEL, // Gew<65>nschte Tankf<6B>llung
(char*) NULL, oLastFuel); // an TORCS melden
return oLastFuel;
}
oMinLaps = (int)
GfParmGetNum(*CarSettings,TDriver::SECT_PRIV, // Mindestanzahl an Runden
PRV_MIN_LAPS,(char*) NULL,(float) oMinLaps); // die mit dem Tankinhalt
LogSimplix.debug("#oMinLaps (private) = %d\n",oMinLaps); // m<>glich sein m<>ssen
oMinLaps = (int)
GfParmGetNum(*CarSettings,TDriver::SECT_PRIV, // Mindestanzahl an Runden
PRV_MIN_LAPS,(char*) NULL,(float) oMinLaps); // die mit dem Tankinhalt
LogSimplix.debug("#oMinLaps (private) = %d\n",oMinLaps); // m<>glich sein m<>ssen
if (Fuel == 0) // Wenn nichts bekannt ist,
Fuel = oMaxFuel; // Volltanken
if (Fuel == 0) // Wenn nichts bekannt ist,
Fuel = oMaxFuel; // Volltanken
oLastFuel = Fuel; // Erforderlicher Treibstoff
if (Fuel > oMaxFuel) // Wenn mehr als eine Tank-
{ // f<>llung ben<65>tigt wird
if (Fuel / 2 < oMaxFuel) // Bei zwei Tankf<6B>llungen
oLastFuel = Fuel / 2; // die H<>lfte tanken
else if (Fuel / 3 < oMaxFuel) // Bei drei Tankf<6B>llungen.
oLastFuel = Fuel / 3; // ein Drittel tanken
else if (Fuel / 4 < oMaxFuel) // Bei vier Tankf<6B>llungen.
oLastFuel = Fuel / 4; // ein Viertel tanken
else // Bei f<>nf Tankf<6B>llungen
oLastFuel = Fuel / 5; // ein F<>nftel tanken
};
oLastFuel = Fuel; // Erforderlicher Treibstoff
if (Fuel > oMaxFuel) // Wenn mehr als eine Tank-
{ // f<>llung ben<65>tigt wird
if (Fuel / 2 < oMaxFuel) // Bei zwei Tankf<6B>llungen
oLastFuel = Fuel / 2; // die H<>lfte tanken
else if (Fuel / 3 < oMaxFuel) // Bei drei Tankf<6B>llungen.
oLastFuel = Fuel / 3; // ein Drittel tanken
else if (Fuel / 4 < oMaxFuel) // Bei vier Tankf<6B>llungen.
oLastFuel = Fuel / 4; // ein Viertel tanken
else // Bei f<>nf Tankf<6B>llungen
oLastFuel = Fuel / 5; // ein F<>nftel tanken
};
//oLastFuel = MIN(oLastFuel,15.0); // NUR ZUM TEST DES TEAMMANAGERS
//oLastFuel = MIN(oLastFuel,15.0); // NUR ZUM TEST DES TEAMMANAGERS
oLastFuel = MIN(oLastFuel, oMaxFuel); // <20>berlaufen verhindern
GfParmSetNum(*CarSettings, SECT_CAR, PRM_FUEL, // Gew<65>nschte Tankf<6B>llung
(char*) NULL, oLastFuel); // an TORCS melden
oLastFuel = MIN(oLastFuel, oMaxFuel); // <20>berlaufen verhindern
GfParmSetNum(*CarSettings, SECT_CAR, PRM_FUEL, // Gew<65>nschte Tankf<6B>llung
(char*) NULL, oLastFuel); // an TORCS melden
return oLastFuel;
return oLastFuel;
};
//==========================================================================*
@ -329,7 +329,7 @@ double TSimpleStrategy::SetFuelAtRaceStart
//--------------------------------------------------------------------------*
bool TSimpleStrategy::GoToPit()
{
return ((oState >= PIT_PREPARE) && (oState <= PIT_GONE));
return ((oState >= PIT_PREPARE) && (oState <= PIT_GONE));
};
//==========================================================================*
@ -338,16 +338,16 @@ bool TSimpleStrategy::GoToPit()
//--------------------------------------------------------------------------*
bool TSimpleStrategy::StartPitEntry(float& Ratio)
{
float DLong, DLat; // Dist to Pit
RtDistToPit(oCar,oTrack,&DLong,&DLat);
float DLong, DLat; // Dist to Pit
RtDistToPit(oCar,oTrack,&DLong,&DLat);
if (GoToPit() && (DLong < oDistToSwitch))
{
Ratio = (float) (1.0 - MAX(0.0,(DLong-100)/oDistToSwitch));
return true;
}
else
return false;
if (GoToPit() && (DLong < oDistToSwitch))
{
Ratio = (float) (1.0 - MAX(0.0,(DLong-100)/oDistToSwitch));
return true;
}
else
return false;
};
//==========================================================================*
@ -356,17 +356,17 @@ bool TSimpleStrategy::StartPitEntry(float& Ratio)
//--------------------------------------------------------------------------*
bool TSimpleStrategy::StopPitEntry(float Offset)
{
float DLong, DLat; // Dist to Pit
RtDistToPit(oCar,oTrack,&DLong,&DLat);
if (oWasInPit && (DLong - oTrackLength) > -Offset)
{
return true;
}
else
{
oWasInPit = false;
return false;
}
float DLong, DLat; // Dist to Pit
RtDistToPit(oCar,oTrack,&DLong,&DLat);
if (oWasInPit && (DLong - oTrackLength) > -Offset)
{
return true;
}
else
{
oWasInPit = false;
return false;
}
};
//==========================================================================*
@ -374,55 +374,55 @@ bool TSimpleStrategy::StopPitEntry(float Offset)
// Update Data
//--------------------------------------------------------------------------*
void TSimpleStrategy::Update(PtCarElt Car,
float MinDistBack, double MinTimeSlot)
float MinDistBack, double MinTimeSlot)
{
double CurrentFuelConsum; // Current fuel consum
float DL; // Distance longitudinal
float DW; // Distance lateral
oMinDistBack = MinDistBack;
oMinTimeSlot = MinTimeSlot;
double CurrentFuelConsum; // Current fuel consum
float DL; // Distance longitudinal
float DW; // Distance lateral
oMinDistBack = MinDistBack;
oMinTimeSlot = MinTimeSlot;
oCar = Car; // Save pointer
oCar = Car; // Save pointer
if (!oPit->HasPits())
return;
if (!oPit->HasPits())
return;
RtDistToPit // Get distance to pit
(Car,oTrack,&DL,&DW);
RtDistToPit // Get distance to pit
(Car,oTrack,&DL,&DW);
if (DL < 0) // Make DL be >= 0.0
DL = DL + oTrack->length; // to have it to front
if (DL < 0) // Make DL be >= 0.0
DL = DL + oTrack->length; // to have it to front
if ((DL < oDistToSwitch) && (DL > 50) && (!oFuelChecked))
{ // We passed the line to check our fuel consume!
if (CarLaps > 1) // Start at lap 2
{ // to get values
CurrentFuelConsum = // Current consume =
(oLastFuel // Last tank capacity
+ oLastPitFuel // + refueled
- oCar->priv.fuel) // - current capacity
/ oTrackLength; // related to track length
if ((DL < oDistToSwitch) && (DL > 50) && (!oFuelChecked))
{ // We passed the line to check our fuel consume!
if (CarLaps > 1) // Start at lap 2
{ // to get values
CurrentFuelConsum = // Current consume =
(oLastFuel // Last tank capacity
+ oLastPitFuel // + refueled
- oCar->priv.fuel) // - current capacity
/ oTrackLength; // related to track length
if (oFuelPerM == 0.0) // At first time we use
oFuelPerM = (float) CurrentFuelConsum; // our initial estimation
else // later
oFuelPerM = (float) // we get the mean
((oFuelPerM*CarLaps+CurrentFuelConsum) // of what we needed till now
/ (CarLaps + 1));
if (oFuelPerM == 0.0) // At first time we use
oFuelPerM = (float) CurrentFuelConsum; // our initial estimation
else // later
oFuelPerM = (float) // we get the mean
((oFuelPerM*CarLaps+CurrentFuelConsum) // of what we needed till now
/ (CarLaps + 1));
};
oLastFuel = oCar->priv.fuel; // Capacity at this estimation
oLastPitFuel = 0.0; // Refueled
oFuelChecked = true; // We did the estimation in this lap
if (!oGoToPit) // If decision isn't made
oGoToPit = NeedPitStop(); // Check if we should have a pitstop
}
else if (DL < 50) // I we are out of the window
{ // to estimate fuel consumption
oFuelChecked = false; // reset flag
};
oLastFuel = oCar->priv.fuel; // Capacity at this estimation
oLastPitFuel = 0.0; // Refueled
oFuelChecked = true; // We did the estimation in this lap
if (!oGoToPit) // If decision isn't made
oGoToPit = NeedPitStop(); // Check if we should have a pitstop
}
else if (DL < 50) // I we are out of the window
{ // to estimate fuel consumption
oFuelChecked = false; // reset flag
};
};
//==========================================================================*
@ -431,220 +431,220 @@ void TSimpleStrategy::Update(PtCarElt Car,
//--------------------------------------------------------------------------*
void TSimpleStrategy::CheckPitState(float /*PitScaleBrake*/)
{
if (oPit == NULL) // No Pit no service
return;
if (!oPit->HasPits())
return;
if (oPit == NULL) // No Pit no service
return;
if (!oPit->HasPits())
return;
double TrackPos = RtGetDistFromStart(oCar); // Distance to pit
double TrackPos = RtGetDistFromStart(oCar); // Distance to pit
switch(oState) // Check state
{
switch(oState) // Check state
{
case PIT_NONE:
// We are somewhere on the track, nothing has happend yet
if ((!oPit->oPitLane[0].InPitSection(TrackPos)) && oGoToPit)
{ // if we are not parallel to the pits and get the flag,
// let's stop in the pits.
oState = PIT_BEFORE;
}
break;
// We are somewhere on the track, nothing has happend yet
if ((!oPit->oPitLane[0].InPitSection(TrackPos)) && oGoToPit)
{ // if we are not parallel to the pits and get the flag,
// let's stop in the pits.
oState = PIT_BEFORE;
}
break;
case PIT_BEFORE:
// We are somewhere on the track and got the flag to go to pit
if (oFuelChecked && oGoToPit)
{ // If we reache pit entry and flag is still set
// switch to the pitlane
oState = PIT_PREPARE;
}
break;
// We are somewhere on the track and got the flag to go to pit
if (oFuelChecked && oGoToPit)
{ // If we reache pit entry and flag is still set
// switch to the pitlane
oState = PIT_PREPARE;
}
break;
case PIT_PREPARE:
// We are near the pit entry on the track and got the flag to go to pit
if (oPit->oPitLane[0].InPitSection(TrackPos) && oGoToPit)
{ // If we reache pit entry and flag is still set
// switch to the pitlane
oState = PIT_ENTER;
}
break;
// We are near the pit entry on the track and got the flag to go to pit
if (oPit->oPitLane[0].InPitSection(TrackPos) && oGoToPit)
{ // If we reache pit entry and flag is still set
// switch to the pitlane
oState = PIT_ENTER;
}
break;
case PIT_ENTER:
// We are on the pitlane and drive to our pit
if (!oPit->oPitLane[0].CanStop(TrackPos))
{ // We have to wait, till we reached the point to stop
if (oDriver->CurrSpeed() < 3)
{
CarAccelCmd = MAX(0.05f,CarAccelCmd); // a little throttle
// We are on the pitlane and drive to our pit
if (!oPit->oPitLane[0].CanStop(TrackPos))
{ // We have to wait, till we reached the point to stop
if (oDriver->CurrSpeed() < 3)
{
CarAccelCmd = MAX(0.05f,CarAccelCmd); // a little throttle
CarBrakeCmd = 0.0; // Start braking
LogSimplix.debug("#PIT_ENTER: Wait %g (%g)\n", TrackPos, oDriver->CurrSpeed());
}
else
LogSimplix.debug("#PIT_ENTER: Wait %g\n", TrackPos);
break;
}
CarBrakeCmd = 0.0; // Start braking
LogSimplix.debug("#PIT_ENTER: Wait %g (%g)\n", TrackPos, oDriver->CurrSpeed());
}
else
LogSimplix.debug("#PIT_ENTER: Wait %g\n", TrackPos);
break;
}
// We reached the poit to stopp
oState = PIT_ASKED;
LogSimplix.debug("#PIT_ENTER: %g\n", TrackPos);
// falls through...
SD_FALLTHROUGH // [[fallthrough]]
// We reached the poit to stopp
oState = PIT_ASKED;
LogSimplix.debug("#PIT_ENTER: %g\n", TrackPos);
// falls through...
SD_FALLTHROUGH // [[fallthrough]]
case PIT_ASKED:
// We are still going to the pit
if (oPit->oPitLane[0].CanStop(TrackPos))
{ // If we can stop a this position we start pit procedure
LogSimplix.debug("#PIT_ASKED: CanStop %g (%g)\n", TrackPos, oDriver->CurrSpeed());
oDriver->oStanding = true; // For motion survey!
oPitTicker = 0; // Start service timer
CarAccelCmd = 0; // release throttle
CarBrakeCmd = 1.0; // Start braking
CarRaceCmd = RM_CMD_PIT_ASKED; // Tell TORCS to service us! To test oPitTicker comment out
oState = PIT_SERVICE;
}
else
{ // We can't stop here (to early or to late)
if (oPit->oPitLane[0].Overrun(TrackPos))
case PIT_ASKED:
// We are still going to the pit
if (oPit->oPitLane[0].CanStop(TrackPos))
{ // If we can stop a this position we start pit procedure
LogSimplix.debug("#PIT_ASKED: CanStop %g (%g)\n", TrackPos, oDriver->CurrSpeed());
oDriver->oStanding = true; // For motion survey!
oPitTicker = 0; // Start service timer
CarAccelCmd = 0; // release throttle
CarBrakeCmd = 1.0; // Start braking
CarRaceCmd = RM_CMD_PIT_ASKED; // Tell TORCS to service us! To test oPitTicker comment out
oState = PIT_SERVICE;
}
else
{ // We can't stop here (to early or to late)
if (oPit->oPitLane[0].Overrun(TrackPos))
{ // if to late
LogSimplix.debug("#Overrun 1: %g\n",TrackPos);
PitRelease();
oState = PIT_EXIT_WAIT;
// pit stop finished, need to exit pits now.
oState = PIT_EXIT_WAIT;
// pit stop finished, need to exit pits now.
}
else
{
LogSimplix.debug("#ToShort 1: %g\n",TrackPos);
if (oDriver->CurrSpeed() < 3)
if (oDriver->CurrSpeed() < 3)
{
CarAccelCmd = // a little throttle
MAX(0.05f,CarAccelCmd);
CarBrakeCmd = 0.0; // Start braking
CarAccelCmd = // a little throttle
MAX(0.05f,CarAccelCmd);
CarBrakeCmd = 0.0; // Start braking
}
}
}
break;
}
break;
case PIT_SERVICE:
// Wait to reach standstill to get service from TORCS
oDriver->oStanding = true; // Keep motion survey quiet
oPitTicker++; // Check time to start service
if (oPitTicker > 10) // Check Timer
{ // If we have to wait
LogSimplix.debug("#oPitTicker: %d\n",oPitTicker);
tTeamDriver* TeamDriver = RtTeamDriverByCar(oCar);
short int Major = RtTeamManagerGetMajorVersion();
short int Minor = RtTeamManagerGetMinorVersion();
if ((TeamDriver)
&& ((Major > NEEDED_MAJOR_VERSION)
|| ((Major = NEEDED_MAJOR_VERSION) && (Minor >= NEEDED_MINOR_VERSION))))
{
LogSimplix.debug("#Pitting issues %s\n",oDriver->GetBotName());
LogSimplix.debug("#StillToGo : %.2f m\n",TeamDriver->StillToGo);
LogSimplix.debug("#MoreOffset: %.2f m\n",TeamDriver->MoreOffset);
LogSimplix.debug("#TooFastBy : %.2f m/s\n",TeamDriver->TooFastBy);
// Wait to reach standstill to get service from TORCS
oDriver->oStanding = true; // Keep motion survey quiet
oPitTicker++; // Check time to start service
if (oPitTicker > 10) // Check Timer
{ // If we have to wait
LogSimplix.debug("#oPitTicker: %d\n",oPitTicker);
tTeamDriver* TeamDriver = RtTeamDriverByCar(oCar);
short int Major = RtTeamManagerGetMajorVersion();
short int Minor = RtTeamManagerGetMinorVersion();
if ((TeamDriver)
&& ((Major > NEEDED_MAJOR_VERSION)
|| ((Major = NEEDED_MAJOR_VERSION) && (Minor >= NEEDED_MINOR_VERSION))))
{
LogSimplix.debug("#Pitting issues %s\n",oDriver->GetBotName());
LogSimplix.debug("#StillToGo : %.2f m\n",TeamDriver->StillToGo);
LogSimplix.debug("#MoreOffset: %.2f m\n",TeamDriver->MoreOffset);
LogSimplix.debug("#TooFastBy : %.2f m/s\n",TeamDriver->TooFastBy);
// Learn from the response
if (fabs(TeamDriver->StillToGo) > 0.0)
{
//CarSteerCmd = 0.0; // Straight on
if (fabs(CarSpeedLong) < 1.0)
{
CarAccelCmd = // a little throttle
MAX(0.005f,CarAccelCmd);
CarBrakeCmd = 0.0; // No braking
LogSimplix.debug("#Accel : %.2f\n",CarAccelCmd);
}
else
{
CarBrakeCmd = 0.1f; // Braking
LogSimplix.debug("#Brake : %.2f\n",CarBrakeCmd);
}
CarClutchCmd = 0.5; // Press clutch
if (TeamDriver->StillToGo > 0)
CarGearCmd = 1; // First gear
else
CarGearCmd = -1; // reverse gear
// Learn from the response
if (fabs(TeamDriver->StillToGo) > 0.0)
{
//CarSteerCmd = 0.0; // Straight on
if (fabs(CarSpeedLong) < 1.0)
{
CarAccelCmd = // a little throttle
MAX(0.005f,CarAccelCmd);
CarBrakeCmd = 0.0; // No braking
LogSimplix.debug("#Accel : %.2f\n",CarAccelCmd);
}
else
{
CarBrakeCmd = 0.1f; // Braking
LogSimplix.debug("#Brake : %.2f\n",CarBrakeCmd);
}
CarClutchCmd = 0.5; // Press clutch
if (TeamDriver->StillToGo > 0)
CarGearCmd = 1; // First gear
else
CarGearCmd = -1; // reverse gear
}
else
{
// LogSimplix.debug("#Stopped\n");
CarAccelCmd = 0.0; // Stop throttle
CarBrakeCmd = 1.0; // Lock brake
CarClutchCmd = 0.0; // Release clutch
CarGearCmd = 1; // First gear
}
}
else
{
// LogSimplix.debug("#Stopped\n");
CarAccelCmd = 0.0; // Stop throttle
CarBrakeCmd = 1.0; // Lock brake
CarClutchCmd = 0.0; // Release clutch
CarGearCmd = 1; // First gear
if (oPitTicker > 300) // Check Timer
{ // If we have to wait too long
PitRelease(); // Something went wrong, we have
oState = PIT_EXIT_WAIT; // to leave and release pit for teammate
}
}
if (oPitTicker > 300) // Check Timer
{ // If we have to wait too long
PitRelease(); // Something went wrong, we have
oState = PIT_EXIT_WAIT; // to leave and release pit for teammate
else if (oPit->oPitLane[0].Overrun(TrackPos))
{ // If we couldn't stop in place
LogSimplix.debug("#Overrun 2: %g\n",TrackPos);
PitRelease(); // We have to release the pit
oState = PIT_EXIT_WAIT; // for teammate
}
}
else if (oPit->oPitLane[0].Overrun(TrackPos))
{ // If we couldn't stop in place
LogSimplix.debug("#Overrun 2: %g\n",TrackPos);
PitRelease(); // We have to release the pit
oState = PIT_EXIT_WAIT; // for teammate
}
else
{ // There is nothing that hampers TORCS to service us
LogSimplix.debug("#PIT_SERVICE: %g (%g)\n",TrackPos,oDriver->CurrSpeed());
CarLightCmd = 0; // No lights on
CarAccelCmd = 0; // No throttle
CarBrakeCmd = 1.0; // Still braking
CarRaceCmd = RM_CMD_PIT_ASKED; // Tell TORCS to service us! To test oPitTicker comment out
// oState is set to next state in PitRepair()!
// If TORCS doesn't service us, no call to PitRepair() is done!
// We run into timeout! (oPitTicker)
oPitStartTicker = 600;
}
break;
else
{ // There is nothing that hampers TORCS to service us
LogSimplix.debug("#PIT_SERVICE: %g (%g)\n",TrackPos,oDriver->CurrSpeed());
CarLightCmd = 0; // No lights on
CarAccelCmd = 0; // No throttle
CarBrakeCmd = 1.0; // Still braking
CarRaceCmd = RM_CMD_PIT_ASKED; // Tell TORCS to service us! To test oPitTicker comment out
// oState is set to next state in PitRepair()!
// If TORCS doesn't service us, no call to PitRepair() is done!
// We run into timeout! (oPitTicker)
oPitStartTicker = 600;
}
break;
case PIT_EXIT_WAIT:
// We are still in the box
oDriver->oStanding = true; // Keep motion survey quiet
if ((oMinTimeSlot < 7) // If start slot to short
|| ((oMinDistBack > -7) // or cars aside
&& (oMinDistBack < 5))) // we have to wait
{
oPitStartTicker--;
if (oPitStartTicker < 0)
// We are still in the box
oDriver->oStanding = true; // Keep motion survey quiet
if ((oMinTimeSlot < 7) // If start slot to short
|| ((oMinDistBack > -7) // or cars aside
&& (oMinDistBack < 5))) // we have to wait
{
LogSimplix.debug("#PIT_EXIT: mts%g (mdb%gm)\n",oMinTimeSlot,oMinDistBack);
oState = PIT_EXIT;
oPitStartTicker--;
if (oPitStartTicker < 0)
{
LogSimplix.debug("#PIT_EXIT: mts%g (mdb%gm)\n",oMinTimeSlot,oMinDistBack);
oState = PIT_EXIT;
}
CarLightCmd = RM_LIGHT_HEAD2; // Only small lights on
CarAccelCmd = 0.0;
CarBrakeCmd = 1.0;
}
CarLightCmd = RM_LIGHT_HEAD2; // Only small lights on
CarAccelCmd = 0.0;
CarBrakeCmd = 1.0;
}
else
{
CarLightCmd = RM_LIGHT_HEAD1; // Only big lights on
oState = PIT_EXIT;
}
break;
else
{
CarLightCmd = RM_LIGHT_HEAD1; // Only big lights on
oState = PIT_EXIT;
}
break;
case PIT_EXIT:
// We are still in the box
oDriver->oStanding = true; // Keep motion survey quiet
oGoToPit = false; // Service is finished, lets go
CarAccelCmd = 0.5; // Press throttle
CarBrakeCmd = 0; // Release brake
PitRelease(); // Release pit for teammate
if (oDriver->CurrSpeed() > 5)
oState = PIT_GONE;
break;
// We are still in the box
oDriver->oStanding = true; // Keep motion survey quiet
oGoToPit = false; // Service is finished, lets go
CarAccelCmd = 0.5; // Press throttle
CarBrakeCmd = 0; // Release brake
PitRelease(); // Release pit for teammate
if (oDriver->CurrSpeed() > 5)
oState = PIT_GONE;
break;
case PIT_GONE:
// We are on our path back to the track
if (!oPit->oPitLane[0].InPitSection(TrackPos))
{ // If we reached the end of the pitlane
CarLightCmd = RM_LIGHT_HEAD1 | // All lights on
RM_LIGHT_HEAD2;
oState = PIT_NONE; // Switch to default mode
}
// We are on our path back to the track
if (!oPit->oPitLane[0].InPitSection(TrackPos))
{ // If we reached the end of the pitlane
CarLightCmd = RM_LIGHT_HEAD1 | // All lights on
RM_LIGHT_HEAD2;
oState = PIT_NONE; // Switch to default mode
}
break;
}
}
}
//==========================================================================*

6
src/drivers/usr/src/pit.cpp
View File

@ -541,19 +541,19 @@ void Pit::pitCommand()
{
int remainingLaps = mCar->race.remainingLaps + 1;
if (remainingLaps <= 10 && mRain < 2)
if (remainingLaps <= 10 && mRain < 1)
{
mCar->pitcmd.tiresetChange = tCarPitCmd::SOFT;
mMyCar->setTireMu(1);
LogUSR.info("Change Tire SOFT !\n");
}
else if (remainingLaps <= 25 && mRain < 2)
else if (remainingLaps <= 25 && mRain < 1)
{
mCar->pitcmd.tiresetChange = tCarPitCmd::MEDIUM;
mMyCar->setTireMu(2);
LogUSR.info("Change Tire MEDIUM !\n");
}
else if(mRain < 2)
else if(mRain < 2 && mCar->priv.localTemperature > 28.0 )
{
mCar->pitcmd.tiresetChange = tCarPitCmd::HARD;
mMyCar->setTireMu(3);