Merge branch 'maint' into next

[flightgear.git] / src / Traffic / Schedule.hxx

diff --git a/src/Traffic/Schedule.hxx b/src/Traffic/Schedule.hxx
index b099bd08c20f27cc0a54586174c70492b0139602..5511a7d1a258e01534376b99b7efbda037c47255 100644 (file)
--- a/src/Traffic/Schedule.hxx
+++ b/src/Traffic/Schedule.hxx
@@ -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.
  *
  *
  **************************************************************************/
@@ -29,19 +29,23 @@
 #ifndef _FGSCHEDULE_HXX_
 #define _FGSCHEDULE_HXX_
 
-#define TRAFFICTOAIDIST 150.0
+#define TRAFFICTOAIDISTTOSTART 150.0
+#define TRAFFICTOAIDISTTODIE   200.0
 
 
 class FGAISchedule
 {
  private:
   string modelPath;
+  string homePort;
   string livery;
   string registration;
   string airline;
   string acType;
   string m_class;
   string flightType;
+  string flightIdentifier;
+  string currentDestination;
   bool heavy;
   FGScheduledFlightVec flights;
   float lat;
@@ -50,13 +54,28 @@ class FGAISchedule
   double groundOffset;
   double distanceToUser;
   int AIManagerRef;
+  //int score;
   bool firstRun;
+  
 
 
  public:
   FGAISchedule();                                           // constructor
-  FGAISchedule(string, string, string, bool, string, string, string, string, double, double, FGScheduledFlightVec);  // construct & init
-  FGAISchedule(const FGAISchedule &other);             // copy constructor
+  FGAISchedule(string model, 
+               string livery,
+               string homePort, 
+               string registration, 
+               string flightId,
+               bool   heavy, 
+               string acType, 
+               string airline, 
+               string m_class, 
+               string flight_type, 
+               double radius, 
+               double offset);                              // construct & init
+  FGAISchedule(const FGAISchedule &other);                  // copy constructor
+
+
 
   ~FGAISchedule(); //destructor
 
@@ -64,30 +83,36 @@ class FGAISchedule
   bool init();
 
   double getSpeed         ();
-  void setClosestDistanceToUser();
-  void next();   // forces the schedule to move on to the next flight.
+  //void setClosestDistanceToUser();
+  bool next();   // forces the schedule to move on to the next flight.
 
-  time_t      getDepartureTime    () { return flights.begin()->getDepartureTime   (); };
-  FGAirport * getDepartureAirport () { return flights.begin()->getDepartureAirport(); };
-  FGAirport * getArrivalAirport   () { return flights.begin()->getArrivalAirport  (); };
-  int         getCruiseAlt        () { return flights.begin()->getCruiseAlt       (); };
+  // TODO: rework these four functions
+   time_t      getDepartureTime    () { return (*flights.begin())->getDepartureTime   (); };
+  FGAirport * getDepartureAirport () { return (*flights.begin())->getDepartureAirport(); };
+  FGAirport * getArrivalAirport   () { return (*flights.begin())->getArrivalAirport  (); };
+  int         getCruiseAlt        () { return (*flights.begin())->getCruiseAlt       (); };
   double      getRadius           () { return radius; };
   double      getGroundOffset     () { return groundOffset;};
-  string      getFlightType       () { return flightType;};
-  string      getAirline          () { return airline; };
-  string      getAircraft         () { return acType; };
-  string      getCallSign         () { return flights.begin()->getCallSign (); };
-  string      getRegistration     () { return registration;};
+  const string& getFlightType     () { return flightType;};
+  const string& getAirline        () { return airline; };
+  const string& getAircraft       () { return acType; };
+  const string& getCallSign       () { return (*flights.begin())->getCallSign (); };
+  const string& getRegistration   () { return registration;};
+  const string& getFlightRules    () { return (*flights.begin())->getFlightRules (); };
   bool getHeavy                   () { return heavy; };
-  bool operator< (const FGAISchedule &other) const { return (distanceToUser < other.distanceToUser); };
+  FGScheduledFlight*findAvailableFlight (const string &currentDestination, const string &req);
+  // used to sort in decending order of score: I've probably found a better way to
+  // decending order sorting, but still need to test that.
+  //bool operator< (const FGAISchedule &other) const { return (score > other.score); };
   //void * getAiRef                 () { return AIManagerRef; };
   //FGAISchedule* getAddress        () { return this;};
-  // More member functions follow later
 
 };
 
-typedef vector<FGAISchedule >           ScheduleVector;
-typedef vector<FGAISchedule >::iterator ScheduleVectorIterator;
+typedef vector<FGAISchedule*>           ScheduleVector;
+typedef vector<FGAISchedule*>::iterator ScheduleVectorIterator;
+
+bool compareSchedules(FGAISchedule*a, FGAISchedule*b);
 
 #endif