[Stdair-svn] SF.net SVN: stdair:[160] trunk/stdair/stdair

[<qua...@us...>]

Revision: 160
          http://stdair.svn.sourceforge.net/stdair/?rev=160&view=rev
Author:   quannaus
Date:     2010-03-11 09:07:32 +0000 (Thu, 11 Mar 2010)

Log Message:
-----------
[dev] Removed the key from DemandCharacteristics.

Modified Paths:
--------------
    trunk/stdair/stdair/basic/DemandCharacteristics.cpp
    trunk/stdair/stdair/basic/DemandCharacteristics.hpp
    trunk/stdair/stdair/bom/DemandStreamContent.cpp
    trunk/stdair/stdair/bom/DemandStreamContent.hpp

Modified: trunk/stdair/stdair/basic/DemandCharacteristics.cpp
===================================================================
--- trunk/stdair/stdair/basic/DemandCharacteristics.cpp	2010-03-10 16:30:22 UTC (rev 159)
+++ trunk/stdair/stdair/basic/DemandCharacteristics.cpp	2010-03-11 09:07:32 UTC (rev 160)
@@ -13,8 +13,7 @@
   
   // /////////////////////////////////////////////////////
   DemandCharacteristics::
-  DemandCharacteristics (const DemandStreamKey_T& iKey,
-                         const ArrivalPatternCumulativeDistribution_T& iArrivalPattern,
+  DemandCharacteristics (const ArrivalPatternCumulativeDistribution_T& iArrivalPattern,
                          const POSProbabilityMassFunction_T& iPOSProbMass,
                          const ChannelProbabilityMassFunction_T& iChannelProbMass,
                          const TripTypeProbabilityMassFunction_T& iTripTypeProbMass,
@@ -23,7 +22,7 @@
                          const PreferredDepartureTimeContinuousDistribution_T& iPreferredDepartureTimeContinuousDistribution,
                          const WTPContinuousDistribution_T& iWTPContinuousDistribution,
                          const ValueOfTimeContinuousDistribution_T& iValueOfTimeContinuousDistribution)
-    : _key (iKey), _arrivalPattern (iArrivalPattern),
+    : _arrivalPattern (iArrivalPattern),
       _posProbabilityMass (iPOSProbMass),
       _channelProbabilityMass (iChannelProbMass),
       _tripTypeProbabilityMass (iTripTypeProbMass),
@@ -39,40 +38,12 @@
   }
   
   // /////////////////////////////////////////////////////
