Menu
▾
▴
[Dsim-svn] SF.net SVN: dsim:[67] trunk/dsim/dsim/command/Simulator.cpp
|
From: <den...@us...> - 2010-02-15 10:23:19
|
Revision: 67
http://dsim.svn.sourceforge.net/dsim/?rev=67&view=rev
Author: denis_arnaud
Date: 2010-02-15 10:23:12 +0000 (Mon, 15 Feb 2010)
Log Message:
-----------
[Dev] Fixed a compilation problem, with command/Simulator.cpp, due to TraDemGen interface change.
Modified Paths:
--------------
trunk/dsim/dsim/command/Simulator.cpp
Modified: trunk/dsim/dsim/command/Simulator.cpp
===================================================================
--- trunk/dsim/dsim/command/Simulator.cpp 2010-02-12 14:04:38 UTC (rev 66)
+++ trunk/dsim/dsim/command/Simulator.cpp 2010-02-15 10:23:12 UTC (rev 67)
@@ -39,90 +39,99 @@
// DEBUG
STDAIR_LOG_DEBUG ("The simulation is starting");
- // Hardcoded section for demand generation.
+ // ////////// Hardcoded section for demand generation ///////////
+ /** Origin. */
+ const stdair::AirportCode_T lLHR ("LHR");
+ /** Destination. */
+ const stdair::AirportCode_T lJFK ("JFK");
+ /** Preferred departure date. */
+ const stdair::Date_T lPreferredDepartureDate1 (2010, 1, 17);
+ const stdair::Date_T lPreferredDepartureDate2 (2010, 1, 18);
+ /** Passenger type. */
+ const stdair::PassengerType lLeisurePax ('L');
+ const stdair::PassengerType lBusinessPax ('B');
+ /** Demand distribution parameters. */
+ const stdair::NbOfRequests_T lDemandMean1 (10.0);
+ const stdair::StandardDeviationValue_T lDemandStdDev1 (2.0);
+ const stdair::NbOfRequests_T lDemandMean2 (12.0);
+ const stdair::StandardDeviationValue_T lDemandStdDev2 (1.0);
+
// Demand characteristics
- stdair::DemandCharacteristics demandCharacteristics1;
- stdair::DemandCharacteristics demandCharacteristics2;
+ const stdair::DemandStreamKey_T key1 (lLHR, lJFK, lPreferredDepartureDate1,
+ lLeisurePax);
+ const stdair::DemandStreamKey_T key2 (lLHR, lJFK, lPreferredDepartureDate2,
+ lBusinessPax);
+
+ stdair::DemandCharacteristics demandCharacteristics1 (key1);
+ stdair::DemandCharacteristics demandCharacteristics2 (key2);
+
+
// Demand distribution
- stdair::DemandDistribution demandDistribution1;
- stdair::DemandDistribution demandDistribution2;
-
- // distribution of number of requests
- demandDistribution1.setMeanNumberOfRequests (10.0);
- demandDistribution1.setStandardDeviationNumberOfRequests (2.0);
- demandDistribution2.setMeanNumberOfRequests (12.0);
- demandDistribution2.setStandardDeviationNumberOfRequests (1.0);
+ stdair::DemandDistribution demandDistribution1 (lDemandMean1,
+ lDemandStdDev1);
+ stdair::DemandDistribution demandDistribution2 (lDemandMean2,
+ lDemandStdDev2);
- // origin
- demandCharacteristics1.setOrigin ("LHR");
- demandCharacteristics2.setOrigin ("LHR");
- // destination
- demandCharacteristics1.setDestination ("JFK");
- demandCharacteristics2.setDestination ("JFK");
- // preferred departure date
- demandCharacteristics1.setPreferredDepartureDate (boost::gregorian::date (2010,1,17));
- demandCharacteristics2.setPreferredDepartureDate (boost::gregorian::date (2010,1,18));
- // Passenger type
- demandCharacteristics1.setPaxType ("L");
- demandCharacteristics2.setPaxType ("B");
-
- // arrival pattern
- std::multimap<stdair::FloatDuration_T, stdair::Probability_T> arrivalPatternCumulativeDistribution1;
+
+ // Arrival pattern
+ stdair::ArrivalPatternCumulativeDistribution_T arrivalPatternCumulativeDistribution1;
arrivalPatternCumulativeDistribution1.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (-365.0, 0) );
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (-365.0,
+ 0) );
arrivalPatternCumulativeDistribution1.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (-67.0, 0.2) );
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (-67.0,
+ 0.2) );
arrivalPatternCumulativeDistribution1.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (-17.0, 0.5) );
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (-17.0,
+ 0.5) );
arrivalPatternCumulativeDistribution1.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (0.0, 1.0) );
-
- std::multimap<stdair::FloatDuration_T, stdair::Probability_T> arrivalPatternCumulativeDistribution2;
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (0.0,
+ 1.0) );
+
+ stdair::ArrivalPatternCumulativeDistribution_T arrivalPatternCumulativeDistribution2;
arrivalPatternCumulativeDistribution2.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (-365.0, 0) );
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (-365.0,
+ 0) );
arrivalPatternCumulativeDistribution2.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (-300.0, 0.5) );
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (-300.0,
+ 0.5) );
arrivalPatternCumulativeDistribution2.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (-200.0, 0.9) );
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (-200.0,
+ 0.9) );
arrivalPatternCumulativeDistribution2.
- insert ( std::pair<stdair::FloatDuration_T, stdair::Probability_T> (0.0, 1.0) );
+ insert (stdair::ArrivalPatternCumulativeDistribution_T::value_type (0.0,
+ 1.0) );
// When creating the ContinuousAttribute object, the mapping is
// inverted, i.e., the inverse cumulative distribution can be
// derived from the cumulative distribution
- const stdair::ContinuousAttribute<stdair::FloatDuration_T> arrivalPattern1 (arrivalPatternCumulativeDistribution1);
+ const stdair::ContinuousFloatDuration_T arrivalPattern1 (arrivalPatternCumulativeDistribution1);
demandCharacteristics1.setArrivalPattern (arrivalPattern1);
- const stdair::ContinuousAttribute<stdair::FloatDuration_T> arrivalPattern2 (arrivalPatternCumulativeDistribution2);
+ const stdair::ContinuousFloatDuration_T arrivalPattern2 (arrivalPatternCumulativeDistribution2);
demandCharacteristics2.setArrivalPattern (arrivalPattern2);
-
+
// Display
- STDAIR_LOG_DEBUG ("Demand 1: " << demandCharacteristics1.display()
- << demandDistribution1.display()
- << std::endl << std::endl);
-
- STDAIR_LOG_DEBUG ("Demand 2: " << demandCharacteristics2.display()
- << demandDistribution2.display()
- << std::endl << std::endl);
-
+ STDAIR_LOG_DEBUG ("Demand 1: " << std::endl
+ << demandCharacteristics1.display()
+ << demandDistribution1.display());
+
+ STDAIR_LOG_DEBUG ("Demand 2: " << std::endl
+ << demandCharacteristics2.display()
+ << demandDistribution2.display());
+
// Seeds
stdair::RandomSeed_T seed = 2;
- // Key
- stdair::DemandStreamKey_T key1 = 1;
- stdair::DemandStreamKey_T key2 = 2;
-
-
-
- // Initialize the demand stream
+ // Initialise the demand stream
ioTRADEMGEN_Service.addDemandStream (key1, demandCharacteristics1,
demandDistribution1, seed, seed, seed);
ioTRADEMGEN_Service.addDemandStream (key2, demandCharacteristics2,
demandDistribution2, seed, seed, seed);
// Get the total number of requests to be generated
- stdair::Count_T totalNumberOfRequestsToBeGenerated1 =
+ stdair::NbOfRequests_T totalNumberOfRequestsToBeGenerated1 =
ioTRADEMGEN_Service.getTotalNumberOfRequestsToBeGenerated (key1);
- stdair::Count_T totalNumberOfRequestsToBeGenerated2 =
+ stdair::NbOfRequests_T totalNumberOfRequestsToBeGenerated2 =
ioTRADEMGEN_Service.getTotalNumberOfRequestsToBeGenerated (key2);
STDAIR_LOG_DEBUG ("Number of requests to be generated (demand 1): "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|