Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[369] trunk/stdair
|
From: <den...@us...> - 2010-12-02 23:41:42
|
Revision: 369
http://stdair.svn.sourceforge.net/stdair/?rev=369&view=rev
Author: denis_arnaud
Date: 2010-12-02 23:41:34 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[API] First step towards a more granular API.
Modified Paths:
--------------
trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
trunk/stdair/stdair/bom/AirlineFeature.cpp
trunk/stdair/stdair/bom/AirlineFeature.hpp
trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
trunk/stdair/stdair/bom/AirlineFeatureKey.hpp
trunk/stdair/stdair/bom/AirlineStruct.cpp
trunk/stdair/stdair/bom/AirlineStruct.hpp
trunk/stdair/stdair/bom/BookingClassKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.hpp
trunk/stdair/stdair/bom/BookingRequestStruct.cpp
trunk/stdair/stdair/bom/BookingRequestStruct.hpp
trunk/stdair/stdair/bom/Bucket.cpp
trunk/stdair/stdair/bom/Bucket.hpp
trunk/stdair/stdair/bom/BucketKey.cpp
trunk/stdair/stdair/bom/EventQueue.cpp
trunk/stdair/stdair/bom/EventQueue.hpp
trunk/stdair/stdair/bom/EventStruct.cpp
trunk/stdair/stdair/bom/EventStruct.hpp
trunk/stdair/stdair/bom/EventTypes.hpp
trunk/stdair/stdair/bom/FareFamilyKey.cpp
trunk/stdair/stdair/bom/FareFamilyKey.hpp
trunk/stdair/stdair/bom/FlightDate.cpp
trunk/stdair/stdair/bom/FlightDate.hpp
trunk/stdair/stdair/bom/FlightDateKey.cpp
trunk/stdair/stdair/bom/FlightDateKey.hpp
trunk/stdair/stdair/bom/Inventory.cpp
trunk/stdair/stdair/bom/Inventory.hpp
trunk/stdair/stdair/bom/InventoryKey.cpp
trunk/stdair/stdair/bom/InventoryKey.hpp
trunk/stdair/stdair/bom/LegCabinKey.cpp
trunk/stdair/stdair/bom/LegCabinKey.hpp
trunk/stdair/stdair/bom/LegDateKey.cpp
trunk/stdair/stdair/bom/LegDateKey.hpp
trunk/stdair/stdair/bom/SegmentCabinKey.cpp
trunk/stdair/stdair/bom/SegmentCabinKey.hpp
trunk/stdair/stdair/bom/SegmentDate.cpp
trunk/stdair/stdair/bom/SegmentDate.hpp
trunk/stdair/stdair/bom/SegmentDateKey.cpp
trunk/stdair/stdair/bom/SegmentDateKey.hpp
trunk/stdair/stdair/bom/SegmentPeriodKey.cpp
trunk/stdair/stdair/bom/SegmentPeriodKey.hpp
trunk/stdair/stdair/bom/YieldStore.cpp
trunk/stdair/stdair/bom/YieldStore.hpp
trunk/stdair/stdair/bom/YieldStoreKey.cpp
trunk/stdair/stdair/bom/YieldStoreKey.hpp
trunk/stdair/stdair/command/DBManagerForAirlines.cpp
trunk/stdair/stdair/dbadaptor/DbaAirline.cpp
trunk/stdair/stdair/sources.mk
trunk/stdair/stdair/stdair_types.hpp
trunk/stdair/test/archi_static_cast/MP2Inventory.cpp
trunk/stdair/test/archi_static_cast/archi_static_cast.cpp
trunk/stdair/test/architecture/MPInventory.cpp
trunk/stdair/test/architecture/architecture.cpp
trunk/stdair/test/stdair/StdairTestLib.cpp
Added Paths:
-----------
trunk/stdair/stdair/stdair_basic_types.hpp
trunk/stdair/stdair/stdair_date_time_types.hpp
trunk/stdair/stdair/stdair_demand_types.hpp
trunk/stdair/stdair/stdair_fare_types.hpp
trunk/stdair/stdair/stdair_inventory_types.hpp
Modified: trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,7 +5,10 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
+#include <stdair/stdair_fare_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineFeature.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,7 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
+// StdAir
#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineFeature.hpp>
Modified: trunk/stdair/stdair/bom/AirlineFeature.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeature.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeature.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/AirlineFeatureKey.hpp>
#include <stdair/bom/AirlineFeatureTypes.hpp>
Modified: trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineFeatureKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineFeatureKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,7 +7,6 @@
#include <ostream>
#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineStruct.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/AirlineStruct.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingClassKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,7 +2,6 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/BookingClassKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingClassKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingRequestStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,7 +7,6 @@
#include <ostream>
#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/BookingRequestStruct.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingRequestStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingRequestStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -8,6 +8,8 @@
#include <iosfwd>
#include <string>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/BookingRequestTypes.hpp>
Modified: trunk/stdair/stdair/bom/Bucket.cpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Bucket.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/Bucket.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BucketKey.hpp>
#include <stdair/bom/BucketTypes.hpp>
Modified: trunk/stdair/stdair/bom/BucketKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/BucketKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/EventQueue.cpp
===================================================================
--- trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/EventStruct.hpp>
#include <stdair/bom/EventQueue.hpp>
Modified: trunk/stdair/stdair/bom/EventQueue.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventQueue.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventQueue.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,6 +7,7 @@
// STL
#include <iosfwd>
// StdAir
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/basic/StructAbstract.hpp>
#include <stdair/bom/EventTypes.hpp>
Modified: trunk/stdair/stdair/bom/EventStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/EventStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventStruct.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/basic/BasConst_General.hpp>
#include <stdair/bom/BookingRequestStruct.hpp>
#include <stdair/bom/EventStruct.hpp>
Modified: trunk/stdair/stdair/bom/EventStruct.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventStruct.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
#include <stdair/bom/BookingRequestTypes.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/EventTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/EventTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/EventTypes.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -8,6 +8,7 @@
// STL
#include <map>
// STDAIR
+#include <stdair/stdair_date_time_types.hpp>
#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FareFamilyKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FareFamilyKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/FareFamilyKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FareFamilyKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FareFamilyKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/FlightDate.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDate.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/FlightDateKey.hpp>
#include <stdair/bom/FlightDateTypes.hpp>
Modified: trunk/stdair/stdair/bom/FlightDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,14 +2,13 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/FlightDateKey.hpp>
namespace stdair {
// ////////////////////////////////////////////////////////////////////
FlightDateKey::FlightDateKey (const FlightNumber_T& iFlightNumber,
- const Date_T& iFlightDate)
+ const Date_T& iFlightDate)
: _flightNumber (iFlightNumber), _flightDate (iFlightDate) {
}
Modified: trunk/stdair/stdair/bom/FlightDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,9 +5,11 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of flight-date. */
struct FlightDateKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/Inventory.cpp
===================================================================
--- trunk/stdair/stdair/bom/Inventory.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Inventory.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/Inventory.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/Inventory.hpp
===================================================================
--- trunk/stdair/stdair/bom/Inventory.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/Inventory.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/InventoryKey.hpp>
#include <stdair/bom/InventoryTypes.hpp>
Modified: trunk/stdair/stdair/bom/InventoryKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/InventoryKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/InventoryKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/InventoryKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/InventoryKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/InventoryKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/InventoryKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/LegCabinKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/LegDateKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,8 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/SegmentCabinKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDate.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDate.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// STDAIR
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/bom/SegmentDate.hpp>
Modified: trunk/stdair/stdair/bom/SegmentDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDate.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDate.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/SegmentDateKey.hpp>
#include <stdair/bom/SegmentDateTypes.hpp>
Modified: trunk/stdair/stdair/bom/SegmentDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/stdair_types.hpp>
+// StdAir
#include <stdair/bom/SegmentDateKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,8 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentPeriodKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentPeriodKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentPeriodKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -1,8 +1,9 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/SegmentPeriodKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentPeriodKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentPeriodKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/SegmentPeriodKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/YieldStore.cpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStore.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStore.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -3,8 +3,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
-#include <stdair/stdair_types.hpp>
+#include <sstream>
+// StdAir
#include <stdair/bom/YieldStore.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/YieldStore.hpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStore.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStore.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <string>
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/YieldStoreKey.hpp>
#include <stdair/bom/YieldStoreTypes.hpp>
Modified: trunk/stdair/stdair/bom/YieldStoreKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStoreKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStoreKey.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,7 +2,6 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_types.hpp>
#include <stdair/bom/YieldStoreKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/YieldStoreKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/YieldStoreKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/bom/YieldStoreKey.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,6 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/command/DBManagerForAirlines.cpp
===================================================================
--- trunk/stdair/stdair/command/DBManagerForAirlines.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/command/DBManagerForAirlines.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -12,7 +12,7 @@
#include <mysql/soci-mysql.h>
#endif // SOCI_HEADERS_BURIED
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/AirlineStruct.hpp>
#include <stdair/dbadaptor/DbaAirline.hpp>
#include <stdair/command/DBManagerForAirlines.hpp>
Modified: trunk/stdair/stdair/dbadaptor/DbaAirline.cpp
===================================================================
--- trunk/stdair/stdair/dbadaptor/DbaAirline.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/dbadaptor/DbaAirline.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -5,7 +5,7 @@
#include <exception>
#include <string>
// Stdair
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/AirlineStruct.hpp>
#include <stdair/dbadaptor/DbaAirline.hpp>
#include <stdair/service/Logger.hpp>
Modified: trunk/stdair/stdair/sources.mk
===================================================================
--- trunk/stdair/stdair/sources.mk 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/sources.mk 2010-12-02 23:41:34 UTC (rev 369)
@@ -2,6 +2,11 @@
$(top_srcdir)/stdair/stdair_exceptions.hpp \
$(top_srcdir)/stdair/stdair_log.hpp \
$(top_srcdir)/stdair/stdair_db.hpp \
+ $(top_srcdir)/stdair/stdair_basic_types.hpp \
+ $(top_srcdir)/stdair/stdair_date_time_types.hpp \
+ $(top_srcdir)/stdair/stdair_inventory_types.hpp \
+ $(top_srcdir)/stdair/stdair_demand_types.hpp \
+ $(top_srcdir)/stdair/stdair_fare_types.hpp \
$(top_srcdir)/stdair/stdair_types.hpp \
$(top_srcdir)/stdair/stdair_service.hpp \
$(top_srcdir)/stdair/stdair.hpp
Copied: trunk/stdair/stdair/stdair_basic_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_basic_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,75 @@
+#ifndef __STDAIR_STDAIR_BASIC_TYPES_HPP
+#define __STDAIR_STDAIR_BASIC_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+
+namespace stdair {
+
+ // //////////////////////////////////////////////////////////////////////
+ // Basic types
+ /** Event type */
+ typedef std::string EventType_T;
+
+ /** Count */
+ typedef int Count_T;
+
+ /** Location code (3-letter-code, e.g., LON). */
+ typedef std::string LocationCode_T;
+
+ /** Define a distance (kilometers). */
+ typedef long int Distance_T;
+
+ /** Define the Airport Code type (3-letter-code, e.g., LHR). */
+ typedef LocationCode_T AirportCode_T;
+
+ /** City code */
+ typedef LocationCode_T CityCode_T;
+
+ /** Define a identity number. */
+ typedef unsigned long Identity_T;
+
+ /** Trip type */
+ typedef std::string TripType_T;
+
+ /** Monetary value */
+ typedef double MonetaryValue_T;
+
+ /** Real number */
+ typedef double RealNumber_T;
+
+ /** Define a percentage value (between 0 and 100%). */
+ typedef double Percentage_T;
+
+ /** Define a price value (e.g., 1000.0 Euros). */
+ typedef double PriceValue_T;
+
+ /** Define a price currency (e.g., EUR for Euros). */
+ typedef std::string PriceCurrency_T;
+
+ /** Define an amount of revenue. */
+ typedef double Revenue_T;
+
+ /** Define the name of a multiplier. */
+ typedef double Multiplier_T;
+
+ /** Define the rate of overbooking */
+ typedef double OverbookingRate_T;
+
+ /** Define the number of seats (it can be non integer, because the
+ overbooking can be applied at booking class or PNR level). */
+ typedef double NbOfSeats_T;
+
+ /** Define the number of seats required by a demand. */
+ // typedef unsigned short NbOfSeats_T;
+
+ // //////////////////////////////////////////////////////////////////////
+ // Probability
+ /** Probability */
+ typedef float Probability_T;
+
+}
+#endif // __STDAIR_STDAIR_BASIC_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_date_time_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_date_time_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_date_time_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,66 @@
+#ifndef __STDAIR_STDAIR_DATE_TIME_TYPES_HPP
+#define __STDAIR_STDAIR_DATE_TIME_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+#include <map>
+// Boost Random
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+// Boost (Extended STL)
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/tuple/tuple.hpp>
+// StdAir
+#include <stdair/stdair_exceptions.hpp>
+#include <stdair/stdair_log.hpp>
+#include <stdair/stdair_db.hpp>
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_service.hpp>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define the type for durations (e.g., elapsed in-flight time). */
+ typedef boost::posix_time::time_duration Duration_T;
+
+ /** Define the type for date (e.g., departure date of a flight). */
+ typedef boost::gregorian::date Date_T;
+
+ /** Time */
+ typedef boost::posix_time::time_duration Time_T;
+
+ /** Define an accurate time (date+time). */
+ typedef boost::posix_time::ptime DateTime_T;
+
+ /** Define the Period (e.g., period during which flights depart). */
+ typedef boost::gregorian::date_period DatePeriod_T;
+
+ /** Define the Day-Of-the-Week as a string. */
+ typedef std::string DOW_String_T;
+
+ /** Define the Date Offset (e.g., -1 ). */
+ typedef boost::gregorian::date_duration DateOffset_T;
+
+ /** Define a duration in number of days. */
+ typedef unsigned int DayDuration_T;
+
+ /** Define the Saturday stay status of a travel. */
+ typedef bool SaturdayStay_T;
+
+ /** Time duration in (integer) number of seconds */
+ typedef long int IntDuration_T;
+
+ /** Time duration in (long long integer) number of milliseconds */
+ typedef long long int LongDuration_T;
+
+ /** Duration in (float) number of time units */
+ typedef float FloatDuration_T;
+
+}
+#endif // __STDAIR_STDAIR_DATE_TIME_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_demand_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_demand_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,109 @@
+#ifndef __STDAIR_STDAIR_DEMAND_TYPES_HPP
+#define __STDAIR_STDAIR_DEMAND_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+#include <map>
+// Boost Random
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+// Boost (Extended STL)
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/tuple/tuple.hpp>
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define the availability option allowing the ticket change. */
+ typedef bool ChangeFees_T;
+
+ /** Define the refundable availability of a tickets. */
+ typedef bool NonRefundable_T;
+
+ /** Define the average ratio (between 0 and 100) of demand with
+ a saturday stay status equal to TRUE. */
+ typedef unsigned int SaturdayStayRatio_T;
+
+ /** Define the average ratio of demand with change fee
+ availability. */
+ typedef unsigned int ChangeFeesRatio_T;
+
+ /** Define the average ratio of demand with non-refundable
+ availability. */
+ typedef unsigned int NonRefundableRatio_T;
+
+ /** Define the passenger characteristics, leisure or business
+ for instance (1-letter-code, e.g., L or B). */
+ typedef std::string PassengerType_T;
+
+ /** Define the identifier of a distribution pattern (e.g., 1). */
+ typedef std::string DistributionPatternId_T;
+
+ /** Define the identifier of a cancellation rate curve (e.g., C1). */
+ typedef std::string CancellationRateCurveId_T;
+
+ /** Define the identifier of an airline preference set list (e.g., AP1). */
+ typedef std::string AirlinePreferenceId_T;
+
+ /** Define a cancellation & and no-show rate pair. */
+ typedef std::pair<Percentage_T, Percentage_T> CancellationNoShowRatePair_T;
+
+ /** Define the identifier of a demand characteristics pattern
+ (e.g. Ch12); for a customer choice model */
+ typedef std::string CharacteristicsPatternId_T;
+
+ /** Define characteristics component index (e.g. W for WTP) */
+ typedef std::string CharacteristicsIndex_T;
+
+ /** Define a Willingness-To-Pay (WTP) (e.g., 1000.0 Euros). */
+ typedef double WTP_T;
+
+ /** Number of passengers (in a group) for a booking. */
+ typedef unsigned short PartySize_T;
+
+ /** Define a number of requests. */
+ typedef double NbOfRequests_T;
+
+ /** Define a number of bookings. */
+ typedef NbOfRequests_T NbOfBookings_T;
+
+ /** Define a number of cancellations (travellers). */
+ typedef NbOfRequests_T NbOfCancellations_T;
+
+ /** Define a number of no-shows. */
+ typedef NbOfRequests_T NbOfNoShows_T;
+
+ /** Define a number of travel solutions
+ (in a travel solution block). */
+ typedef unsigned short NbOfTravelSolutions_T;
+
+ /** Define the name of an event. */
+ typedef std::string EventName_T;
+
+ /** Define a number of events. */
+ typedef double NbOfEvents_T;
+
+ // //////////////////////////////////////////////////////////////////////
+ /** Type definition for the hashed key of the DemandStreamKey object. */
+ typedef std::string DemandStreamKeyStr_T;
+
+ /** Type of booking channel (D=direct, I=indirect, N=oNline, F=oFfline). */
+ typedef std::string ChannelLabel_T;
+
+ /** Type of trip type (RO=outbound of round-trip, RI=inbound of round-trip,
+ OW=one way). */
+ typedef std::string TripType_T;
+
+ /** Type of frequent flyer (P=Platinum, G=Gold, S=Silver, M=Member, N=None).*/
+ typedef std::string FrequentFlyer_T;
+
+}
+#endif // __STDAIR_STDAIR_DEMAND_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_fare_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_fare_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_fare_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,18 @@
+#ifndef __STDAIR_STDAIR_FARE_TYPES_HPP
+#define __STDAIR_STDAIR_FARE_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define a number of fare rules. */
+ typedef double NbOfFareRules_T;
+
+ /** Define the fare of a travel solution. */
+ typedef double Fare_T;
+
+}
+#endif // __STDAIR_STDAIR_FARE_TYPES_HPP
Copied: trunk/stdair/stdair/stdair_inventory_types.hpp (from rev 368, trunk/stdair/stdair/stdair_types.hpp)
===================================================================
--- trunk/stdair/stdair/stdair_inventory_types.hpp (rev 0)
+++ trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -0,0 +1,126 @@
+#ifndef __STDAIR_STDAIR_INVENTORY_TYPES_HPP
+#define __STDAIR_STDAIR_INVENTORY_TYPES_HPP
+
+// //////////////////////////////////////////////////////////////////////
+// Import section
+// //////////////////////////////////////////////////////////////////////
+// STL
+#include <string>
+#include <vector>
+#include <map>
+// StdAir
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
+
+namespace stdair {
+
+ // //////// Type definitions /////////
+ /** Define the Airline Code type (2-letter-code, e.g., BA). */
+ typedef std::string AirlineCode_T;
+
+ /** Define a list of airline code. */
+ typedef std::vector<AirlineCode_T> AirlineCodeList_T;
+
+ /** Define the type for flight numbers. */
+ typedef unsigned short FlightNumber_T;
+
+ /** Define the cabin code (class of service, e.g., first, business,
+ economy). */
+ typedef std::string CabinCode_T;
+
+ /** Define the code of the fare family (e.g., 1, 2, 3, etc.). */
+ typedef std::string FamilyCode_T;
+
+ /** Define the booking class code (product segment class, e.g., H,
+ B, K, etc.). */
+ typedef std::string ClassCode_T;
+
+ /** Define a list of class code. */
+ typedef std::vector<ClassCode_T> ClassCodeList_T;
+
+ /** Define the sub-class code (e.g., 0, 1, 2, etc.). The subclass is
+ a sub-structure for the booking class, allowing to have specific
+ rules for some criteria like POS. */
+ typedef unsigned short SubclassCode_T;
+
+ /** Define the flight path code (code made by a suite of flight numbers). */
+ typedef std::string FlightPathCode_T;
+
+ /** Define the list of class codes as a string. */
+ typedef std::string ClassList_String_T;
+
+ /** Define a number of segment-dates (in a path). */
+ typedef unsigned short NbOfSegments_T;
+
+ /** Define a number of airlines (in a path). */
+ typedef unsigned short NbOfAirlines_T;
+
+ /** Map between the cabin codes and the booking class codes within
+ each cabin. */
+ typedef std::map<CabinCode_T, ClassList_String_T> CabinBookingClassMap_T;
+
+ /** Define the cabin capacity (resource, e.g., 200 seats).
+ <br>The capacity is expressed as a double to cope with overbooking. */
+ typedef double CabinCapacity_T;
+
+ /** Define a number of flight dates. */
+ typedef double NbOfFlightDates_T;
+
+ /** Define the commited space of a cabin. */
+ typedef double CommitedSpace_T;
+
+ /** Define the unsold protection (UPR). */
+ typedef double UPR_T;
+
+ /** Define the value of the booking limit. */
+ typedef double BookingLimit_T;
+
+ /** Define the value of the authorization level. */
+ typedef double AuthorizationLevel_T;
+
+ /** Define the value of the adjustment for cabin capacity. */
+ typedef double CapacityAdjustment_T;
+
+ /** Define the number of seat which could not be used for the booking. */
+ typedef double BlockSpace_T;
+
+ /** Define an availability. */
+ typedef double Availability_T;
+
+ /** Define an availability. */
+ typedef bool AvailabilityStatus_T;
+
+ /** Define a list of availabilities. */
+ typedef std::vector<Availability_T> BucketAvailabilities_T;
+
+ /** Define a number of yields. */
+ typedef double NbOfYields_T;
+
+ /** Define a number of InventoryControlRules. */
+ typedef double NbOfInventoryControlRules_T;
+
+ /** Define availibility of booking limit. */
+ typedef bool CensorshipFlag_T;
+
+ /** Define the list of censorship flags (une list per booking
+ class, one censorship flag per DCP). */
+ typedef std::vector<bool> CensorshipFlagList_T;
+
+ /** Define the bookingRatio (for instance OnD bookings
+ over whole class bookings). */
+ typedef double BookingRatio_T;
+
+ /** Define the yield of a virtual class. */
+ typedef double Yield_T;
+
+ /** Define the Bid-Price. */
+ typedef double BidPrice_T;
+
+ /** Define a Bid-Price Vector. */
+ typedef std::vector<BidPrice_T> BidPriceVector_T;
+
+ /** Define the current index of a Bid-Price Vector (for a given LegCabin). */
+ typedef unsigned int SeatIndex_T;
+
+}
+#endif // __STDAIR_STDAIR_INVENTORY_TYPES_HPP
Modified: trunk/stdair/stdair/stdair_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_types.hpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/stdair/stdair_types.hpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -20,6 +20,11 @@
#include <stdair/stdair_exceptions.hpp>
#include <stdair/stdair_log.hpp>
#include <stdair/stdair_db.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_demand_types.hpp>
+#include <stdair/stdair_fare_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
#include <stdair/stdair_service.hpp>
namespace stdair {
@@ -28,21 +33,6 @@
/** Define the type for network ID. */
typedef std::string NetworkID_T;
- /** Define the Airline Code type (2-letter-code, e.g., BA). */
- typedef std::string AirlineCode_T;
-
- /** Define a list of airline code. */
- typedef std::vector<AirlineCode_T> AirlineCodeList_T;
-
- /** Location code (3-letter-code, e.g., LON). */
- typedef std::string LocationCode_T;
-
- /** Define the Airport Code type (3-letter-code, e.g., LHR). */
- typedef LocationCode_T AirportCode_T;
-
- /** Define the type for flight numbers. */
- typedef unsigned short FlightNumber_T;
-
/** Define the file address type (e.g. "a_directory/a_filename")*/
typedef std::string FileAddress_T;
@@ -59,242 +49,18 @@
B: booked, C: cancelled, R: Rejected). */
typedef std::string RequestStatus_T;
- /** Define the type for durations (e.g., elapsed in-flight time). */
- typedef boost::posix_time::time_duration Duration_T;
-
- /** Define the type for date (e.g., departure date of a flight). */
- typedef boost::gregorian::date Date_T;
-
- /** Time */
- typedef boost::posix_time::time_duration Time_T;
-
- /** Define an accurate time (date+time). */
- typedef boost::posix_time::ptime DateTime_T;
-
- /** Define a distance (kilometers). */
- typedef long int Distance_T;
-
- /** Define the Period (e.g., period during which flights depart). */
- typedef boost::gregorian::date_period DatePeriod_T;
-
- /** Define the Day-Of-the-Week as a string. */
- typedef std::string DOW_String_T;
-
- /** Define the Date Offset (e.g., -1 ). */
- typedef boost::gregorian::date_duration DateOffset_T;
-
- /** Define a duration in number of days. */
- typedef unsigned int DayDuration_T;
-
- /** Define the Saturday stay status of a travel. */
- typedef bool SaturdayStay_T;
-
- /** Define the availability option allowing the ticket change. */
- typedef bool ChangeFees_T;
-
- /** Define the refundable availability of a tickets. */
- typedef bool NonRefundable_T;
-
- /** Define the average ratio (between 0 and 100) of demand with
- a saturday stay status equal to TRUE. */
- typedef unsigned int SaturdayStayRatio_T;
-
- /** Define the average ratio of demand with change fee
- availability. */
- typedef unsigned int ChangeFeesRatio_T;
-
- /** Define the average ratio of demand with non-refundable
- availability. */
- typedef unsigned int NonRefundableRatio_T;
-
- /** Define the passenger characteristics, leisure or business
- for instance (1-letter-code, e.g., L or B). */
- typedef std::string PassengerType_T;
-
- /** Define the identifier of a distribution pattern (e.g., 1). */
- typedef std::string DistributionPatternId_T;
-
- /** Define the identifier of a cancellation rate curve (e.g., C1). */
- typedef std::string CancellationRateCurveId_T;
-
- /** Define the identifier of an airline preference set list (e.g., AP1). */
- typedef std::string AirlinePreferenceId_T;
-
- /** Define a percentage value (between 0 and 100%). */
- typedef double Percentage_T;
-
- /** Define a cancellation & and no-show rate pair. */
- typedef std::pair<Percentage_T, Percentage_T> CancellationNoShowRatePair_T;
-
- /** Define the identifier of a demand characteristics pattern
- (e.g. Ch12); for a customer choice model */
- typedef std::string CharacteristicsPatternId_T;
-
- /** Define characteristics component index (e.g. W for WTP) */
- typedef std::string CharacteristicsIndex_T;
-
- /** Define the cabin code (class of service, e.g., first, business,
- economy). */
- typedef std::string CabinCode_T;
-
- /** Define a price value (e.g., 1000.0 Euros). */
- typedef double PriceValue_T;
-
- /** Define a price currency (e.g., EUR for Euros). */
- typedef std::string PriceCurrency_T;
-
- /** Define a Willingness-To-Pay (WTP) (e.g., 1000.0 Euros). */
- typedef double WTP_T;
-
- /** Define the number of seats (it can be non integer, because the
- overbooking can be applied at booking class or PNR level). */
- typedef double NbOfSeats_T;
-
- /** Define the number of seats required by a demand. */
- // typedef unsigned short NbOfSeats_T;
-
- /** Number of passengers (in a group) for a booking. */
- typedef unsigned short PartySize_T;
-
/** Define a mean value (e.g., 20.2). */
typedef double MeanValue_T;
/** Define a standard deviation value (e.g., 1.5). */
typedef double StdDevValue_T;
- /** Define the cabin capacity (resource, e.g., 200 seats).
- <br>The capacity is expressed as a double to cope with overbooking. */
- typedef double CabinCapacity_T;
-
- /** Define the number of seat which could not be used for the booking. */
- typedef double BlockSpace_T;
-
- /** Define the code of the fare family (e.g., 1, 2, 3, etc.). */
- typedef std::string FamilyCode_T;
-
- /** Define the booking class code (product segment class, e.g., H,
- B, K, etc.). */
- typedef std::string ClassCode_T;
-
- /** Define a list of class code. */
- typedef std::vector<ClassCode_T> ClassCodeList_T;
-
- /** Define the sub-class code (e.g., 0, 1, 2, etc.). The subclass is
- a sub-structure for the booking class, allowing to have specific
- rules for some criteria like POS. */
- typedef unsigned short SubclassCode_T;
-
- /** Define the flight path code (code made by a suite of flight numbers). */
- typedef std::string FlightPathCode_T;
-
- /** Define an availability. */
- typedef double Availability_T;
-
- /** Define an availability. */
- typedef bool AvailabilityStatus_T;
-
- /** Define a list of availabilities. */
- typedef std::vector<Availability_T> BucketAvailabilities_T;
-
- /** Define a identity number. */
- typedef unsigned long Identity_T;
-
/** Define a map between a BookingID and a TravelSolutionID. */
typedef std::map<Identity_T, Identity_T> BookingTSIDMap_T;
- /** Define a number of requests. */
- typedef double NbOfRequests_T;
-
- /** Define a number of bookings. */
- typedef NbOfRequests_T NbOfBookings_T;
-
- /** Define a number of cancellations (travellers). */
- typedef NbOfRequests_T NbOfCancellations_T;
-
- /** Define a number of no-shows. */
- typedef NbOfRequests_T NbOfNoShows_T;
-
- /** Define a number of fare rules. */
- typedef double NbOfFareRules_T;
-
- /** Define a number of yields. */
- typedef double NbOfYields_T;
-
- /** Define a number of InventoryControlRules. */
- typedef double NbOfInventoryControlRules_T;
-
- /** Define a number of flight dates. */
- typedef double NbOfFlightDates_T;
-
- /** Define the commited space of a cabin. */
- typedef double CommitedSpace_T;
-
- /** Define the unsold protection (UPR). */
- typedef double UPR_T;
-
- /** Define availibility of booking limit. */
- typedef bool CensorshipFlag_T;
-
- /** Define the list of censorship flags (une list per booking
- class, one censorship flag per DCP). */
- typedef std::vector<bool> CensorshipFlagList_T;
-
- /** Define the value of the booking limit. */
- typedef double BookingLimit_T;
-
- /** Define the value of the authorization level. */
- typedef double AuthorizationLevel_T;
-
- /** Define the value of the adjustment for cabin capacity. */
- typedef double CapacityAdjustment_T;
-
- /** Define the rate of overbooking */
- typedef double OverbookingRate_T;
-
- /** Define the bookingRatio (for instance OnD bookings
- over whole class bookings). */
- typedef double BookingRatio_T;
-
- /** Define the list of class codes as a string. */
- typedef std::string ClassList_String_T;
-
- /** Define a number of segment-dates (in a path). */
- typedef unsigned short NbOfSegments_T;
-
- /** Define a number of airlines (in a path). */
- typedef unsigned short NbOfAirlines_T;
-
- /** Define the fare of a travel solution. */
- typedef double Fare_T;
-
- /** Define the yield of a virtual class. */
- typedef double Yield_T;
-
- /** Define the Bid-Price. */
- typedef double BidPrice_T;
-
- /** Define a Bid-Price Vector. */
- typedef std::vector<BidPrice_T> BidPriceVector_T;
-
- /** Define the current index of a Bid-Price Vector (for a given LegCabin). */
- typedef unsigned int SeatIndex_T;
-
- /** Define a number of travel solutions
- (in a travel solution block). */
- typedef unsigned short NbOfTravelSolutions_T;
-
/** Define a indicator of demand to class matching. */
typedef double MatchingIndicator_T;
- /** Define an amount of revenue. */
- typedef double Revenue_T;
-
- /** Define the name of an event. */
- typedef std::string EventName_T;
-
- /** Define a number of events. */
- typedef double NbOfEvents_T;
-
/** Frequency of the Data Collection Point description (daily, monthly or
detailed). */
typedef std::string DCPModeFrequency_T;
@@ -367,36 +133,6 @@
typedef float Probability_T;
// //////////////////////////////////////////////////////////////////////
- // Date / Time
- /** Time duration in (integer) number of seconds */
- typedef long int IntDuration_T;
-
- /** Time duration in (long long integer) number of milliseconds */
- typedef long long int LongDuration_T;
-
- /** Duration in (float) number of time units */
- typedef float FloatDuration_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Basic types
- /** Event type */
- typedef std::string EventType_T;
-
- /** Count */
- typedef int Count_T;
-
- /** City code */
- typedef LocationCode_T CityCode_T;
-
- /** Trip type */
- typedef std::string TripType_T;
-
- /** Monetary value */
- typedef double MonetaryValue_T;
-
- /** Real number */
- typedef double RealNumber_T;
-
/** Type definition for the hashed key of the DemandStreamKey object. */
typedef std::string DemandStreamKeyStr_T;
@@ -410,9 +146,5 @@
/** Type of frequent flyer (P=Platinum, G=Gold, S=Silver, M=Member, N=None). */
typedef std::string FrequentFlyer_T;
- /** Map between the cabin codes and the booking class codes within
- each cabin. */
- typedef std::map<CabinCode_T, ClassList_String_T> CabinBookingClassMap_T;
-
}
#endif // __STDAIR_STDAIR_TYPES_HPP
Modified: trunk/stdair/test/archi_static_cast/MP2Inventory.cpp
===================================================================
--- trunk/stdair/test/archi_static_cast/MP2Inventory.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/archi_static_cast/MP2Inventory.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,7 @@
// STL
#include <cassert>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
// Local
#include <test/archi_static_cast/MP2Inventory.hpp>
Modified: trunk/stdair/test/archi_static_cast/archi_static_cast.cpp
===================================================================
--- trunk/stdair/test/archi_static_cast/archi_static_cast.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/archi_static_cast/archi_static_cast.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -4,7 +4,7 @@
#include <string>
#include <list>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
// Local
#include <test/archi_static_cast/MP2BomRoot.hpp>
#include <test/archi_static_cast/MP2Inventory.hpp>
Modified: trunk/stdair/test/architecture/MPInventory.cpp
===================================================================
--- trunk/stdair/test/architecture/MPInventory.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/architecture/MPInventory.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -8,7 +8,7 @@
// STL
#include <cassert>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
// Local
#include <test/architecture/MPInventory.hpp>
Modified: trunk/stdair/test/architecture/architecture.cpp
===================================================================
--- trunk/stdair/test/architecture/architecture.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/architecture/architecture.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -7,11 +7,11 @@
#include <iostream>
#include <string>
// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomRoot.hpp>
#include <stdair/bom/BomManager.hpp>
#include <stdair/factory/FacBom.hpp>
#include <stdair/factory/FacBomManager.hpp>
-#include <stdair/stdair_types.hpp>
// Local
//#include <test/architecture/MPBomRoot.hpp>
#include <test/architecture/MPInventory.hpp>
Modified: trunk/stdair/test/stdair/StdairTestLib.cpp
===================================================================
--- trunk/stdair/test/stdair/StdairTestLib.cpp 2010-12-02 22:17:18 UTC (rev 368)
+++ trunk/stdair/test/stdair/StdairTestLib.cpp 2010-12-02 23:41:34 UTC (rev 369)
@@ -12,7 +12,7 @@
#include <boost/mpl/assert.hpp>
#include <boost/type_traits/is_same.hpp>
// StdAir
-#include <stdair/stdair_types.hpp>
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/stdair.hpp>
#include <stdair/service/Logger.hpp>
#include <test/stdair/StdairTestLib.hpp>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