-  const AirportCode_T& DemandCharacteristics::getOrigin() const {
-    return _key.getOrigin();
-  }
-    
-  // /////////////////////////////////////////////////////
-  const AirportCode_T& DemandCharacteristics::getDestination() const {
-    return _key.getDestination();
-  }
-    
-  // /////////////////////////////////////////////////////
-  const Date_T& DemandCharacteristics::getPreferredDepartureDate() const {
-    return _key.getPreferredDepartureDate();
-  }
-
-  // /////////////////////////////////////////////////////
-  const CabinCode_T& DemandCharacteristics::getPreferredCabin() const {
-    return _key.getPreferredCabin();
-  }
-  
-  // /////////////////////////////////////////////////////
   std::string DemandCharacteristics::display() const {
     std::ostringstream oStr;
 
     //
     oStr << "****************** Demand characteristics ******************"
          << std::endl;
-    oStr << "Origin ........................... : " << _key.getOrigin()
-         << std::endl;
-    oStr << "Destination ...................... : " << _key.getDestination()
-         << std::endl;
-    oStr << "Preferred departure date ......... : "
-         << _key.getPreferredDepartureDate() << std::endl;
-    oStr << "Preferred cabin .................. : " << _key.getPreferredCabin()
-         << std::endl;
     oStr << "Arrival pattern (days from departure, proportion): ";
     oStr << _arrivalPattern.displayCumulativeDistribution() << std::endl;
     oStr << "POS probability mass (POS, propotion): ";

Modified: trunk/stdair/stdair/basic/DemandCharacteristics.hpp
===================================================================
--- trunk/stdair/stdair/basic/DemandCharacteristics.hpp	2010-03-10 16:30:22 UTC (rev 159)
+++ trunk/stdair/stdair/basic/DemandCharacteristics.hpp	2010-03-11 09:07:32 UTC (rev 160)
@@ -17,24 +17,7 @@
   struct DemandCharacteristics {
   public:
     
-    // ///////////// Getters ///////////    
-    /** Get the key. */
-    const DemandStreamKey_T& getKey() const {
-      return _key;
-    }
-    
-    /** Get the origin. */
-    const AirportCode_T& getOrigin() const;
-    
-    /** Get the destination. */
-    const AirportCode_T& getDestination() const;
-    
-    /** Get the preferred departure date. */
-    const Date_T& getPreferredDepartureDate() const;
-
-    /** Get the preferred cabin. */
-    const CabinCode_T& getPreferredCabin() const;
-    
+    // ///////////// Getters /////////// 
     /** Get the arrival pattern. */
     const ContinuousFloatDuration_T& getArrivalPattern() const {
       return _arrivalPattern;
@@ -89,8 +72,7 @@
   public:
     // ////////// Constructors and destructors /////////
     /** Default constructor. */
-    DemandCharacteristics (const DemandStreamKey_T&,
-                           const ArrivalPatternCumulativeDistribution_T&,
+    DemandCharacteristics (const ArrivalPatternCumulativeDistribution_T&,
                            const POSProbabilityMassFunction_T&,
                            const ChannelProbabilityMassFunction_T&,
                            const TripTypeProbabilityMassFunction_T&,
@@ -111,9 +93,6 @@
 
   private:
     // //////////////////// Attributes /////////////////////
-    /** DemandStream Key */
-    const DemandStreamKey_T _key;
-    
     /** Arrival pattern (cumulative distribution of timing of arrival
         of requests (negative number of days between departure date
         and request date). */

Modified: trunk/stdair/stdair/bom/DemandStreamContent.cpp
===================================================================
--- trunk/stdair/stdair/bom/DemandStreamContent.cpp	2010-03-10 16:30:22 UTC (rev 159)
+++ trunk/stdair/stdair/bom/DemandStreamContent.cpp	2010-03-11 09:07:32 UTC (rev 160)
@@ -35,7 +35,7 @@
                        const RandomSeed_T& iRequestDateTimeSeed,
                        const RandomSeed_T& iDemandCharacteristicsSeed)
     : _key (iKey),
-      _demandCharacteristics (iKey, iArrivalPattern, iPOSProbMass,
+      _demandCharacteristics (iArrivalPattern, iPOSProbMass,
                               iChannelProbMass, iTripTypeProbMass,
                               iStayDurationProbMass, iFrequentFlyerProbMass,
                               iPreferredDepartureTimeContinuousDistribution,

Modified: trunk/stdair/stdair/bom/DemandStreamContent.hpp
===================================================================
--- trunk/stdair/stdair/bom/DemandStreamContent.hpp	2010-03-10 16:30:22 UTC (rev 159)
+++ trunk/stdair/stdair/bom/DemandStreamContent.hpp	2010-03-11 09:07:32 UTC (rev 160)
@@ -41,22 +41,22 @@
 
     /** Get the origin. */
     const AirportCode_T& getOrigin() const {
-      return _demandCharacteristics.getOrigin();
+      return _key.getOrigin();
     }
     
     /** Get the destination. */
     const AirportCode_T& getDestination() const {
-      return _demandCharacteristics.getDestination();
+      return _key.getDestination();
     }
     
     /** Get the preferred departure date. */
     const Date_T& getPreferredDepartureDate() const {
-      return _demandCharacteristics.getPreferredDepartureDate();
+      return _key.getPreferredDepartureDate();
     }
 
     /** Get the preferred cabin. */
     const CabinCode_T& getPreferredCabin() const {
-      return _demandCharacteristics.getPreferredCabin();
+      return _key.getPreferredCabin();
     }
 
     /** Get the arrival pattern. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.