[Stdair-svn] SF.net SVN: stdair:[66] trunk/stdair/stdair

[<qua...@us...>]

Revision: 66
          http://stdair.svn.sourceforge.net/stdair/?rev=66&view=rev
Author:   quannaus
Date:     2009-11-20 10:56:57 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
[dev] Some small changes.

Modified Paths:
--------------
    trunk/stdair/stdair/basic/BasConst.cpp
    trunk/stdair/stdair/bom/BomList.hpp
    trunk/stdair/stdair/bom/BomMap.hpp
    trunk/stdair/stdair/bom/FlightDateContent.cpp
    trunk/stdair/stdair/bom/LegDateContent.cpp
    trunk/stdair/stdair/bom/SegmentDateContent.hpp

Added Paths:
-----------
    trunk/stdair/stdair/basic/BasConst_General.hpp

Removed Paths:
-------------
    trunk/stdair/stdair/basic/BasConst_WorldSchedule.hpp

Modified: trunk/stdair/stdair/basic/BasConst.cpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst.cpp	2009-11-16 15:53:21 UTC (rev 65)
+++ trunk/stdair/stdair/basic/BasConst.cpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -5,7 +5,7 @@
 #include <string>
 // STDAIR
 #include <stdair/STDAIR_Types.hpp>
-#include <stdair/basic/BasConst_WorldSchedule.hpp>
+#include <stdair/basic/BasConst_General.hpp>
 #include <stdair/basic/BasConst_Inventory.hpp>
 #include <stdair/basic/BasConst_BookingClass.hpp>
 #include <stdair/basic/BasConst_Yield.hpp>
@@ -127,8 +127,8 @@
   /** Default Date OffSet (e.g., 0). */
   const DateOffSet_T DEFAULT_DATE_OFFSET (0);
   
-  //  // //////// WorldSchedule ///////
-  //   /** Default update date for the WorldSchedule. */
+  //  // //////// General ///////
+  //   /** Default update date for the General. */
   //   const Date_T DEFAULT_WORLD_SCHEDULE_UPDATE_DATE (2007,
   //                                                    boost::gregorian::Jan,
   //                                                    1);

Copied: trunk/stdair/stdair/basic/BasConst_General.hpp (from rev 63, trunk/stdair/stdair/basic/BasConst_WorldSchedule.hpp)
===================================================================
--- trunk/stdair/stdair/basic/BasConst_General.hpp	                        (rev 0)
+++ trunk/stdair/stdair/basic/BasConst_General.hpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -0,0 +1,40 @@
+#ifndef __STDAIR_BAS_BASCONST_GENERAL_HPP
+#define __STDAIR_BAS_BASCONST_GENERAL_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// LATUS Common
+#include <stdair/STDAIR_Types.hpp>
+
+namespace stdair {
+
+  /** Default epsilon value. */
+  extern const double DEFAULT_EPSILON_VALUE;
+
+  /** Default flight speed (number of kilometers per hour). */
+  extern const unsigned int DEFAULT_FLIGHT_SPEED;
+
+  /** Default cabin capacity for Leg cabins. */
+  extern const CabinCapacity_T DEFAULT_CABIN_CAPACITY;
+
+  /** Default number of generated flight dates . */
+  extern const NbOfFlightDates_T DEFAULT_NB_OF_FLIGHTDATES;
+
+  /** Default number of bookings for BookingClass. */
+  extern const NbOfBookings_T DEFAULT_CLASS_NB_OF_BOOKINGS;
+
+  /** Default distance value (kilometers). */
+  extern const Distance_T DEFAULT_DISTANCE_VALUE;
+
+  /** Default value of Fare. */
+  extern const Fare_T DEFAULT_CLASS_FARE_VALUE;
+
+  /** Default revenue value. */
+  extern const Revenue_T DEFAULT_REVENUE_VALUE;
+
+  /** Default booking rate for OnD bookings over overall class bookings. */
+  extern const BookingRatio_T DEFAULT_OND_BOOKING_RATE;
+
+}
+#endif // __STDAIR_BAS_BASCONST_GENERAL_HPP

