Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[380] trunk/stdair/stdair
|
From: <den...@us...> - 2010-12-03 14:27:51
|
Revision: 380
http://stdair.svn.sourceforge.net/stdair/?rev=380&view=rev
Author: denis_arnaud
Date: 2010-12-03 14:27:44 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
[API] Fixed a few compilation errors with the new API.
Modified Paths:
--------------
trunk/stdair/stdair/bom/BookingClass.cpp
trunk/stdair/stdair/bom/BookingClass.hpp
trunk/stdair/stdair/bom/BookingClassKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.hpp
trunk/stdair/stdair/bom/FlightDate.cpp
trunk/stdair/stdair/bom/FlightDateKey.cpp
trunk/stdair/stdair/bom/FlightDateKey.hpp
trunk/stdair/stdair/bom/LegCabin.hpp
trunk/stdair/stdair/bom/LegCabinKey.cpp
trunk/stdair/stdair/bom/LegCabinKey.hpp
trunk/stdair/stdair/bom/LegDate.hpp
trunk/stdair/stdair/bom/LegDateKey.cpp
trunk/stdair/stdair/bom/LegDateKey.hpp
trunk/stdair/stdair/bom/SegmentCabin.cpp
trunk/stdair/stdair/bom/SegmentCabin.hpp
trunk/stdair/stdair/bom/SegmentCabinKey.cpp
trunk/stdair/stdair/bom/SegmentCabinKey.hpp
trunk/stdair/stdair/bom/SegmentDateKey.cpp
trunk/stdair/stdair/bom/SegmentDateKey.hpp
trunk/stdair/stdair/stdair_basic_types.hpp
trunk/stdair/stdair/stdair_demand_types.hpp
trunk/stdair/stdair/stdair_inventory_types.hpp
Modified: trunk/stdair/stdair/bom/BookingClass.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClass.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClass.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// STDAIR
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/basic/BasConst_Yield.hpp>
Modified: trunk/stdair/stdair/bom/BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClass.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClass.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BookingClassKey.hpp>
#include <stdair/bom/BookingClassTypes.hpp>
Modified: trunk/stdair/stdair/bom/BookingClassKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/BookingClassKey.hpp>
Modified: trunk/stdair/stdair/bom/BookingClassKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -3,6 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
+#include <sstream>
// StdAir
#include <stdair/bom/FlightDate.hpp>
Modified: trunk/stdair/stdair/bom/FlightDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/FlightDateKey.hpp>
Modified: trunk/stdair/stdair/bom/FlightDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,8 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
+#include <stdair/stdair_date_time_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabin.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegCabin.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/LegCabinKey.hpp>
#include <stdair/bom/LegCabinTypes.hpp>
Modified: trunk/stdair/stdair/bom/LegCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegCabinKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/LegCabinKey.hpp>
Modified: trunk/stdair/stdair/bom/LegCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegCabinKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/LegDate.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDate.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegDate.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/LegDateKey.hpp>
#include <stdair/bom/LegDateTypes.hpp>
Modified: trunk/stdair/stdair/bom/LegDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegDateKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/LegDateKey.hpp>
Modified: trunk/stdair/stdair/bom/LegDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/LegDateKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -6,7 +6,6 @@
// //////////////////////////////////////////////////////////////////////
// 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/SegmentCabin.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabin.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabin.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -3,7 +3,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-// STDAIR
+#include <sstream>
+// StdAir
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/basic/BasConst_Inventory.hpp>
#include <stdair/bom/SegmentCabin.hpp>
Modified: trunk/stdair/stdair/bom/SegmentCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabin.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabin.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -4,7 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/SegmentCabinKey.hpp>
#include <stdair/bom/SegmentCabinTypes.hpp>
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/SegmentCabinKey.hpp>
Modified: trunk/stdair/stdair/bom/SegmentCabinKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentCabinKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/stdair_inventory_types.hpp>
+#include <stdair/stdair_basic_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/SegmentDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentDateKey.cpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -1,6 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
+// STL
+#include <sstream>
// StdAir
#include <stdair/bom/SegmentDateKey.hpp>
Modified: trunk/stdair/stdair/bom/SegmentDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/bom/SegmentDateKey.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -6,7 +6,6 @@
// //////////////////////////////////////////////////////////////////////
// StdAir
#include <stdair/stdair_basic_types.hpp>
-#include <stdair/stdair_inventory_types.hpp>
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/stdair_basic_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/stdair_basic_types.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -14,9 +14,6 @@
/** 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;
@@ -29,6 +26,23 @@
/** City code */
typedef LocationCode_T CityCode_T;
+ /** Define the Airline Code type (2-letter-code, e.g., BA). */
+ typedef std::string AirlineCode_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 identity number. */
typedef unsigned long Identity_T;
@@ -66,6 +80,22 @@
/** Define the number of seats required by a demand. */
// typedef unsigned short NbOfSeats_T;
+ /** Count */
+ typedef int Count_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 travel solutions
+ (in a travel solution block). */
+ typedef unsigned short NbOfTravelSolutions_T;
+
// ///////////// Technical ////////////////
/** File or directory name.
<br>It may contain paths, relative or absolute (e.g., /foo/bar
Modified: trunk/stdair/stdair/stdair_demand_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/stdair_demand_types.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -69,25 +69,12 @@
/** Define the name of a WTP-component of characteristics pattern. */
typedef boost::tuples::tuple<double, WTP_T> CharacteristicsWTP_tuple_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 a indicator of demand to class matching. */
typedef double MatchingIndicator_T;
Modified: trunk/stdair/stdair/stdair_inventory_types.hpp
===================================================================
--- trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 14:26:43 UTC (rev 379)
+++ trunk/stdair/stdair/stdair_inventory_types.hpp 2010-12-03 14:27:44 UTC (rev 380)
@@ -18,27 +18,10 @@
/** 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. */
+ /** 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. */
+ /** 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
