Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[368] trunk/stdair
|
From: <den...@us...> - 2010-12-02 22:17:27
|
Revision: 368
http://stdair.svn.sourceforge.net/stdair/?rev=368&view=rev
Author: denis_arnaud
Date: 2010-12-02 22:17:18 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
[API] First step towards a more granular API.
Modified Paths:
--------------
trunk/stdair/stdair/basic/BasConst.cpp
trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
trunk/stdair/stdair/basic/BasConst_General.hpp
trunk/stdair/stdair/basic/BasConst_Inventory.hpp
trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp
trunk/stdair/stdair/basic/BasConst_Request.hpp
trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp
trunk/stdair/stdair/basic/BasConst_Yield.hpp
trunk/stdair/stdair/basic/BasDBParams.hpp
trunk/stdair/stdair/basic/BasLogParams.hpp
trunk/stdair/stdair/basic/PassengerType.cpp
trunk/stdair/stdair/bom/AirlineFeature.cpp
trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
trunk/stdair/stdair/bom/AirlineFeatureKey.hpp
trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp
trunk/stdair/stdair/bom/AirlineStruct.cpp
trunk/stdair/stdair/bom/AirlineStruct.hpp
trunk/stdair/stdair/bom/BomAbstract.hpp
trunk/stdair/stdair/bom/BomHolder.hpp
trunk/stdair/stdair/bom/BomHolderKey.cpp
trunk/stdair/stdair/bom/BomManager.cpp
trunk/stdair/stdair/bom/BomManager.hpp
trunk/stdair/stdair/bom/BomRootKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.cpp
trunk/stdair/stdair/bom/BookingClassKey.hpp
trunk/stdair/stdair/bom/BookingClassTypes.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/BucketKey.hpp
trunk/stdair/stdair/bom/BucketTypes.hpp
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/FareFamilyTypes.hpp
trunk/stdair/stdair/bom/FlightDate.cpp
trunk/stdair/stdair/bom/FlightDateKey.cpp
trunk/stdair/stdair/bom/FlightDateKey.hpp
trunk/stdair/stdair/bom/FlightDateTypes.hpp
trunk/stdair/stdair/bom/FlightPeriodTypes.hpp
trunk/stdair/stdair/bom/Inventory.cpp
trunk/stdair/stdair/bom/InventoryKey.cpp
trunk/stdair/stdair/bom/InventoryKey.hpp
trunk/stdair/stdair/bom/InventoryTypes.hpp
trunk/stdair/stdair/bom/KeyAbstract.hpp
trunk/stdair/stdair/bom/LegCabinKey.cpp
trunk/stdair/stdair/bom/LegCabinKey.hpp
trunk/stdair/stdair/bom/LegCabinTypes.hpp
trunk/stdair/stdair/bom/LegDateKey.cpp
trunk/stdair/stdair/bom/LegDateKey.hpp
trunk/stdair/stdair/bom/LegDateTypes.hpp
trunk/stdair/stdair/bom/OptimizerStruct.cpp
trunk/stdair/stdair/bom/OptimizerStruct.hpp
trunk/stdair/stdair/bom/PeriodStruct.cpp
trunk/stdair/stdair/bom/PeriodStruct.hpp
trunk/stdair/stdair/bom/SegmentCabinKey.cpp
trunk/stdair/stdair/bom/SegmentCabinKey.hpp
trunk/stdair/stdair/bom/SegmentCabinTypes.hpp
trunk/stdair/stdair/bom/SegmentDateKey.cpp
trunk/stdair/stdair/bom/SegmentDateKey.hpp
trunk/stdair/stdair/bom/SegmentDateTypes.hpp
trunk/stdair/stdair/bom/SegmentPeriodKey.cpp
trunk/stdair/stdair/bom/SegmentPeriodKey.hpp
trunk/stdair/stdair/bom/SegmentPeriodTypes.hpp
trunk/stdair/stdair/bom/TravelSolutionStruct.cpp
trunk/stdair/stdair/bom/TravelSolutionStruct.hpp
trunk/stdair/stdair/bom/YieldStore.cpp
trunk/stdair/stdair/bom/YieldStoreKey.cpp
trunk/stdair/stdair/bom/YieldStoreKey.hpp
trunk/stdair/stdair/bom/YieldStoreTypes.hpp
trunk/stdair/stdair/bom/sources.mk
trunk/stdair/stdair/command/CmdBomManager.hpp
trunk/stdair/stdair/command/DBManagerForAirlines.cpp
trunk/stdair/stdair/command/DBManagerForAirlines.hpp
trunk/stdair/stdair/dbadaptor/DbaAirline.cpp
trunk/stdair/stdair/factory/FacBom.hpp
trunk/stdair/stdair/factory/FacBomManager.cpp
trunk/stdair/stdair/service/DBSessionManager.cpp
trunk/stdair/stdair/service/DBSessionManager.hpp
trunk/stdair/stdair/service/FacSupervisor.hpp
trunk/stdair/stdair/service/Logger.cpp
trunk/stdair/stdair/service/Logger.hpp
trunk/stdair/stdair/service/STDAIR_Service.cpp
trunk/stdair/stdair/sources.mk
trunk/stdair/test/archi_static_cast/MP2BomRoot.cpp
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/bom/key_types.hpp
trunk/stdair/stdair/stdair.hpp
trunk/stdair/stdair/stdair_db.hpp
trunk/stdair/stdair/stdair_exceptions.hpp
trunk/stdair/stdair/stdair_log.hpp
trunk/stdair/stdair/stdair_service.hpp
trunk/stdair/stdair/stdair_types.hpp
Removed Paths:
-------------
trunk/stdair/stdair/STDAIR_Service.hpp
trunk/stdair/stdair/STDAIR_Types.hpp
Deleted: trunk/stdair/stdair/STDAIR_Service.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_Service.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/STDAIR_Service.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,125 +0,0 @@
-/**
- * @brief Handle on the StdAir library context
- * @author Anh Quan Nguyen <qua...@us...>
- * @date 20/01/2010
- * @detail StdAir aims at providing a clean API, and the corresponding
- * C++ implementation, for the basis of Airline IT Business Object
- * Model (BOM), that is, to be used by several other Open Source
- * projects, such as RMOL and OpenTREP<br>
- * Install the StdAir library for Airline IT Standard C++ fundaments.
- */
-#ifndef __STDAIR_SVC_STDAIR_SERVICE_HPP
-#define __STDAIR_SVC_STDAIR_SERVICE_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// Boost
-#include <boost/shared_ptr.hpp>
-// StdAir
-#include <stdair/basic/BasLogParams.hpp>
-#include <stdair/basic/BasDBParams.hpp>
-
-namespace stdair {
-
- /// Forward declarations
- class BomRoot;
-
- /**
- * @brief Interface for the STDAIR Services
- */
- class STDAIR_Service {
- public:
- // ////////// Constructors and destructors //////////
- /**
- * @brief Default constructor.
- */
- STDAIR_Service ();
-
- /**
- * @brief Constructor.
- * <br>The init() method is called; see the corresponding
- * documentation for more details.
- * <br>Moreover, a reference on an output stream is given, so
- * that log outputs can be directed onto that stream.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- */
- STDAIR_Service (const BasLogParams&);
-
- /**
- * @brief Constructor.
- * <br>The init() method is called; see the corresponding
- * documentation for more details.
- * <br>A reference on an output stream is given, so
- * that log outputs can be directed onto that stream.
- * <br>Moreover, database connection parameters are given, so
- * that database requests can use the corresponding access.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- * @param[in] const BasDBParams& Parameters for the database session.
- */
- STDAIR_Service (const BasLogParams&, const BasDBParams&);
-
- /**
- * @brief Destructor.
- */
- ~STDAIR_Service();
-
- // ///////////////// Getters ///////////////////
- /**
- * @brief Get a reference on the BomRoot object.
- * <br>If the service context has not been initialised, that
- * method throws an exception (failing assertion).
- * @param[out] BomRoot& Reference on the BomRoot.
- */
- BomRoot& getBomRoot () const {
- return _bomRoot;
- }
-
- private:
- // /////// Construction and Destruction helper methods ///////
- /**
- * @brief Default copy constructor.
- * @param[in] const STDAIR_Service& Reference on the STDAIR_Service handler
- * to be copied.
- */
- STDAIR_Service (const STDAIR_Service&);
-
- /**
- * @brief Initialise the log.
- * @param[in] const BasLogParams& Parameters for the output log stream.
- */
- void logInit (const BasLogParams&);
-
- /**
- * @brief Initialise the database session.
- * @param[in] const BasDBParams& Parameters for the database session.
- */
- void dbInit (const BasDBParams&);
-
- /**
- * @brief Initialise.
- * <br>The static instance of the log service (Logger object) is created.
- * <br>The static instance of the database session manager
- * (DBSessionManager object) is created.
- * <br>The static instance of the FacSupervisor object, itself referencing
- * all the other objects (factories and BOM), is created.
- * <br>As those three objects are static, there is no need to store them
- * in any service context. However, some lock mechanism may be needed
- * in order to secure the access to the corresponding resources.
- */
- void init ();
-
- /**
- * @brief Finalise.
- */
- void finalise ();
-
- private:
- // /////////////// Attributes ///////////////
- /**
- * @brief Root of the BOM tree.
- */
- BomRoot& _bomRoot;
- };
-}
-#endif // __STDAIR_SVC_STDAIR_SERVICE_HPP
Deleted: trunk/stdair/stdair/STDAIR_Types.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_Types.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/STDAIR_Types.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,670 +0,0 @@
-#ifndef __STDAIR_STDAIR_TYPES_HPP
-#define __STDAIR_STDAIR_TYPES_HPP
-
-// //////////////////////////////////////////////////////////////////////
-// Import section
-// //////////////////////////////////////////////////////////////////////
-// STL
-#include <string>
-#include <vector>
-#include <list>
-#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>
-#include <boost/shared_ptr.hpp>
-
-// Forward declarations
-namespace soci {
- class session;
- class statement;
-}
-
-namespace stdair {
- // Forward declarations
- class STDAIR_Service;
-
- // ////////////////////////////////////////////////////////////////////
- //
- // Exceptions
- //
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- class RootException : public std::exception {
- public:
- /** Constructors. */
- RootException (const std::string& iWhat) : _what (iWhat) {}
- RootException () : _what ("No more details") {}
- /** Destructor. */
- virtual ~RootException() throw() {}
- /** Give the details of the exception. */
- const char* what() const throw() { return _what.c_str(); }
- protected:
- /** Details for the exception. */
- std::string _what;
- };
- // ////////////////////////////////////////////////////////////////////
- class FileNotFoundException : public RootException {
- public:
- /** Constructor. */
- FileNotFoundException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedLogServiceException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedLogServiceException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedDBSessionManagerException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedDBSessionManagerException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedServiceException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedServiceException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedContainerException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedContainerException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class NonInitialisedRelationShipException : public RootException {
- public:
- /** Constructor. */
- NonInitialisedRelationShipException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class MemoryAllocationException : public RootException {
- public:
- /** Constructor. */
- MemoryAllocationException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ObjectLinkingException : public RootException {
- public:
- /** Constructor. */
- ObjectLinkingException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ParserException : public RootException {
- public:
- /** Constructor. */
- ParserException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class DocumentNotFoundException : public RootException {
- public:
- /** Constructor. */
- DocumentNotFoundException (const std::string& iWhat)
- : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class CodeConversionException : public ParserException {
- public:
- /** Constructor. */
- CodeConversionException (const std::string& iWhat)
- : ParserException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class CodeDuplicationException : public ParserException {
- public:
- /** Constructor. */
- CodeDuplicationException (const std::string& iWhat)
- : ParserException(iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ObjectCreationgDuplicationException : public ParserException {
- public:
- /** Constructor. */
- ObjectCreationgDuplicationException (const std::string& iWhat)
- : ParserException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class ObjectNotFoundException : public RootException {
- public:
- /** Constructor. */
- ObjectNotFoundException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class SQLDatabaseException : public RootException {
- public:
- /** Constructor. */
- SQLDatabaseException (const std::string& iWhat) : RootException (iWhat) {}
- };
- // ////////////////////////////////////////////////////////////////////
- class SQLDatabaseConnectionImpossibleException : public SQLDatabaseException {
- public:
- /** Constructor. */
- SQLDatabaseConnectionImpossibleException (const std::string& iWhat)
- : SQLDatabaseException (iWhat) {}
- };
-
- // /////////////// Log /////////////
- /** Level of logs. */
- namespace LOG {
- typedef enum {
- CRITICAL = 0,
- ERROR,
- NOTIFICATION,
- WARNING,
- DEBUG,
- VERBOSE,
- LAST_VALUE
- } EN_LogLevel;
-
- static const std::string _logLevels[LAST_VALUE] =
- {"C", "E", "N", "W", "D", "V"};
- }
-
- // //////// Type definitions /////////
- /** Database session handler. */
- typedef soci::session DBSession_T;
-
- /** Database request statement handler. */
- typedef soci::statement DBRequestStatement_T;
-
- /** 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;
-
- /** Define the replication number. */
- typedef unsigned int ReplicationNumber_T;
-
- /** Define the seed type of an Exponential function. */
- typedef unsigned long int ExponentialSeed_T;
-
- /** Define the seed type of an Uniform function. */
- typedef unsigned long int UniformSeed_T;
-
- /** Define the Request status for booking (1-letter-code, e.g.,
- 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 the name of an database connection. */
- typedef std::string DBConnectionName_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;
-
- /** Mode of the Data Collection Point description (Forecaster only,
- Optimizer only or both of them). */
- typedef std::string DCPMode_T;
-
- /** Mode of the forecaster. */
- typedef std::string ForecasterMode_T;
-
- /** Limit of similar flight-dates used in the forecaster. */
- typedef short HistoricalDataLimit_T;
-
- /** Mode of the forecaster. */
- typedef std::string OptimizerMode_T;
-
- /** Mode of the forecaster. */
- typedef std::string DicoOptimizerMode_T;
-
- /** Mode of inventory control. */
- typedef std::string ControlMode_T;
-
- /** Define the name of a multiplier. */
- typedef double Multiplier_T;
-
- /** Define the name of a WTP-component of characteristics pattern. */
- typedef boost::tuples::tuple<double, double> CharacteristicsWTP_tuple_T;
-
- /** Define the name of sell-up probability flag for RMS optimizer. */
- typedef bool SellupFlagForOptimizer_T;
-
- /** Define the name of sell-up probability for RMS optimizer. */
- typedef double SellupProbabilityForOptimizer_T;
-
- /** Define the name of sell-up probability vector for RMS optimizer. */
- typedef std::vector<SellupProbabilityForOptimizer_T>
- SellupProbabilityVector_T;
-
- /** Define the demand for a policy. */
- typedef NbOfBookings_T PolicyDemand_T;
-
- /** Define the total revenue of an unconstrained policy. */
- typedef double PolicyRevenue_T;
-
- /** Define the total revenue of an unconstrained policy. */
- typedef double PolicyRevenue_T;
-
- // ///////////// Technical ////////////////
- /** File or directory name.
- <br>It may contain paths, relative or absolute (e.g., /foo/bar
- or C:\foo\bar). */
- typedef std::string Filename_T;
-
- /** Pointer on the STDAIR Service handler. */
- typedef boost::shared_ptr<STDAIR_Service> STDAIR_ServicePtr_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Random generation
- /** Seed for the random generation, so that it can be reproductible. */
- typedef unsigned long int RandomSeed_T;
-
- /** Random number generator. */
- typedef boost::minstd_rand BaseGenerator_T;
-
- /** Uniform random generator. */
- typedef boost::variate_generator<stdair::BaseGenerator_T&,
- boost::uniform_real<> > UniformGenerator_T;
-
- // //////////////////////////////////////////////////////////////////////
- // Probability
- /** Probability */
- 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;
-
- /** 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;
-
- /** Key of a STL map. */
- typedef std::string MapKey_T;
-
- /** List of keys. */
- typedef std::vector<std::string> KeyList_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 CATCH_ALL_EXCEPTIONS \
- catch (const stdair::FileNotFoundException& ex) { \
- std::cerr << "FileNotFoundException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedLogServiceException& ex) { \
- std::cerr << "NonInitialisedLogServiceException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedDBSessionManagerException& ex) { \
- std::cerr << "NonInitialisedDBSessionManagerException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedServiceException& ex) { \
- std::cerr << "NonInitialisedServiceException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedContainerException& ex) { \
- std::cerr << "NonInitialisedContainerException" \
- << ex.what() <<std::endl; \
- return -1; \
- \
- } catch (const stdair::NonInitialisedRelationShipException& ex) { \
- std::cerr << "NonInitialisedRelationShipException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::MemoryAllocationException& ex) { \
- std::cerr << "MemoryAllocationException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ObjectLinkingException& ex) { \
- std::cerr << "ObjectLinkingException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::CodeConversionException& ex) { \
- std::cerr << "CodeConversionException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::CodeDuplicationException& ex) { \
- std::cerr << "CodeDuplicationException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ObjectCreationgDuplicationException& ex) { \
- std::cerr << "ObjectCreationgDuplicationException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ObjectNotFoundException& ex) { \
- std::cerr << "ObjectNotFoundException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::DocumentNotFoundException& ex) { \
- std::cerr << "DocumentNotFoundException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::SQLDatabaseConnectionImpossibleException& ex) {\
- std::cerr << "SQLDatabaseConnectionImpossibleException" \
- << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::SQLDatabaseException& ex) { \
- std::cerr << "SQLDatabaseException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::ParserException& ex) { \
- std::cerr << "ParserException" << ex.what() << std::endl; \
- return -1; \
- \
- } catch (const stdair::RootException& ex) { \
- std::cerr << "RootException" << ex.what() <<std::endl; \
- return -1; \
- \
- } catch (const std::exception& stde) { \
- std::cerr << "Standard exception: " << stde.what() << std::endl; \
- return -1; \
- \
- } catch (...) { \
- return -1; \
- }
-
-#endif // __STDAIR_STDAIR_TYPES_HPP
Modified: trunk/stdair/stdair/basic/BasConst.cpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -3,8 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <string>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
#include <stdair/basic/BasConst_General.hpp>
#include <stdair/basic/BasConst_Request.hpp>
#include <stdair/basic/BasConst_Inventory.hpp>
Modified: trunk/stdair/stdair/basic/BasConst_BookingClass.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_BookingClass.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_General.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_General.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_General.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Inventory.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Inventory.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Inventory.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Period_BOM.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Request.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Request.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Request.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// StdAir
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// LATUS Common
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_Yield.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_Yield.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasConst_Yield.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,8 +4,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasDBParams.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasDBParams.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasDBParams.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,7 @@
#include <iosfwd>
#include <string>
// Stdair
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_db.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasLogParams.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasLogParams.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/BasLogParams.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,7 @@
#include <iosfwd>
#include <string>
// Stdair
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_log.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/PassengerType.cpp
===================================================================
--- trunk/stdair/stdair/basic/PassengerType.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/basic/PassengerType.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,9 +5,7 @@
#include <cassert>
#include <sstream>
// StdAir
-#include <stdair/service/Logger.hpp>
-// Stdair
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/basic/PassengerType.hpp>
namespace stdair {
@@ -53,7 +51,8 @@
}
// //////////////////////////////////////////////////////////////////////
- std::string PassengerType::getTypeLabelAsString(const EN_PassengerType& iType){
+ std::string PassengerType::
+ getTypeLabelAsString (const EN_PassengerType& iType) {
std::ostringstream oStr;
oStr << _typeLabels[iType];
return oStr.str();
Modified: trunk/stdair/stdair/bom/AirlineFeature.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeature.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,14 +4,13 @@
// STL
#include <cassert>
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/AirlineFeature.hpp>
namespace stdair {
// ////////////////////////////////////////////////////////////////////
- AirlineFeature::
- AirlineFeature (const Key_T& iKey)
- : _key (iKey) {
+ AirlineFeature::AirlineFeature (const Key_T& iKey) : _key (iKey) {
}
// ////////////////////////////////////////////////////////////////////
Modified: trunk/stdair/stdair/bom/AirlineFeatureKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// 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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeatureKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,7 +4,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineFeatureTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirlineStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -7,6 +7,7 @@
#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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/AirlineStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -9,7 +9,6 @@
#include <string>
#include <vector>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
#include <stdair/basic/StructAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BomAbstract.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomAbstract.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomAbstract.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -14,8 +14,6 @@
#include <string>
#include <map>
#include <typeinfo>
-// StdAir
-#include <stdair/STDAIR_Types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BomHolder.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomHolder.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomHolder.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -9,10 +9,12 @@
#include <list>
#include <map>
// StdAir
+#include <stdair/bom/key_types.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BomHolderKey.hpp>
namespace stdair {
+
/** Class representing the holders of BOM. */
template <typename BOM>
class BomHolder : public stdair::BomAbstract {
Modified: trunk/stdair/stdair/bom/BomHolderKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomHolderKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomHolderKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <ostream>
+#include <sstream>
+// StdAir
#include <stdair/bom/BomHolderKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BomManager.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomManager.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomManager.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -3,9 +3,7 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <cassert>
-#include <ostream>
// StdAir
-#include <stdair/STDAIR_Types.hpp>
#include <stdair/basic/BasConst_BomManager.hpp>
#include <stdair/bom/BomManager.hpp>
Modified: trunk/stdair/stdair/bom/BomManager.hpp
===================================================================
--- trunk/stdair/stdair/bom/BomManager.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomManager.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -6,8 +6,8 @@
// //////////////////////////////////////////////////////////////////////
// STL
#include <iosfwd>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/stdair_exceptions.hpp>
#include <stdair/bom/BomAbstract.hpp>
#include <stdair/bom/BomHolder.hpp>
#include <stdair/service/Logger.hpp>
Modified: trunk/stdair/stdair/bom/BomRootKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomRootKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BomRootKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,10 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// STL
+#include <ostream>
+#include <sstream>
+// StdAir
#include <stdair/bom/BomRootKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingClassKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingClassKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// 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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingClassKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,10 +4,11 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of booking-class. */
struct BookingClassKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/BookingClassTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingClassTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BookingRequestStruct.cpp
===================================================================
--- trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -7,6 +7,7 @@
#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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BookingRequestStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,6 @@
#include <iosfwd>
#include <string>
// StdAir
-#include <stdair/STDAIR_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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/Bucket.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,6 +4,7 @@
// STL
#include <cassert>
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/Bucket.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/Bucket.hpp
===================================================================
--- trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/Bucket.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -65,7 +65,6 @@
stdair::CabinCapacity_T _availability;
stdair::NbOfSeats_T _nbOfSeats;
stdair::SeatIndex_T _seatIndex;
-
};
}
Modified: trunk/stdair/stdair/bom/BucketKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BucketKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/BucketKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/BucketKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BucketKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,6 +8,7 @@
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of booking-class. */
struct BucketKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/BucketTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/BucketTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,11 +8,12 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
- // Forward declarations.
+
+ // Forward declarations
class Bucket;
/** Define the Inventory list. */
Modified: trunk/stdair/stdair/bom/EventQueue.cpp
===================================================================
--- trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventQueue.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -2,6 +2,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
+#include <stdair/stdair_types.hpp>
#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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventQueue.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -7,7 +7,6 @@
// STL
#include <iosfwd>
// StdAir
-#include <stdair/STDAIR_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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventStruct.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -2,6 +2,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
+#include <stdair/stdair_types.hpp>
#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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventStruct.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -5,7 +5,6 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// STDAIR
-#include <stdair/STDAIR_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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/EventTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,7 +8,7 @@
// STL
#include <map>
// STDAIR
-#include <stdair/STDAIR_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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FareFamilyKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// 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 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FareFamilyKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,10 +4,11 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
+
/** Key of fare family. */
struct FareFamilyKey : public KeyAbstract {
Modified: trunk/stdair/stdair/bom/FareFamilyTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/FareFamilyTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FareFamilyTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+// StdAir
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDate.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,6 +4,7 @@
// STL
#include <cassert>
// STDAIR
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/FlightDate.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDateKey.cpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -1,7 +1,8 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
+#include <stdair/stdair_types.hpp>
#include <stdair/bom/FlightDateKey.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDateKey.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -4,7 +4,7 @@
// //////////////////////////////////////////////////////////////////////
// Import section
// //////////////////////////////////////////////////////////////////////
-// STDAIR
+// StdAir
#include <stdair/bom/KeyAbstract.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightDateTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightDateTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -9,7 +9,7 @@
#include <map>
#include <list>
// STDAIR
-#include <stdair/STDAIR_Types.hpp>
+#include <stdair/bom/key_types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/FlightPeriodTypes.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightPeriodTypes.hpp 2010-12-02 15:54:45 UTC (rev 367)
+++ trunk/stdair/stdair/bom/FlightPeriodTypes.hpp 2010-12-02 22:17:18 UTC (rev 368)
@@ -8,8 +8,8 @@
// STL
#include <map>
#include <list>
-// STDAIR
-#include <stdair/S...
[truncated message content] |
