fly/flightgear
1
0
Fork 0
Code Activity

Maintenance: TrafficMgr

Browse source 
header guard.
explicit ctor.
virtual dtor.
remove dead code.
reduce variable scope.
++prefix for complex types.
eliminate variable shadowing of outer scope.
spelling.
This commit is contained in:
scttgs0 2023-05-26 21:24:32 -05:00
parent 98295c2728
commit a9968f86af
2 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/Traffic/TrafficMgr.cxx
View file

@ -91,7 +91,7 @@ using std::vector;
class ScheduleParseThread : public SGThread, public XMLVisitor class ScheduleParseThread : public SGThread, public XMLVisitor
{ {
public: public:
ScheduleParseThread(FGTrafficManager* traffic) : explicit ScheduleParseThread(FGTrafficManager* traffic) :
_trafficManager(traffic), _trafficManager(traffic),
_isFinished(false), _isFinished(false),
_cancelThread(false), _cancelThread(false),
@ -227,12 +227,12 @@ public:
else if (!strcmp(name, "flight")) { else if (!strcmp(name, "flight")) {
// We have loaded and parsed all the information belonging to this flight // We have loaded and parsed all the information belonging to this flight
// so we temporarily store it. // so we temporarily store it.
//cerr << "Pusing back flight " << callsign << endl; //cerr << "Pushing back flight " << callsign << endl;
//cerr << callsign << " " << fltrules << " "<< departurePort << " " << arrivalPort << " " //cerr << callsign << " " << fltrules << " "<< departurePort << " " << arrivalPort << " "
// << cruiseAlt << " " << departureTime<< " "<< arrivalTime << " " << repeat << endl; // << cruiseAlt << " " << departureTime<< " "<< arrivalTime << " " << repeat << endl;
//Prioritize aircraft //Prioritize aircraft
string apt = fgGetString("/sim/presets/airport-id"); // string apt = fgGetString("/sim/presets/airport-id");
// cerr << "Airport information: " << apt << " " << departurePort << " " << arrivalPort << endl; // cerr << "Airport information: " << apt << " " << departurePort << " " << arrivalPort << endl;
// if (departurePort == apt) score++; // if (departurePort == apt) score++;
// flights.push_back(new FGScheduledFlight(callsign, // flights.push_back(new FGScheduledFlight(callsign,
@ -243,6 +243,7 @@ public:
// departureTime, // departureTime,
// arrivalTime, // arrivalTime,
// repeat)); // repeat));
if (requiredAircraft == "") { if (requiredAircraft == "") {
char buffer[16]; char buffer[16];
snprintf(buffer, 16, "%d", acCounter); snprintf(buffer, 16, "%d", acCounter);
@ -255,7 +256,7 @@ public:
<< cruiseAlt << " " << cruiseAlt << " "
<< departureTime << " " << departureTime << " "
<< arrivalTime << " " << repeat << " " << requiredAircraft); << arrivalTime << " " << repeat << " " << requiredAircraft);
// For database maintainance purposes, it may be convenient to // For database maintenance purposes, it may be convenient to
// //
if (fgGetBool("/sim/traffic-manager/dumpdata") == true) { if (fgGetBool("/sim/traffic-manager/dumpdata") == true) {
SG_LOG(SG_AI, SG_ALERT, "Traffic Dump FLIGHT," << callsign << "," SG_LOG(SG_AI, SG_ALERT, "Traffic Dump FLIGHT," << callsign << ","
@ -350,8 +351,8 @@ private:
homePort = departurePort; homePort = departurePort;
} }
// caution, modifying the scheduled aircraft strucutre from the // caution, modifying the scheduled aircraft structure from the
// 'wrong' thread. This is safe becuase FGTrafficManager won't touch // 'wrong' thread. This is safe because FGTrafficManager won't touch
// the structure while we exist. // the structure while we exist.
_trafficManager->scheduledAircraft.push_back(new FGAISchedule(mdl, _trafficManager->scheduledAircraft.push_back(new FGAISchedule(mdl,
livery, livery,
@ -394,7 +395,7 @@ private:
} }
} catch (sg_exception& e) { } catch (sg_exception& e) {
simgear::reportFailure(simgear::LoadFailure::BadData, simgear::ErrorCode::AITrafficSchedule, simgear::reportFailure(simgear::LoadFailure::BadData, simgear::ErrorCode::AITrafficSchedule,
"XML errors parsinng traffic:" + e.getFormattedMessage(), xml); "XML errors parsing traffic:" + e.getFormattedMessage(), xml);
} }
} }
} // of sub-directories iteration } // of sub-directories iteration
@ -478,7 +479,7 @@ void FGTrafficManager::shutdown()
// Note: Intuitively, this doesn't make sense, but I do need to create the full file path first // Note: Intuitively, this doesn't make sense, but I do need to create the full file path first
// before creating the directories. The SimGear fgpath code has changed so that it first chops off // before creating the directories. The SimGear fgpath code has changed so that it first chops off
// the trailing dir separator and then determines the directory part of the file path by searching // the trailing dir separator and then determines the directory part of the file path by searching
// for the last dir separator. Effecively, this causes a full element of the directory tree to be // for the last dir separator. Effectively, this causes a full element of the directory tree to be
// skipped. // skipped.
SG_LOG(SG_GENERAL, SG_DEBUG, "Trying to create dir for : " << cacheData); SG_LOG(SG_GENERAL, SG_DEBUG, "Trying to create dir for : " << cacheData);
if (!cacheData.exists()) { if (!cacheData.exists()) {
@ -584,7 +585,6 @@ void FGTrafficManager::init()
} else { } else {
fgSetBool("/sim/traffic-manager/heuristics", false); fgSetBool("/sim/traffic-manager/heuristics", false);
SGPath path = string(fgGetString("/sim/traffic-manager/datafile")); SGPath path = string(fgGetString("/sim/traffic-manager/datafile"));
string ext = path.extension();
if (path.extension() == "xml") { if (path.extension() == "xml") {
if (path.exists()) { if (path.exists()) {
// use a SchedulerParser to parse, but run it in this thread, // use a SchedulerParser to parse, but run it in this thread,
@ -649,8 +649,8 @@ void FGTrafficManager::loadHeuristics()
airport[0], airport[1], airport[2]); airport[0], airport[1], airport[2]);
cacheData.append(buffer); cacheData.append(buffer);
cacheData.append(airport + "-cache.txt"); cacheData.append(airport + "-cache.txt");
string revisionStr;
if (cacheData.exists()) { if (cacheData.exists()) {
string revisionStr;
sg_ifstream data(cacheData); sg_ifstream data(cacheData);
data >> revisionStr; data >> revisionStr;
if (revisionStr != "[TrafficManagerCachedata:ref:2011:09:04]") { if (revisionStr != "[TrafficManagerCachedata:ref:2011:09:04]") {
@ -765,7 +765,7 @@ void FGTrafficManager::update(double dt)
//cerr << "Processing << " << (*currAircraft)->getRegistration() << " with score " << (*currAircraft)->getScore() << endl; //cerr << "Processing << " << (*currAircraft)->getRegistration() << " with score " << (*currAircraft)->getScore() << endl;
if ((*currAircraft)->update(now, userCart)) { if ((*currAircraft)->update(now, userCart)) {
// schedule is done - process another aircraft in next iteration // schedule is done - process another aircraft in next iteration
currAircraft++; ++currAircraft;
} }
} }
@ -785,7 +785,6 @@ void FGTrafficManager::readTimeTableFromFile(SGPath infileName)
double offset; double offset;
char buffer[256]; char buffer[256];
string buffString;
vector <string> tokens, depTime,arrTime; vector <string> tokens, depTime,arrTime;
sg_ifstream infile(infileName); sg_ifstream infile(infileName);
@ -795,7 +794,7 @@ void FGTrafficManager::readTimeTableFromFile(SGPath infileName)
break; break;
} }
//cerr << "Read line : " << buffer << endl; //cerr << "Read line : " << buffer << endl;
buffString = string(buffer); string buffString = string(buffer);
tokens.clear(); tokens.clear();
Tokenize(buffString, tokens, " \t"); Tokenize(buffString, tokens, " \t");
//for (it = tokens.begin(); it != tokens.end(); it++) { //for (it = tokens.begin(); it != tokens.end(); it++) {
@ -808,7 +807,6 @@ void FGTrafficManager::readTimeTableFromFile(SGPath infileName)
throw sg_io_exception("Error parsing traffic file @ " + buffString, infileName); throw sg_io_exception("Error parsing traffic file @ " + buffString, infileName);
} }
model = tokens[12]; model = tokens[12];
livery = tokens[6]; livery = tokens[6];
homePort = tokens[1]; homePort = tokens[1];
@ -879,20 +877,20 @@ void FGTrafficManager::readTimeTableFromFile(SGPath infileName)
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
int j = i+1; int j = i+1;
if (weekdays[i] != '.') { if (weekdays[i] != '.') {
char buffer[4]; char l_buffer[4];
snprintf(buffer, 4, "%d/", j); snprintf(l_buffer, 4, "%d/", j);
string departureTime = string(buffer) + depTimeGen + string(":00"); string departureTime = string(l_buffer) + depTimeGen + string(":00");
string arrivalTime; string arrivalTime;
if (!arrivalWeekdayNeedsIncrement) { if (!arrivalWeekdayNeedsIncrement) {
arrivalTime = string(buffer) + arrTimeGen + string(":00"); arrivalTime = string(l_buffer) + arrTimeGen + string(":00");
} }
if (arrivalWeekdayNeedsIncrement && i != 6 ) { if (arrivalWeekdayNeedsIncrement && i != 6 ) {
snprintf(buffer, 4, "%d/", j+1); snprintf(l_buffer, 4, "%d/", j+1);
arrivalTime = string(buffer) + arrTimeGen + string(":00"); arrivalTime = string(l_buffer) + arrTimeGen + string(":00");
} }
if (arrivalWeekdayNeedsIncrement && i == 6 ) { if (arrivalWeekdayNeedsIncrement && i == 6 ) {
snprintf(buffer, 4, "%d/", 0); snprintf(l_buffer, 4, "%d/", 0);
arrivalTime = string(buffer) + arrTimeGen + string(":00"); arrivalTime = string(l_buffer) + arrTimeGen + string(":00");
} }
SG_LOG(SG_AI, SG_ALERT, "Adding flight " << callsign << " " SG_LOG(SG_AI, SG_ALERT, "Adding flight " << callsign << " "
<< fltrules << " " << fltrules << " "

10
src/Traffic/TrafficMgr.hxx
View file

@ -43,8 +43,7 @@
**************************************************************************/ **************************************************************************/
#ifndef _TRAFFICMGR_HXX_ #pragma once
#define _TRAFFICMGR_HXX_
#include <set> #include <set>
#include <memory> #include <memory>
@ -56,6 +55,7 @@
#include "SchedFlight.hxx" #include "SchedFlight.hxx"
#include "Schedule.hxx" #include "Schedule.hxx"
class Heuristic class Heuristic
{ {
public: public:
@ -111,8 +111,8 @@ private:
bool metarReady(double dt); bool metarReady(double dt);
public: public:
FGTrafficManager(); explicit FGTrafficManager();
~FGTrafficManager(); virtual ~FGTrafficManager();
// Subsystem API. // Subsystem API.
void init() override; void init() override;
@ -124,5 +124,3 @@ public:
FGScheduledFlightVecIterator getFirstFlight(const std::string &ref) { return flights[ref].begin(); } FGScheduledFlightVecIterator getFirstFlight(const std::string &ref) { return flights[ref].begin(); }
FGScheduledFlightVecIterator getLastFlight(const std::string &ref) { return flights[ref].end(); } FGScheduledFlightVecIterator getLastFlight(const std::string &ref) { return flights[ref].end(); }
}; };
#endif