Modified Files:

[flightgear.git] / src / Traffic / TrafficMgr.cxx

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 99a97c9d98899c5b09d01ffa483c9bf63db2edbb..86be2196cb2e02e4da8b1a76152f65bda97089f3 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -49,6 +49,7 @@
 #include <algorithm>
 
 #include <plib/sg.h>
+#include <plib/ul.h>
 
 #include <simgear/compiler.h>
 #include <simgear/math/polar3d.hxx>
@@ -77,6 +78,21 @@ SG_USING_STD(sort);
 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();
 }
 
 
@@ -97,30 +113,90 @@ void FGTrafficManager::init()
   //     currAircraft++;
   //   }
   //   }
-  //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
+  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((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);
+    }
+  // 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)
+  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(int id)
@@ -232,7 +308,7 @@ void  FGTrafficManager::endElement (const char * name) {
       string apt = fgGetString("/sim/presets/airport-id");
       //cerr << "Airport information: " << apt << " " << departurePort << " " << arrivalPort << endl;
       if (departurePort == apt) score++;
-      flights.push_back(FGScheduledFlight(callsign,
+      flights.push_back(new FGScheduledFlight(callsign,
                                          fltrules,
                                          departurePort,
                                          arrivalPort,
@@ -244,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,
@@ -256,8 +332,14 @@ void  FGTrafficManager::endElement (const char * name) {
                                               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 "