Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[187] trunk/stdair/stdair/bom
|
From: <qua...@us...> - 2010-05-03 09:13:57
|
Revision: 187
http://stdair.svn.sourceforge.net/stdair/?rev=187&view=rev
Author: quannaus
Date: 2010-05-03 09:13:50 +0000 (Mon, 03 May 2010)
Log Message:
-----------
[dev] Removed some unnecessary statistical attributes.
Modified Paths:
--------------
trunk/stdair/stdair/bom/BomManager.cpp
trunk/stdair/stdair/bom/FlightDateContent.cpp
trunk/stdair/stdair/bom/FlightDateContent.hpp
trunk/stdair/stdair/bom/InventoryContent.hpp
trunk/stdair/stdair/bom/LegDateContent.cpp
trunk/stdair/stdair/bom/LegDateContent.hpp
trunk/stdair/stdair/bom/SegmentDateContent.cpp
trunk/stdair/stdair/bom/SegmentDateContent.hpp
Modified: trunk/stdair/stdair/bom/BomManager.cpp
===================================================================
--- trunk/stdair/stdair/bom/BomManager.cpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/BomManager.cpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -97,15 +97,7 @@
<< std::endl << std::endl;
oStream << iFlightDate.getFlightNumber()
- << " (" << iFlightDate.getFlightDate() << "), "
- << iFlightDate.getBookingCounter() << ", "
- << iFlightDate.getRevenue() << ", "
- << iFlightDate.getAverageFare() << ", "
- << iFlightDate.getASK() << ", "
- << iFlightDate.getYield() << ", "
- << iFlightDate.getRPK() << ", "
- << iFlightDate.getUnitRevenue() << ", "
- << iFlightDate.getLoadFactor() << ", " << std::endl;
+ << " (" << iFlightDate.getFlightDate() << std::endl;
oStream << "******************************************" << std::endl;
// Display the leg-dates
@@ -160,9 +152,6 @@
<< lCurrentLD.getElapsedTime() << ", "
<< lCurrentLD.getDistance() << ", "
<< lCurrentLD.getCapacity() << ", "
- << lCurrentLD.getASK() << ", "
- << lCurrentLD.getSoldSeat() << ", "
- << lCurrentLD.getLoadFactor() << ", "
<< std::endl;
}
oStream << "******************************************" << std::endl;
@@ -294,11 +283,6 @@
<< lCurrentSD.getTimeOffSet() << ") / "
<< lCurrentSD.getElapsedTime() << ", "
<< lCurrentSD.getDistance() << ", "
- << lCurrentSD.getBookingCounter() << ", "
- << lCurrentSD.getRevenue() << ", "
- << lCurrentSD.getAverageFare() << ", "
- << lCurrentSD.getUnitRevenue() << ", "
- << lCurrentSD.getRPK() << ", "
<< std::endl;
}
}
Modified: trunk/stdair/stdair/bom/FlightDateContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateContent.cpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/FlightDateContent.cpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -4,22 +4,13 @@
// STL
#include <cassert>
// STDAIR
-#include <stdair/basic/BasConst_General.hpp>
#include <stdair/bom/FlightDateContent.hpp>
namespace stdair {
// ////////////////////////////////////////////////////////////////////
FlightDateContent::FlightDateContent (const Key_T& iKey)
- : _key (iKey),
- _bookingCounter (DEFAULT_CLASS_NB_OF_BOOKINGS),
- _flightRevenue (DEFAULT_REVENUE_VALUE),
- _flightAverageFare (DEFAULT_FARE_VALUE),
- _flightASK (DEFAULT_DISTANCE_VALUE),
- _flightYield (DEFAULT_REVENUE_VALUE),
- _flightRPK (DEFAULT_DISTANCE_VALUE),
- _flightUnitRevenue (DEFAULT_REVENUE_VALUE),
- _flightLoadFactor (DEFAULT_REVENUE_VALUE) {
+ : _key (iKey) {
}
// ////////////////////////////////////////////////////////////////////
Modified: trunk/stdair/stdair/bom/FlightDateContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/FlightDateContent.hpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/FlightDateContent.hpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -33,80 +33,8 @@
const Date_T& getFlightDate() const {
return _key.getFlightDate();
}
-
- /** Get the booking counter. */
- const NbOfBookings_T& getBookingCounter () const {
- return _bookingCounter;
- }
- /** Get the total flight revenue. */
- const Revenue_T& getRevenue () const {
- return _flightRevenue;
- }
-
- /** Get the flight average fare. */
- const Fare_T& getAverageFare() const {
- return _flightAverageFare;
- }
-
- /** Get the Availability Seat Kilometer for this flight. */
- const Distance_T& getASK() const {
- return _flightASK;
- }
-
- /** Get the yield value for this flight. */
- const Revenue_T& getYield () const {
- return _flightYield;
- }
-
- /** Get the Revenue Passanger Kilometer for this flight. */
- const Distance_T& getRPK() const {
- return _flightRPK;
- }
-
- /** Get the unit revenue value for this flight. */
- const Revenue_T& getUnitRevenue () const {
- return _flightUnitRevenue;
- }
-
- /** Get the load factor value for this flight. */
- const Revenue_T& getLoadFactor () const {
- return _flightLoadFactor;
- }
-
public:
- // ///////// Setters //////////
- /** Set the revenue amount. */
- void setRevenue (const Revenue_T& iFlightRevenue) {
- _flightRevenue = iFlightRevenue;
- }
-
- /** Set the Revenue Passanger Kilometer. */
- void setRPK (const Distance_T& iFlightRPK) {
- _flightRPK = iFlightRPK;
- }
-
- /** Set the unit revenue. */
- void setUnitRevenue (const Revenue_T& iFlightURevenue) {
- _flightUnitRevenue = iFlightURevenue;
- }
-
- /** Set the average flight fare. */
- void setAverageFare(Fare_T iFAFare) {
- _flightAverageFare = iFAFare;
- }
-
- /** Set the yield. */
- void setYield (const Revenue_T& iFlightYield) {
- _flightYield = iFlightYield;
- }
-
- /** Set the load factor. */
- void setLoadFactor (const Revenue_T& iFlightLF) {
- _flightLoadFactor = iFlightLF;
- }
-
- public:
// /////////// Display support methods /////////
/** Dump a Business Object into an output stream.
@param ostream& the output stream. */
@@ -134,31 +62,6 @@
// Attributes
/** The key of both structure and content objects. */
Key_T _key;
-
- /** Counter of all bookings into this flight. */
- NbOfBookings_T _bookingCounter;
-
- /** Total amount of money earn with flight bookings. */
- Revenue_T _flightRevenue;
-
- /** Value of the average fare of this flight.*/
- Fare_T _flightAverageFare;
-
- /** Value of the Available Seat Kilometer for this flight.*/
- Distance_T _flightASK;
-
- /** Value of the Yield (Revenue/ASK). */
- Revenue_T _flightYield;
-
- /** Value of the Revenue Passanger Kilometer for this flight.*/
- Distance_T _flightRPK;
-
- /** Value of the Unit Revenue (Revenue/RPK). */
- Revenue_T _flightUnitRevenue;
-
- /** Value of the Load Factor (ASK/RPK). */
- Revenue_T _flightLoadFactor;
-
};
}
Modified: trunk/stdair/stdair/bom/InventoryContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/InventoryContent.hpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/InventoryContent.hpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -36,124 +36,27 @@
public:
// ////////// Getters ////////////
- /** Get the airline code. */
- const AirlineCode_T& getAirlineCode () const {
- return _key.getAirlineCode();
- }
-
/** Get the inventory key. */
const Key_T& getKey() const {
return _key;
}
-
- /** Get the booking counter. */
- const NbOfBookings_T& getBookingCounter () const {
- return _bookingCounter;
+
+ /** Get the airline code. */
+ const AirlineCode_T& getAirlineCode () const {
+ return _key.getAirlineCode();
}
- /** Get the total inventory revenue. */
- const Revenue_T& getRevenue () const {
- return _inventoryRevenue;
- }
-
- /** Get the inventory average fare. */
- const Fare_T& getAverageFare() const {
- return _inventoryAverageFare;
- }
-
- /** Get the Availability Seat Kilometer for the inventory. */
- const Distance_T& getASK() const {
- return _inventoryASK;
- }
-
- /** Get the yield value for the inventory. */
- const Revenue_T& getYield () const {
- return _inventoryYield;
- }
-
- /** Get the Revenue Passanger Kilometer for the whole inventory. */
- const Distance_T& getRPK() const {
- return _inventoryRPK;
- }
-
- /** Get the unit revenue value for the whole inventory. */
- const Revenue_T& getUnitRevenue () const {
- return _inventoryUnitRevenue;
- }
-
- /** Get the load factor value for this inventory. */
- const Revenue_T& getLoadFactor () const {
- return _inventoryLoadFactor;
- }
-
- public:
- // ///////// Setters //////////
- /** Set the revenue amount. */
- void setRevenue (const Revenue_T& iInventoryRevenue) {
- _inventoryRevenue = iInventoryRevenue;
- }
-
- /** Set the Revenue Passanger Kilometer. */
- void setRPK (const Distance_T& iInventoryRPK) {
- _inventoryRPK = iInventoryRPK;
- }
-
- /** Set the unit revenue. */
- void setUnitRevenue (const Revenue_T& iInventoryURevenue) {
- _inventoryUnitRevenue = iInventoryURevenue;
- }
-
- /** Set the average fare. */
- void setAverageFare(Fare_T iIAFare) {
- _inventoryAverageFare = iIAFare;
- }
-
- /** Set the yield. */
- void setYield (const Revenue_T& iInvYield) {
- _inventoryYield = iInvYield;
- }
-
- /** Set the load factor. */
- void setLoadFactor (const Revenue_T& iInventoryLF) {
- _inventoryLoadFactor = iInventoryLF;
- }
-
protected:
/** Default constructors. */
InventoryContent (const Key_T&);
InventoryContent (const InventoryContent&);
/** Destructor. */
- virtual ~InventoryContent();
+ ~InventoryContent();
protected:
// Attributes
/** The key of both structure and content objects. */
Key_T _key;
-
- /** Counter of all bookings into the inventory. */
- NbOfBookings_T _bookingCounter;
-
- /** Total amount of money earn with all flight bookings
- for one airline. */
- Revenue_T _inventoryRevenue;
-
- /** Value of the average fare of the inventory.*/
- Fare_T _inventoryAverageFare;
-
- /** Value of the Available Seat Kilometer for this Inventory.*/
- Distance_T _inventoryASK;
-
- /** Value of the Yield (Revenue/ASK). */
- Revenue_T _inventoryYield;
-
- /** Value of the Revenue Passanger Kilometer for the whole inventory.*/
- Distance_T _inventoryRPK;
-
- /** Value of the Unit Revenue (Revenue/RPK). */
- Revenue_T _inventoryUnitRevenue;
-
- /** Value of the Load Factor (ASK/RPK). */
- Revenue_T _inventoryLoadFactor;
};
}
Modified: trunk/stdair/stdair/bom/LegDateContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateContent.cpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/LegDateContent.cpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -13,9 +13,7 @@
LegDateContent::LegDateContent (const Key_T& iKey) \
: _key (iKey),
_distance (DEFAULT_DISTANCE_VALUE),
- _capacity (DEFAULT_CABIN_CAPACITY),
- _legSoldSeat (DEFAULT_CLASS_NB_OF_BOOKINGS),
- _legLoadFactor (DEFAULT_REVENUE_VALUE) {
+ _capacity (DEFAULT_CABIN_CAPACITY) {
}
// ////////////////////////////////////////////////////////////////////
Modified: trunk/stdair/stdair/bom/LegDateContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/LegDateContent.hpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/LegDateContent.hpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -69,21 +69,6 @@
return _capacity;
}
- /** Get the Availability Seat Kilometer for this leg. */
- const Distance_T& getASK() const {
- return _legASK;
- }
-
- /** Get the number of sold seat. */
- const NbOfBookings_T& getSoldSeat () const {
- return _legSoldSeat;
- }
-
- /** Get the load factor value for this leg. */
- const Revenue_T& getLoadFactor () const {
- return _legLoadFactor;
- }
-
/** Get the date off set (off date - boarding date). */
const DateOffSet_T getDateOffSet () const {
return _offDate - _boardingDate;
@@ -122,11 +107,6 @@
_offTime = iOffTime;
}
- /** Set the number of sold seat. */
- void setSoldSeat (const NbOfBookings_T& iLSoldSeat) {
- _legSoldSeat = iLSoldSeat;
- }
-
/** Set the elapsed time. */
void setElapsedTime (const Duration_T&);
@@ -155,7 +135,7 @@
LegDateContent (const Key_T&);
LegDateContent (const LegDateContent&);
/** Destructor. */
- virtual ~LegDateContent();
+ ~LegDateContent();
protected:
// Attributes
@@ -185,16 +165,6 @@
/** Capacity of the leg. */
CabinCapacity_T _capacity;
-
- /** Value of the Available Seat Kilometer for this leg.*/
- Distance_T _legASK;
-
- /** Sold seat into the leg. */
- NbOfBookings_T _legSoldSeat;
-
- /** Value of the Load Factor (ASK/RPK) or
- (sold seats/ capacity) for the leg level. */
- Revenue_T _legLoadFactor;
};
}
Modified: trunk/stdair/stdair/bom/SegmentDateContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateContent.cpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/SegmentDateContent.cpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -11,12 +11,7 @@
// ////////////////////////////////////////////////////////////////////
SegmentDateContent::SegmentDateContent (const Key_T& iKey)
- : _key (iKey),
- _bookingCounter (DEFAULT_CLASS_NB_OF_BOOKINGS),
- _segmentRevenue (DEFAULT_REVENUE_VALUE),
- _segmentAverageFare (DEFAULT_FARE_VALUE),
- _segmentUnitRevenue (DEFAULT_REVENUE_VALUE),
- _segmentRPK (DEFAULT_DISTANCE_VALUE) {
+ : _key (iKey) {
}
// ////////////////////////////////////////////////////////////////////
Modified: trunk/stdair/stdair/bom/SegmentDateContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/SegmentDateContent.hpp 2010-05-03 08:42:00 UTC (rev 186)
+++ trunk/stdair/stdair/bom/SegmentDateContent.hpp 2010-05-03 09:13:50 UTC (rev 187)
@@ -34,31 +34,6 @@
return _key.getOffPoint();
}
- /** Get the booking counter. */
- const NbOfBookings_T& getBookingCounter() const {
- return _bookingCounter;
- }
-
- /** Get the total segment revenue. */
- const Revenue_T& getRevenue () const {
- return _segmentRevenue;
- }
-
- /** Get the segment average fare. */
- const Fare_T& getAverageFare() const {
- return _segmentAverageFare;
- }
-
- /** Get the unit revenue value for this segment. */
- const Revenue_T& getUnitRevenue () const {
- return _segmentUnitRevenue;
- }
-
- /** Get the Revenue Passanger Kilometer for this segment. */
- const Distance_T& getRPK() const {
- return _segmentRPK;
- }
-
/** Get the boarding date. */
const Date_T& getBoardingDate () const {
return _boardingDate;
@@ -102,11 +77,6 @@
public:
// ///////// Setters //////////
- /** Set the revenue amount. */
- void setRevenue (const Revenue_T& iSegmentRevenue) {
- _segmentRevenue = iSegmentRevenue;
- }
-
/** Set the boarding date. */
void setBoardingDate (const Date_T& iBoardingDate) {
_boardingDate = iBoardingDate;
@@ -132,26 +102,6 @@
_elapsedTime = iElapsedTime;
}
- /** Set the total number of bookings. */
- void setBookingCounter (const NbOfBookings_T& iBookCounter) {
- _bookingCounter = iBookCounter;
- }
-
- /** Set the average segment fare. */
- void setAverageSegmentFare(Fare_T iSAFare) {
- _segmentAverageFare = iSAFare;
- }
-
- /** Set the Revenue Passanger Kilometer. */
- void setRPK (const Distance_T& iSegmentRPK) {
- _segmentRPK = iSegmentRPK;
- }
-
- /** Set the Unit Revenue. */
- void setUnitRevenue (const Revenue_T& iSegmentURevenue) {
- _segmentUnitRevenue = iSegmentURevenue;
- }
-
/** Set the distance. */
void setDistance (const Distance_T& iDistance) {
_distance = iDistance;
@@ -187,22 +137,7 @@
// Attributes
/** The key of both structure and content objects. */
Key_T _key;
-
- /** Counter of all bookings into this segment. */
- NbOfBookings_T _bookingCounter;
- /** Total amount of money earn with segment bookings. */
- Revenue_T _segmentRevenue;
-
- /** Value of the average fare of this segment date.*/
- Fare_T _segmentAverageFare;
-
- /** Value of the Unit Revenue (Revenue/ASK). */
- Revenue_T _segmentUnitRevenue;
-
- /** Value of the Revenue Passanger Kilometer for this segment date.*/
- Distance_T _segmentRPK;
-
/** Boarding Date. */
Date_T _boardingDate;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
