Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[173] trunk/stdair/stdair/bom
|
From: <qua...@us...> - 2010-04-09 15:31:44
|
Revision: 173
http://stdair.svn.sourceforge.net/stdair/?rev=173&view=rev
Author: quannaus
Date: 2010-04-09 15:31:37 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
[Dev] Added some attributes for test.
Modified Paths:
--------------
trunk/stdair/stdair/bom/BookingClassContent.hpp
trunk/stdair/stdair/bom/BucketContent.cpp
trunk/stdair/stdair/bom/BucketContent.hpp
trunk/stdair/stdair/bom/BucketKey.cpp
trunk/stdair/stdair/bom/BucketKey.hpp
trunk/stdair/stdair/bom/LegCabinContent.hpp
trunk/stdair/stdair/bom/sources.mk
Modified: trunk/stdair/stdair/bom/BookingClassContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/BookingClassContent.hpp 2010-04-09 15:07:22 UTC (rev 172)
+++ trunk/stdair/stdair/bom/BookingClassContent.hpp 2010-04-09 15:31:37 UTC (rev 173)
@@ -248,6 +248,22 @@
/** Destructor. */
virtual ~BookingClassContent();
+ public:
+ // for AIRINV Test
+ stdair::SubclassCode_T _subclassCode;
+ stdair::AuthorizationLevel_T _cumulatedProtection;
+ stdair::AuthorizationLevel_T _protection;
+ stdair::OverbookingRate_T _noShowPercentage;
+ stdair::OverbookingRate_T _overbookingPercentage;
+ stdair::NbOfBookings_T _groupNbOfBookings;
+ stdair::NbOfBookings_T _groupPendingNbOfBookings;
+ stdair::NbOfBookings_T _staffNbOfBookings;
+ stdair::NbOfBookings_T _wlNbOfBookings;
+ stdair::NbOfBookings_T _etb;
+ stdair::Availability_T _netClassAvailability;
+ stdair::Availability_T _segmentAvailability;
+ stdair::Availability_T _netRevenueAvailability;
+
protected:
// Attributes
/** The key of both structure and content objects. */
Modified: trunk/stdair/stdair/bom/BucketContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/BucketContent.cpp 2010-04-09 15:07:22 UTC (rev 172)
+++ trunk/stdair/stdair/bom/BucketContent.cpp 2010-04-09 15:31:37 UTC (rev 173)
@@ -12,46 +12,12 @@
// ////////////////////////////////////////////////////////////////////
BucketContent::BucketContent (const BomKey_T& iKey)
- : _key (iKey),
- _nbOfBookings (DEFAULT_CLASS_NB_OF_BOOKINGS),
- _totalNbOfBookings (DEFAULT_CLASS_TOTAL_NB_OF_BOOKINGS),
- _lastDCPTotalNbOfBookings (DEFAULT_CLASS_TOTAL_NB_OF_BOOKINGS),
- _unconstrainedDemand (DEFAULT_CLASS_UNCONSTRAINED_DEMAND),
- _nbOfCancellations (DEFAULT_CLASS_NB_OF_CANCELLATIONS),
- _nbOfNoShows (DEFAULT_CLASS_NB_OF_NOSHOWS),
- _availability (DEFAULT_CLASS_AVAILABILITY),
- _classRevenue (DEFAULT_REVENUE_VALUE),
- _currentCensorshipFlag (DEFAULT_CLASS_CENSORSHIPFLAG),
- _censorshipFlagList (DEFAULT_CLASS_CENSORSHIPFLAG_LIST),
- _bookingLimit (DEFAULT_CLASS_BOOKING_LIMIT),
- _authorizationLevel(DEFAULT_CLASS_AUTHORIZATION_LEVEL),
- _MAX (DEFAULT_CLASS_MAX_AUTHORIZATION_LEVEL),
- _MIN (DEFAULT_CLASS_MIN_AUTHORIZATION_LEVEL),
- _overbookingRate (1 + DEFAULT_CLASS_OVERBOOKING_RATE),
- _fare (DEFAULT_CLASS_FARE_VALUE),
- _adjustedYield (DEFAULT_YIELD_VALUE),
- _yield (DEFAULT_YIELD_VALUE),
- _remainingDemandMean (DEFAULT_CLASS_REMAINING_DEMAND_MEAN),
- _remainingProductDemandMean (DEFAULT_CLASS_REMAINING_DEMAND_MEAN),
- _remainingDemandSD (DEFAULT_CLASS_REMAINING_DEMAND_STANDARD_DEVIATION),
- _remainingProductDemandSD (DEFAULT_CLASS_REMAINING_DEMAND_STANDARD_DEVIATION) {
+ : _key (iKey) {
}
// ////////////////////////////////////////////////////////////////////
BucketContent::~BucketContent () {
}
- // ////////////////////////////////////////////////////////////////////
- void BucketContent::setRemainingDemandMean(NbOfBookings_T& iMean) {
- _remainingDemandMean = iMean;
- _remainingProductDemandMean = iMean;
- }
-
- // ////////////////////////////////////////////////////////////////////
- void BucketContent::setRemainingDemandSD(NbOfBookings_T& iSD) {
- _remainingDemandSD = iSD;
- _remainingProductDemandSD = iSD;
- }
-
}
Modified: trunk/stdair/stdair/bom/BucketContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketContent.hpp 2010-04-09 15:07:22 UTC (rev 172)
+++ trunk/stdair/stdair/bom/BucketContent.hpp 2010-04-09 15:31:37 UTC (rev 173)
@@ -23,199 +23,8 @@
const BomKey_T& getKey() const {
return _key;
}
-
- /** Get the booking code (part of the primary key). */
- const ClassCode_T& getClassCode() const {
- return _key.getClassCode();
- }
- /** Get the number of bookings of the bookingClass. */
- const NbOfBookings_T& getNbOfBookings() const {
- return _nbOfBookings;
- }
-
- /** Get the number of bookings (without cancellation counted)
- of the bookingClass. */
- const NbOfBookings_T& getTotalNbOfBookings() const {
- return _totalNbOfBookings;
- }
-
- /** Get the number of bookings at the last DCP(without
- cancellation counted) of the bookingClass. */
- const NbOfBookings_T& getLastDCPTotalNbOfBookings() const {
- return _lastDCPTotalNbOfBookings;
- }
-
- /** Get the unconstrained demand (last DCP) of the bookingClass. */
- const NbOfBookings_T& getUnconstrainedDemand () const {
- return _unconstrainedDemand;
- }
-
- /** Get the number of cancellations of the bookingClass. */
- const NbOfCancellations_T& getNbOfCancellations() const {
- return _nbOfCancellations;
- }
-
- /** Get the number of no-shows of the bookingClass. */
- const NbOfNoShows_T& getNbOfNoShows() const {
- return _nbOfNoShows;
- }
-
- /** Get the overbooking rate dedicated to the booking. */
- const OverbookingRate_T& getOverbookingRate() const {
- return _overbookingRate;
- }
-
- /** Get the list of censorship flags. */
- const CensorshipFlagList_T& getCensorshipFlagList() const {
- return _censorshipFlagList;
- }
-
- /** Get the current censorship flag. */
- const CensorshipFlag_T& getCurrentCensorshipFlag() const {
- return _currentCensorshipFlag;
- }
-
- /** Get the protection value. */
- const BookingLimit_T& getBookingLimit() const {
- return _bookingLimit;
- }
-
- /** Get the authorisation level value. */
- const AuthorizationLevel_T& getAuthorizationLevel () const {
- return _authorizationLevel;
- }
-
- /** Get the MAX value of AU. */
- const AuthorizationLevel_T& getMAX () const {
- return _MAX;
- }
-
- /** Get the MIN value of AU. */
- const AuthorizationLevel_T& getMIN () const {
- return _MIN;
- }
-
- /** Get the availability number. */
- const Availability_T& getAvailability() const {
- return _availability;
- }
-
- /** Get the revenue amount. */
- const Revenue_T& getRevenue() const {
- return _classRevenue;
- }
-
- /** Get the fare current value. */
- const Fare_T& getFare() const {
- return _fare;
- }
-
- /** Get the adjusted yield current value. */
- const Yield_T& getAdjustedYield() const {
- return _adjustedYield;
- }
-
- /** Get the yield current value. */
- const Yield_T& getYield() const {
- return _yield;
- }
-
- /** Get the remaining demand mean. */
- const NbOfBookings_T& getRemainingDemandMean() const {
- return _remainingDemandMean;
- }
-
- /** Get the remaining demand mean for the net booking product. */
- const NbOfBookings_T& getRemainingProductDemandMean() const {
- return _remainingProductDemandMean;
- }
-
- /** Get the remaining demand standard deviation. */
- const NbOfBookings_T& getRemainingDemandSD() const {
- return _remainingDemandSD;
- }
-
- /** Get the remaining demand standard deviation
- for the net booking product. */
- const NbOfBookings_T& getRemainingProductDemandSD() const {
- return _remainingProductDemandSD;
- }
-
public:
- // /////////// Setters ////////////
- /** Set the booking limit. */
- void setBookingLimit (BookingLimit_T& iBookingLimit) {
- _bookingLimit = iBookingLimit;
- }
-
- /** Set the authorization level. */
- void setAuthorizationLevel (AuthorizationLevel_T& iAuthorizationLevel) {
- _authorizationLevel = iAuthorizationLevel;
- }
-
- /** Set the MAX value of AU. */
- void setMAX (const AuthorizationLevel_T& iMAX) {
- _MAX = iMAX;
- }
-
- /** Set the MIN value of AU. */
- void setMIN (const AuthorizationLevel_T& iMIN) {
- _MIN = iMIN;
- }
-
- /** Set the Availability number. */
- void setAvailability (Availability_T& iAvailability) {
- _availability = iAvailability;
- }
-
- /** Set the censorship flag status. */
- void setCensorshipFlagStatus (bool iFlagStatus) {
- _currentCensorshipFlag = iFlagStatus;
- }
-
- /** Set the fare value. */
- void setFare(Fare_T& iFare) {
- _fare = iFare;
- }
-
- /** Set the adjusted fare value. */
- void setAdjustedYield(Yield_T& iYield) {
- _adjustedYield = iYield;
- }
-
- /** Set the yield value. */
- void setYield(Yield_T& iYield) {
- _yield = iYield;
- }
-
- /** Set the unconstrained demand. */
- void setUnconstrainedDemand (NbOfBookings_T& iDemand) {
- _unconstrainedDemand = iDemand;
- }
-
- /** Set the total bookings for the DCP. */
- void setDCPTotalNbOfBookings (NbOfBookings_T& iBookings) {
- _lastDCPTotalNbOfBookings = iBookings;
- }
-
- /** Set the remaining demand mean. */
- void setRemainingDemandMean (NbOfBookings_T&);
-
- /** Set the remaining demand mean for the net booking product. */
- void setRemainingProductDemandMean (NbOfBookings_T& iMean) {
- _remainingProductDemandMean = iMean;
- }
-
- /** Set the remaining demand standard deviation. */
- void setRemainingDemandSD (NbOfBookings_T&);
-
- /** Set the remaining demand standard deviation. */
- void setRemainingProductDemandSD (NbOfBookings_T& iSD) {
- _remainingProductDemandSD = iSD;
- }
-
- public:
// /////////// Display support methods /////////
/** Dump a Business Object into an output stream.
@param ostream& the output stream. */
@@ -245,83 +54,16 @@
/** Destructor. */
virtual ~BucketContent();
- protected:
+ public:
// Attributes
/** The key of both structure and content objects. */
BomKey_T _key;
-
- /** Number of current bookings in the booking. */
- NbOfBookings_T _nbOfBookings;
+ // test AIRINV
+ stdair::Yield_T _yieldRangeUpperValue;
+ stdair::CabinCapacity_T _availability;
+ stdair::NbOfSeats_T _nbOfSeats;
+ stdair::SeatIndex_T _seatIndex;
- /** Total number of bookings (without substraction of cancellation). */
- NbOfBookings_T _totalNbOfBookings;
-
- /** Total number of bookings at the last DCP (without
- substraction of cancellation). */
- NbOfBookings_T _lastDCPTotalNbOfBookings;
-
- /** Unconstraining demnd value (last RMS Computation).*/
- NbOfBookings_T _unconstrainedDemand;
-
- /** Number of cancelled demands. */
- NbOfCancellations_T _nbOfCancellations;
-
- /** Number of no-shows. */
- NbOfNoShows_T _nbOfNoShows;
-
- /** Number of available seats. */
- Availability_T _availability;
-
- /** Total Revenue of the booking. */
- Revenue_T _classRevenue;
-
- /** Current Censorship flag which indicates whether the demand
- is censored. */
- CensorshipFlag_T _currentCensorshipFlag;
-
- /** List of censorship flags which indicates whether the demand
- is censored (one flag per DCP). */
- CensorshipFlagList_T _censorshipFlagList;
-
- /** Value of the booking limit of the booking. */
- BookingLimit_T _bookingLimit;
-
- /** Value of the authorization level of the booking. */
- AuthorizationLevel_T _authorizationLevel;
-
- /** MAX of Authorization Level (AU). */
- AuthorizationLevel_T _MAX;
-
- /** MIN of Authorization Level (AU). */
- AuthorizationLevel_T _MIN;
-
- /** Rate of allowed overbooking. */
- OverbookingRate_T _overbookingRate;
-
- /** Current Fare value of the booking. */
- Fare_T _fare;
-
- /** Current Adjusted Fare value of the booking. */
- Yield_T _adjustedYield;
-
- /** Current Yield value of the booking. */
- Yield_T _yield;
-
- /** Temporary attributes just for the forecaster prototype. */
- /** Remaining demand mean for the whole booking. */
- NbOfBookings_T _remainingDemandMean;
-
- /** Remaining demand mean for the product corresponding to this booking
- (excluding (OnDs)). */
- NbOfBookings_T _remainingProductDemandMean;
-
- /** Remaining demand standrad deviation for the whole booking. */
- NbOfBookings_T _remainingDemandSD;
-
- /** Remaining demand standard deviation for the product
- corresponding to this booking (excluding (OnDs)). */
- NbOfBookings_T _remainingProductDemandSD;
-
};
}
Modified: trunk/stdair/stdair/bom/BucketKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.cpp 2010-04-09 15:07:22 UTC (rev 172)
+++ trunk/stdair/stdair/bom/BucketKey.cpp 2010-04-09 15:31:37 UTC (rev 173)
@@ -7,8 +7,7 @@
namespace stdair {
// ////////////////////////////////////////////////////////////////////
- BucketKey_T::BucketKey_T (const ClassCode_T& iClassCode)
- : _classCode (iClassCode) {
+ BucketKey_T::BucketKey_T () {
}
// ////////////////////////////////////////////////////////////////////
@@ -27,7 +26,6 @@
// ////////////////////////////////////////////////////////////////////
const std::string BucketKey_T::toString() const {
std::ostringstream oStr;
- oStr << _classCode;
return oStr.str();
}
Modified: trunk/stdair/stdair/bom/BucketKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/BucketKey.hpp 2010-04-09 15:07:22 UTC (rev 172)
+++ trunk/stdair/stdair/bom/BucketKey.hpp 2010-04-09 15:31:37 UTC (rev 173)
@@ -21,16 +21,11 @@
public:
// /////////// Construction ///////////
/** Constructor. */
- BucketKey_T (const ClassCode_T& iClassCode);
+ BucketKey_T ();
/** Destructor. */
~BucketKey_T ();
- // /////////// Getters //////////
- /** Get the class code. */
- const ClassCode_T& getClassCode () const {
- return _classCode;
- }
// /////////// Setters /////////////
void setParentKey (const ParentKey_T& iParentKey) {
@@ -60,9 +55,6 @@
// Attributes
/** Leg-cabin key.*/
ParentKey_T _parentKey;
-
- /** Cabin code. */
- ClassCode_T _classCode;
};
}
Modified: trunk/stdair/stdair/bom/LegCabinContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinContent.hpp 2010-04-09 15:07:22 UTC (rev 172)
+++ trunk/stdair/stdair/bom/LegCabinContent.hpp 2010-04-09 15:31:37 UTC (rev 173)
@@ -120,6 +120,21 @@
/** Destructor. */
virtual ~LegCabinContent();
+ public:
+ // Test AIRINV
+ stdair::CapacityAdjustment_T _adjustment;
+ stdair::CapacityAdjustment_T _dcsRegrade;
+ stdair::AuthorizationLevel_T _au;
+ stdair::UPR_T _upr;
+ stdair::NbOfBookings_T _nbOfBookings;
+ stdair::Availability_T _nav;
+ stdair::Availability_T _gav;
+ stdair::OverbookingRate_T _acp;
+ stdair::NbOfBookings_T _etb;
+ stdair::NbOfBookings_T _staffNbOfBookings;
+ stdair::NbOfBookings_T _wlNbOfBookings;
+ stdair::NbOfBookings_T _groupNbOfBookings;
+
protected:
// Attributes
/** The key of both structure and content objects. */
Modified: trunk/stdair/stdair/bom/sources.mk
===================================================================
--- trunk/stdair/stdair/bom/sources.mk 2010-04-09 15:07:22 UTC (rev 172)
+++ trunk/stdair/stdair/bom/sources.mk 2010-04-09 15:31:37 UTC (rev 173)
@@ -125,7 +125,6 @@
$(top_srcdir)/stdair/bom/SegmentCabinKey.cpp \
$(top_srcdir)/stdair/bom/BookingClassKey.cpp \
$(top_srcdir)/stdair/bom/BucketKey.cpp \
- $(top_srcdir)/stdair/bom/BucketKey.cpp \
$(top_srcdir)/stdair/bom/NetworkKey.cpp \
$(top_srcdir)/stdair/bom/NetworkDateKey.cpp \
$(top_srcdir)/stdair/bom/AirportDateKey.cpp \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
