Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[188] trunk/stdair/stdair
|
From: <qua...@us...> - 2010-05-03 11:50:23
|
Revision: 188
http://stdair.svn.sourceforge.net/stdair/?rev=188&view=rev
Author: quannaus
Date: 2010-05-03 11:50:17 +0000 (Mon, 03 May 2010)
Log Message:
-----------
[dev] Removed StatStatus and StartAnalysisDate.
Modified Paths:
--------------
trunk/stdair/stdair/STDAIR_Types.hpp
trunk/stdair/stdair/bom/BomManager.cpp
trunk/stdair/stdair/bom/LegCabin.cpp
trunk/stdair/stdair/bom/LegCabin.hpp
trunk/stdair/stdair/bom/LegCabinContent.cpp
trunk/stdair/stdair/bom/LegCabinContent.hpp
Modified: trunk/stdair/stdair/STDAIR_Types.hpp
===================================================================
--- trunk/stdair/stdair/STDAIR_Types.hpp 2010-05-03 09:13:50 UTC (rev 187)
+++ trunk/stdair/stdair/STDAIR_Types.hpp 2010-05-03 11:50:17 UTC (rev 188)
@@ -385,9 +385,6 @@
/** Mode of inventory control. */
typedef std::string ControlMode_T;
- /** Analysis status (true or false). */
- typedef bool AnalysisStatus_T;
-
/** Define the name of a multiplier. */
typedef double Multiplier_T;
Modified: trunk/stdair/stdair/bom/BomManager.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomManager.cpp 2010-05-03 09:13:50 UTC (rev 187)
+++ trunk/stdair/stdair/bom/BomManager.cpp 2010-05-03 11:50:17 UTC (rev 188)
@@ -191,7 +191,8 @@
<< lCurrentLD.getBoardingPoint() << "-"
<< lCurrentLD.getOffPoint() << ", "
<< lCurrentLC.getCabinCode() << ", "
- << lCurrentLC.getCapacity() << ", "
+ << lCurrentLC.getOfferedCapacity() << ", "
+ << lCurrentLC.getPhysicalCapacity() << ", "
<< lCurrentLC.getSoldSeat() << ", "
<< lCurrentLC.getCommitedSpace() << ", "
<< lCurrentLC.getAvailabilityPool() << ", "
Modified: trunk/stdair/stdair/bom/LegCabin.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabin.cpp 2010-05-03 09:13:50 UTC (rev 187)
+++ trunk/stdair/stdair/bom/LegCabin.cpp 2010-05-03 11:50:17 UTC (rev 188)
@@ -53,14 +53,5 @@
return oStr.str();
}
- // ////////////////////////////////////////////////////////////////////
- void LegCabin::setCapacity(const CabinCapacity_T& iCapacity,
- const AnalysisStatus_T& iAnalysisStatus) {
- _capacity = iCapacity;
- // LegDate* lLegDate = getParent();
-// assert (lLegDate!= NULL);
-// lLegDate->updateCapacityAndLegASK(iCapacity, iAnalysisStatus);
- }
-
}
Modified: trunk/stdair/stdair/bom/LegCabin.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabin.hpp 2010-05-03 09:13:50 UTC (rev 187)
+++ trunk/stdair/stdair/bom/LegCabin.hpp 2010-05-03 11:50:17 UTC (rev 188)
@@ -41,11 +41,6 @@
// //////////////////////////////////////////////////////////////////
public:
- // ///////// Setters //////////
- /** Set the off cabin. */
- void setCapacity (const CabinCapacity_T&, const AnalysisStatus_T&);
-
- public:
// /////////// Display support methods /////////
/** Dump a Business Object into an output stream.
@param ostream& the output stream. */
Modified: trunk/stdair/stdair/bom/LegCabinContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinContent.cpp 2010-05-03 09:13:50 UTC (rev 187)
+++ trunk/stdair/stdair/bom/LegCabinContent.cpp 2010-05-03 11:50:17 UTC (rev 188)
@@ -13,7 +13,8 @@
// ////////////////////////////////////////////////////////////////////
LegCabinContent::LegCabinContent (const Key_T& iKey)
: _key (iKey),
- _capacity (DEFAULT_CABIN_CAPACITY),
+ _offeredCapacity (DEFAULT_CABIN_CAPACITY),
+ _physicalCapacity (DEFAULT_CABIN_CAPACITY),
_soldSeat (DEFAULT_CLASS_NB_OF_BOOKINGS),
_commitedSpace (DEFAULT_COMMITED_SPACE),
_availabilityPool (DEFAULT_AVAILABILITY),
Modified: trunk/stdair/stdair/bom/LegCabinContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegCabinContent.hpp 2010-05-03 09:13:50 UTC (rev 187)
+++ trunk/stdair/stdair/bom/LegCabinContent.hpp 2010-05-03 11:50:17 UTC (rev 188)
@@ -29,11 +29,16 @@
return _key.getCabinCode();
}
- /** Get the cabin capacity. */
- const CabinCapacity_T& getCapacity () const {
- return _capacity;
+ /** Get the cabin offered capacity. */
+ const CabinCapacity_T& getOfferedCapacity () const {
+ return _offeredCapacity;
}
+ /** Get the cabin physical capacity. */
+ const CabinCapacity_T& getPhysicalCapacity () const {
+ return _physicalCapacity;
+ }
+
/** Get the number of sold seat. */
const NbOfBookings_T& getSoldSeat () const {
return _soldSeat;
@@ -66,6 +71,12 @@
public:
// ///////////// Setters ///////////////
+ /** Set the offered and physical capacities. */
+ void setCapacities (const CabinCapacity_T& iCapacity) {
+ _offeredCapacity = iCapacity;
+ _physicalCapacity = iCapacity;
+ }
+
/** Set the number of sold seat. */
void setSoldSeat (const NbOfBookings_T& iSoldSeat) {
_soldSeat = iSoldSeat;
@@ -117,11 +128,9 @@
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;
@@ -135,9 +144,12 @@
/** The key of both structure and content objects. */
Key_T _key;
- /** Capacity of the cabin. */
- CabinCapacity_T _capacity;
+ /** Offered capacity of the cabin. */
+ CabinCapacity_T _offeredCapacity;
+ /** Physical capacity of the cabin. */
+ CabinCapacity_T _physicalCapacity;
+
/** Sold seat into the cabin. */
NbOfBookings_T _soldSeat;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
