Menu
▾
▴
[Dsim-svn] SF.net SVN: dsim:[140] trunk/dsim/dsim
|
From: <qua...@us...> - 2010-10-13 13:31:37
|
Revision: 140
http://dsim.svn.sourceforge.net/dsim/?rev=140&view=rev
Author: quannaus
Date: 2010-10-13 13:31:31 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
[dev] Added input files in AIRINV and SIMFQT.
Modified Paths:
--------------
trunk/dsim/dsim/DSIM_Service.hpp
trunk/dsim/dsim/service/DSIM_Service.cpp
Modified: trunk/dsim/dsim/DSIM_Service.hpp
===================================================================
--- trunk/dsim/dsim/DSIM_Service.hpp 2010-10-04 09:30:53 UTC (rev 139)
+++ trunk/dsim/dsim/DSIM_Service.hpp 2010-10-13 13:31:31 UTC (rev 140)
@@ -37,9 +37,13 @@
@param const stdair::BasLogParams& Parameters for the output log stream.
@param const stdair::BasDBParams& Parameters for the database access.
@param const stdair::Filename_T& Filename of the input schedule file.
+ @param const stdair::Filename_T& Filename of the input O&D file.
+ @param const stdair::Filename_T& Filename of the input fare file.
@param const stdair::Filename_T& Filename of the input demand file. */
DSIM_Service (const stdair::BasLogParams&, const stdair::BasDBParams&,
const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iODInputFilename,
+ const stdair::Filename_T& iFareInputFilename,
const stdair::Filename_T& iDemandInputFilenames);
/** Constructor.
@@ -52,9 +56,13 @@
calling chain (for instance, when the DSIM_Service is
itself being initialised by another library service).
@param const stdair::Filename_T& Filename of the input schedule file.
+ @param const stdair::Filename_T& Filename of the input O&D file.
+ @param const stdair::Filename_T& Filename of the input Fare file.
@param const stdair::Filename_T& Filename of the input demand file. */
DSIM_Service (stdair::STDAIR_ServicePtr_T,
const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iODInputFilename,
+ const stdair::Filename_T& iFareInputFilename,
const stdair::Filename_T& iDemandInputFilenames);
/** Destructor. */
@@ -95,8 +103,12 @@
simulator, is parsed and the inventories are generated accordingly.
@param const stdair::AirlineFeatureSet& Set of airline features.
@param const stdair::Filename_T& Filename of the input schedule file.
+ @param const stdair::Filename_T& Filename of the input O&D file.
+ @param const stdair::Filename_T& Filename of the input Fare file.
@param const stdair::Filename_T& Filename of the input demand file. */
void init (const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iODInputFilename,
+ const stdair::Filename_T& iFareInputFilename,
const stdair::Filename_T& iDemandInputFilename);
/** Finalise. */
Modified: trunk/dsim/dsim/service/DSIM_Service.cpp
===================================================================
--- trunk/dsim/dsim/service/DSIM_Service.cpp 2010-10-04 09:30:53 UTC (rev 139)
+++ trunk/dsim/dsim/service/DSIM_Service.cpp 2010-10-13 13:31:31 UTC (rev 140)
@@ -45,6 +45,8 @@
// //////////////////////////////////////////////////////////////////////
DSIM_Service::DSIM_Service (stdair::STDAIR_ServicePtr_T ioSTDAIR_ServicePtr,
const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iODInputFilename,
+ const stdair::Filename_T& iFareInputFilename,
const stdair::Filename_T& iDemandInputFilename)
: _dsimServiceContext (NULL) {
@@ -59,13 +61,16 @@
lDSIM_ServiceContext.setSTDAIR_Service (ioSTDAIR_ServicePtr);
// Initialise the context
- init (iScheduleInputFilename, iDemandInputFilename);
+ init (iScheduleInputFilename, iODInputFilename,
+ iFareInputFilename, iDemandInputFilename);
}
// //////////////////////////////////////////////////////////////////////
DSIM_Service::DSIM_Service (const stdair::BasLogParams& iLogParams,
const stdair::BasDBParams& iDBParams,
const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iODInputFilename,
+ const stdair::Filename_T& iFareInputFilename,
const stdair::Filename_T& iDemandInputFilename)
: _dsimServiceContext (NULL) {
@@ -76,7 +81,8 @@
initStdAirService (iLogParams, iDBParams);
// Initialise the (remaining of the) context
- init (iScheduleInputFilename, iDemandInputFilename);
+ init (iScheduleInputFilename, iODInputFilename,
+ iFareInputFilename, iDemandInputFilename);
}
// //////////////////////////////////////////////////////////////////////
@@ -117,6 +123,8 @@
// //////////////////////////////////////////////////////////////////////
void DSIM_Service::init (const stdair::Filename_T& iScheduleInputFilename,
+ const stdair::Filename_T& iODInputFilename,
+ const stdair::Filename_T& iFareInputFilename,
const stdair::Filename_T& iDemandInputFilename) {
// Retrieve the service context
assert (_dsimServiceContext != NULL);
@@ -136,12 +144,12 @@
// on the Service object, and deletes that object when it is no longer
// referenced (e.g., at the end of the process).
SIMCRS_ServicePtr_T lSIMCRS_Service =
- boost::make_shared<SIMCRS::SIMCRS_Service> (lSTDAIR_Service_ptr,
- lCRSCode,
- iScheduleInputFilename);
+ boost::make_shared<SIMCRS::SIMCRS_Service> (lSTDAIR_Service_ptr, lCRSCode,
+ iScheduleInputFilename,
+ iODInputFilename,
+ iFareInputFilename);
lDSIM_ServiceContext.setSIMCRS_Service (lSIMCRS_Service);
- // TODO: do not hardcode the demand input file.
// Initialise the TRADEMGEN service handler
TRADEMGEN_ServicePtr_T lTRADEMGEN_Service =
boost::make_shared<TRADEMGEN::TRADEMGEN_Service> (lSTDAIR_Service_ptr,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