Deleted: trunk/stdair/stdair/basic/BasConst_WorldSchedule.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_WorldSchedule.hpp	2009-11-16 15:53:21 UTC (rev 65)
+++ trunk/stdair/stdair/basic/BasConst_WorldSchedule.hpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -1,40 +0,0 @@
-#ifndef __STDAIR_BAS_BASCONST_WORLDSCHEDULE_HPP
-#define __STDAIR_BAS_BASCONST_WORLDSCHEDULE_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// LATUS Common
-#include <stdair/STDAIR_Types.hpp>
-
-namespace stdair {
-
-  /** Default epsilon value. */
-  extern const double DEFAULT_EPSILON_VALUE;
-
-  /** Default flight speed (number of kilometers per hour). */
-  extern const unsigned int DEFAULT_FLIGHT_SPEED;
-
-  /** Default cabin capacity for Leg cabins. */
-  extern const CabinCapacity_T DEFAULT_CABIN_CAPACITY;
-
-  /** Default number of generated flight dates . */
-  extern const NbOfFlightDates_T DEFAULT_NB_OF_FLIGHTDATES;
-
-  /** Default number of bookings for BookingClass. */
-  extern const NbOfBookings_T DEFAULT_CLASS_NB_OF_BOOKINGS;
-
-  /** Default distance value (kilometers). */
-  extern const Distance_T DEFAULT_DISTANCE_VALUE;
-
-  /** Default value of Fare. */
-  extern const Fare_T DEFAULT_CLASS_FARE_VALUE;
-
-  /** Default revenue value. */
-  extern const Revenue_T DEFAULT_REVENUE_VALUE;
-
-  /** Default booking rate for OnD bookings over overall class bookings. */
-  extern const BookingRatio_T DEFAULT_OND_BOOKING_RATE;
-
-}
-#endif // __STDAIR_BAS_BASCONST_WORLDSCHEDULE_HPP

Modified: trunk/stdair/stdair/bom/BomList.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomList.hpp	2009-11-16 15:53:21 UTC (rev 65)
+++ trunk/stdair/stdair/bom/BomList.hpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -4,6 +4,8 @@
 // //////////////////////////////////////////////////////////////////////
 // Import section
 // //////////////////////////////////////////////////////////////////////
+// STL
+#include <vector>
 
 namespace stdair {
   

Modified: trunk/stdair/stdair/bom/BomMap.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomMap.hpp	2009-11-16 15:53:21 UTC (rev 65)
+++ trunk/stdair/stdair/bom/BomMap.hpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -4,6 +4,8 @@
 // //////////////////////////////////////////////////////////////////////
 // Import section
 // //////////////////////////////////////////////////////////////////////
+// STL
+#include <map>
 
 namespace stdair {
   

Modified: trunk/stdair/stdair/bom/FlightDateContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateContent.cpp	2009-11-16 15:53:21 UTC (rev 65)
+++ trunk/stdair/stdair/bom/FlightDateContent.cpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -4,7 +4,7 @@
 // STL
 #include <cassert>
 // STDAIR
-#include <stdair/basic/BasConst_WorldSchedule.hpp>
+#include <stdair/basic/BasConst_General.hpp>
 #include <stdair/bom/FlightDateContent.hpp>
 
 namespace stdair {

Modified: trunk/stdair/stdair/bom/LegDateContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateContent.cpp	2009-11-16 15:53:21 UTC (rev 65)
+++ trunk/stdair/stdair/bom/LegDateContent.cpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -4,7 +4,7 @@
 // STL
 #include <cassert>
 // STDAIR
-#include <stdair/basic/BasConst_WorldSchedule.hpp>
+#include <stdair/basic/BasConst_General.hpp>
 #include <stdair/bom/LegDateContent.hpp>
 
 namespace stdair {

Modified: trunk/stdair/stdair/bom/SegmentDateContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateContent.hpp	2009-11-16 15:53:21 UTC (rev 65)
+++ trunk/stdair/stdair/bom/SegmentDateContent.hpp	2009-11-20 10:56:57 UTC (rev 66)
@@ -152,6 +152,11 @@
       _segmentUnitRevenue = iSegmentURevenue;
     }
 
+    /** Set the distance. */
+    void setDistance (const Distance_T& iDistance) {
+      _distance = iDistance;
+    }
+
     
   public:
     // /////////// Display support methods /////////


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.