X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FTraffic%2FTrafficMgr.cxx;h=86be2196cb2e02e4da8b1a76152f65bda97089f3;hb=c1e29d09981dfcd47ff213069fbe8fd5c8ccaf0c;hp=cf2fa59801d8e8b5e89c561cf856a2ce01bfb053;hpb=5bc15d7a69813e97a7146742e3b2aa2d784eab73;p=flightgear.git diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx index cf2fa5980..86be2196c 100644 --- a/src/Traffic/TrafficMgr.cxx +++ b/src/Traffic/TrafficMgr.cxx @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * **************************************************************************/ @@ -33,6 +33,11 @@ * * *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -41,8 +46,10 @@ #include #include +#include #include +#include #include #include @@ -57,69 +64,147 @@ #include #include #include -#include
// That's pretty ugly, but I need fgFindAirportID +#include
#include "TrafficMgr.hxx" +SG_USING_STD(sort); /****************************************************************************** * TrafficManager *****************************************************************************/ FGTrafficManager::FGTrafficManager() { + score = 0; + runCount = 0; +} + +FGTrafficManager:: ~FGTrafficManager() +{ + for (ScheduleVectorIterator sched = scheduledAircraft.begin(); sched != scheduledAircraft.end(); sched++) + { + delete (*sched); + } + scheduledAircraft.clear(); + // for (FGScheduledFlightVecIterator flt = flights.begin(); flt != flights.end(); flt++) +// { +// delete (*flt); +// } +// flights.clear(); } void FGTrafficManager::init() { //cerr << "Initializing Schedules" << endl; - time_t now = time(NULL) + fgGetLong("/sim/time/warp"); - currAircraft = scheduledAircraft.begin(); - while (currAircraft != scheduledAircraft.end()) + //time_t now = time(NULL) + fgGetLong("/sim/time/warp"); + //currAircraft = scheduledAircraft.begin(); + //while (currAircraft != scheduledAircraft.end()) + // { + // if (!(currAircraft->init())) + // { + // currAircraft=scheduledAircraft.erase(currAircraft); + // //cerr << "Erasing " << currAircraft->getRegistration() << endl; + // } + // else + // { + // currAircraft++; + // } + // } + // Sort by points: Aircraft with frequent visits to the + // startup airport will be processed first + ulDir* d, *d2; + ulDirEnt* dent, *dent2; + SGPath aircraftDir = globals->get_fg_root(); + + /* keep the following three lines (which mimicks the old "fixed path" behavior) + * until we have some AI models with traffic in the base package + */ + SGPath path = aircraftDir; + path.append("Traffic/fgtraffic.xml"); + if (path.exists()) + readXML(path.str(),*this); + + aircraftDir.append("AI/Aircraft"); + if (aircraftDir.exists()) { - if (!(currAircraft->init())) - { - currAircraft=scheduledAircraft.erase(currAircraft); - //cerr << "Erasing " << currAircraft->getRegistration() << endl; - currAircraft--; - } - else - { - currAircraft++; - } + if((d = ulOpenDir(aircraftDir.c_str())) == NULL) + return; + while((dent = ulReadDir(d)) != NULL) { + //cerr << "Scanning : " << dent->d_name << endl; + if (string(dent->d_name) != string(".") && + string(dent->d_name) != string("..") && + dent->d_isdir) + { + SGPath currACDir = aircraftDir; + currACDir.append(dent->d_name); + if ((d2 = ulOpenDir(currACDir.c_str())) == NULL) + return; + while ((dent2 = ulReadDir(d2)) != NULL) { + SGPath currFile = currACDir; + currFile.append(dent2->d_name); + if (currFile.extension() == string("xml")) + { + //cerr << "found " << dent2->d_name << " for parsing" << endl; + SGPath currFile = currACDir; + currFile.append(dent2->d_name); + SG_LOG(SG_GENERAL, SG_INFO, "Scanning " << currFile.str() << " for traffic"); + readXML(currFile.str(),*this); + } + } + ulCloseDir(d2); + } + } + ulCloseDir(d); } - //cerr << "Sorting by distance " << endl; - sort(scheduledAircraft.begin(), scheduledAircraft.end()); + // Sort by points: Aircraft with frequent visits to the + // startup airport will be processed first + sort(scheduledAircraft.begin(), scheduledAircraft.end(), compareSchedules); currAircraft = scheduledAircraft.begin(); currAircraftClosest = scheduledAircraft.begin(); //cerr << "Done initializing schedules" << endl; } -void FGTrafficManager::update(double something) +void FGTrafficManager::update(double /*dt*/) { + //SG_LOG( SG_GENERAL, SG_INFO, "Running TrafficManager::Update() "); + // Hack alert: Skip running for the first frames 1000 after + // initialization to allow proper initialization of wheather stuff + // and runway assignments + if (runCount < 1000) + { + runCount++; + return; + } + //runCount = 0; time_t now = time(NULL) + fgGetLong("/sim/time/warp"); + if (scheduledAircraft.size() == 0) { + //SG_LOG( SG_GENERAL, SG_INFO, "Returned Running TrafficManager::Update() "); + return; + } if(currAircraft == scheduledAircraft.end()) { //cerr << "resetting schedule " << endl; currAircraft = scheduledAircraft.begin(); } - if (!(currAircraft->update(now))) + if (!((*currAircraft)->update(now))) { // after proper initialization, we shouldnt get here. // But let's make sure - cerr << "Failed to update aircraft schedule in traffic manager" << endl; + SG_LOG( SG_GENERAL, SG_ALERT, "Failed to update aircraft schedule in traffic manager"); } currAircraft++; + //SG_LOG( SG_GENERAL, SG_INFO, "Done Running TrafficManager::Update() "); } -void FGTrafficManager::release(void *id) +void FGTrafficManager::release(int id) { releaseList.push_back(id); } -bool FGTrafficManager::isReleased(void *id) +bool FGTrafficManager::isReleased(int id) { IdListIterator i = releaseList.begin(); while (i != releaseList.end()) @@ -218,7 +303,12 @@ void FGTrafficManager::endElement (const char * name) { //cerr << "Pusing back flight " << callsign << endl; //cerr << callsign << " " << fltrules << " "<< departurePort << " " << arrivalPort << " " // << cruiseAlt << " " << departureTime<< " "<< arrivalTime << " " << repeat << endl; - flights.push_back(FGScheduledFlight(callsign, + + //Prioritize aircraft + string apt = fgGetString("/sim/presets/airport-id"); + //cerr << "Airport information: " << apt << " " << departurePort << " " << arrivalPort << endl; + if (departurePort == apt) score++; + flights.push_back(new FGScheduledFlight(callsign, fltrules, departurePort, arrivalPort, @@ -230,7 +320,7 @@ void FGTrafficManager::endElement (const char * name) { else if (element == string("aircraft")) { //cerr << "Pushing back aircraft " << registration << endl; - scheduledAircraft.push_back(FGAISchedule(mdl, + scheduledAircraft.push_back(new FGAISchedule(mdl, livery, registration, heavy, @@ -240,9 +330,21 @@ void FGTrafficManager::endElement (const char * name) { flighttype, radius, offset, + score, flights)); - while(flights.begin() != flights.end()) - flights.pop_back(); + // while(flights.begin() != flights.end()) { +// flights.pop_back(); +// } + for (FGScheduledFlightVecIterator flt = flights.begin(); flt != flights.end(); flt++) + { + delete (*flt); + } + flights.clear(); + SG_LOG( SG_GENERAL, SG_BULK, "Reading aircraft : " + << registration + << " with prioritization score " + << score); + score = 0; } } @@ -260,11 +362,9 @@ void FGTrafficManager::pi (const char * target, const char * data) { } void FGTrafficManager::warning (const char * message, int line, int column) { - cout << "Warning: " << message << " (" << line << ',' << column << ')' - << endl; + SG_LOG(SG_IO, SG_WARN, "Warning: " << message << " (" << line << ',' << column << ')'); } void FGTrafficManager::error (const char * message, int line, int column) { - cout << "Error: " << message << " (" << line << ',' << column << ')' - << endl; + SG_LOG(SG_IO, SG_ALERT, "Error: " << message << " (" << line << ',' << column << ')'); }