Menu
▾
▴
[Stdair-svn] SF.net SVN: stdair:[89] trunk/stdair/stdair
|
From: <qua...@us...> - 2010-01-06 18:14:02
|
Revision: 89
http://stdair.svn.sourceforge.net/stdair/?rev=89&view=rev
Author: quannaus
Date: 2010-01-06 18:13:55 +0000 (Wed, 06 Jan 2010)
Log Message:
-----------
[Dev] Fixed some bugs.
Modified Paths:
--------------
trunk/stdair/stdair/basic/BasConst.cpp
trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp
trunk/stdair/stdair/bom/AirportDate.cpp
trunk/stdair/stdair/bom/AirportDateKey.cpp
trunk/stdair/stdair/bom/AirportDateKey.hpp
trunk/stdair/stdair/bom/Network.hpp
trunk/stdair/stdair/bom/NetworkDateKey.cpp
trunk/stdair/stdair/bom/NetworkDateKey.hpp
trunk/stdair/stdair/bom/OutboundPathContent.cpp
trunk/stdair/stdair/bom/OutboundPathContent.hpp
trunk/stdair/stdair/bom/OutboundPathKey.cpp
trunk/stdair/stdair/bom/OutboundPathKey.hpp
Modified: trunk/stdair/stdair/basic/BasConst.cpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst.cpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/basic/BasConst.cpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -10,6 +10,7 @@
#include <stdair/basic/BasConst_BookingClass.hpp>
#include <stdair/basic/BasConst_Yield.hpp>
#include <stdair/basic/BasConst_Period_BOM.hpp>
+#include <stdair/basic/BasConst_TravelSolution.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp
===================================================================
--- trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/basic/BasConst_TravelSolution.hpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -5,7 +5,7 @@
// Import section
// //////////////////////////////////////////////////////////////////////
// LATUS Common
-#include <stdair/basic/BasComTypes.hpp>
+#include <stdair/STDAIR_Types.hpp>
namespace stdair {
Modified: trunk/stdair/stdair/bom/AirportDate.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirportDate.cpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/AirportDate.cpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -63,12 +63,6 @@
OutboundPathMap_T AirportDate::getOutboundPathMap () const {
return _airportDateStructure.getChildrenHolder();
}
-
- // ////////////////////////////////////////////////////////////////////
- OutboundPath* AirportDate::
- getOutboundPath (const OutboundPathKey_T& iKey) const {
- return _airportDateStructure.getContentChild (iKey);
- }
}
Modified: trunk/stdair/stdair/bom/AirportDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/AirportDateKey.cpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/AirportDateKey.cpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -16,6 +16,11 @@
}
// ////////////////////////////////////////////////////////////////////
+ AirportDateKey_T::AirportDateKey_T (const AirportDateKey_T& iKey)
+ : _origin (iKey._origin) {
+ }
+
+ // ////////////////////////////////////////////////////////////////////
AirportDateKey_T::~AirportDateKey_T () {
}
Modified: trunk/stdair/stdair/bom/AirportDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/AirportDateKey.hpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/AirportDateKey.hpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -21,7 +21,7 @@
private:
// /////////// Default constructor //////////
- AirportDateKey_T () { };
+ AirportDateKey_T ();
public:
// /////////// Construction ///////////
Modified: trunk/stdair/stdair/bom/Network.hpp
===================================================================
--- trunk/stdair/stdair/bom/Network.hpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/Network.hpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -40,9 +40,6 @@
/** Definition allowing to retrieve the associated BOM content child
type. */
typedef NetworkDate ContentChild_T;
-
- /** Definition allowing to retrieve the specific BookingClass type. */
- typedef BookingClass BookingClassContent_T;
// /////////////////////////////////////////////////////////////////////////
public:
Modified: trunk/stdair/stdair/bom/NetworkDateKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/NetworkDateKey.cpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/NetworkDateKey.cpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -17,6 +17,11 @@
}
// ////////////////////////////////////////////////////////////////////
+ NetworkDateKey_T::NetworkDateKey_T (const NetworkDateKey_T& iKey)
+ : _referenceDate (iKey._referenceDate) {
+ }
+
+ // ////////////////////////////////////////////////////////////////////
NetworkDateKey_T::~NetworkDateKey_T () {
}
Modified: trunk/stdair/stdair/bom/NetworkDateKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/NetworkDateKey.hpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/NetworkDateKey.hpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -21,7 +21,7 @@
private:
// /////////// Default constructor //////////
- NetworkDateKey_T () { };
+ NetworkDateKey_T ();
public:
// /////////// Construction ///////////
Modified: trunk/stdair/stdair/bom/OutboundPathContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/OutboundPathContent.cpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/OutboundPathContent.cpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -10,10 +10,10 @@
namespace stdair {
// ////////////////////////////////////////////////////////////////////
- OutboundPath::OutboundPath (const OutboundPathKey_T& iKey)
+ OutboundPathContent::OutboundPathContent (const OutboundPathKey_T& iKey)
: _key (iKey), _airlineCode (DEFAULT_AIRLINE_CODE),
_flightPathCode (DEFAULT_FLIGHTPATH_CODE),
- _boardTime (NULL_BOOST_TIME_DURATION) {
+ _flightTime (NULL_BOOST_TIME_DURATION) {
}
// ////////////////////////////////////////////////////////////////////
Modified: trunk/stdair/stdair/bom/OutboundPathContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/OutboundPathContent.hpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/OutboundPathContent.hpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -45,22 +45,22 @@
/** Get the number of segments (part of the primary key). */
const NbOfSegments_T& getNbOfSegments() const {
- return _key._nbOfSegments;
+ return _key.getNbOfSegments();
}
/** Get the destination (part of the primary key). */
const AirportCode_T& getDestination() const {
- return _key._destination;
+ return _key.getOffPoint();
}
/** Get the elapsed time (part of the primary key). */
const Duration_T& getElapsedTime() const {
- return _key._elapsed;
+ return _key.getElapsedTime();
}
/** Get the number of airlines (part of the primary key). */
const NbOfAirlines_T& getNbOfAirlines() const {
- return _key._nbOfAirlines;
+ return _key.getNbOfAirlines();
}
public:
Modified: trunk/stdair/stdair/bom/OutboundPathKey.cpp
===================================================================
--- trunk/stdair/stdair/bom/OutboundPathKey.cpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/OutboundPathKey.cpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -12,10 +12,10 @@
const Duration_T& iElapsedTime,
const NbOfSegments_T& iNbOfSegments,
const NbOfAirlines_T& iNbOfAirlines)
- : destination (iDestination),
- elapsed (iElapsedTime),
- nbOfSegments (iNbOfSegments),
- nbOfAirlines (iNbOfAirlines) {
+ : _destination (iDestination),
+ _elapsed (iElapsedTime),
+ _nbOfSegments (iNbOfSegments),
+ _nbOfAirlines (iNbOfAirlines) {
}
// ////////////////////////////////////////////////////////////////////
@@ -34,7 +34,8 @@
// ////////////////////////////////////////////////////////////////////
const std::string OutboundPathKey_T::toString() const {
std::ostringstream oStr;
- oStr << _classCode;
+ oStr << _destination << ", " << _elapsed << ", "
+ << _nbOfSegments << ", " << _nbOfAirlines;
return oStr.str();
}
@@ -47,12 +48,12 @@
// //////////////////////////////////////////////////////////////////////
const AirportCode_T& OutboundPathKey_T::getBoardingPoint() const {
- return _parentKey.getBoardPoint();
+ return _parentKey.getBoardingPoint();
}
// //////////////////////////////////////////////////////////////////////
const Date_T& OutboundPathKey_T::getBoardingDate() const {
- return _parentKey.getBoardDate();
+ return _parentKey.getBoardingDate();
}
}
Modified: trunk/stdair/stdair/bom/OutboundPathKey.hpp
===================================================================
--- trunk/stdair/stdair/bom/OutboundPathKey.hpp 2010-01-06 16:53:49 UTC (rev 88)
+++ trunk/stdair/stdair/bom/OutboundPathKey.hpp 2010-01-06 18:13:55 UTC (rev 89)
@@ -44,6 +44,11 @@
const NbOfAirlines_T& getNbOfAirlines() const {
return _nbOfAirlines;
}
+
+ /** Get the elapsed time. */
+ const Duration_T& getElapsedTime() const {
+ return _elapsed;
+ }
/** Get boarding airport. */
const AirportCode_T& getBoardingPoint() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
