[Dsim-svn] SF.net SVN: dsim:[61] trunk/dsim

[<den...@us...>]

Revision: 61
          http://dsim.svn.sourceforge.net/dsim/?rev=61&view=rev
Author:   denis_arnaud
Date:     2010-02-06 17:58:43 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
[DB] Added support for database management (still a little work to do).

Modified Paths:
--------------
    trunk/dsim/dsim/service/DSIM_Service.cpp
    trunk/dsim/test/dsim/simulate.cpp

Property Changed:
----------------
    trunk/dsim/


Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:externals
   - config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit


   + config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
db https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/db
stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit



Modified: trunk/dsim/dsim/service/DSIM_Service.cpp
===================================================================
--- trunk/dsim/dsim/service/DSIM_Service.cpp	2010-02-03 16:28:56 UTC (rev 60)
+++ trunk/dsim/dsim/service/DSIM_Service.cpp	2010-02-06 17:58:43 UTC (rev 61)
@@ -140,15 +140,16 @@
                                                        iScheduleInputFilename));
     lDSIM_ServiceContext.setSIMCRS_Service (lSIMCRS_Service);
 
-    // TODO: do not hardcode the DBParams.
+    // TODO: do not hardcode the stdair::BasDBParams.
+    // TODO: do not hardcode the demand input file.
     // Initialise the TRADEMGEN service handler
-    const TRADEMGEN::DBParams lDBParams =
-      TRADEMGEN::DBParams ("anguyen", "anguyen", "ncemysqlp.nce.amadeus.net",
-                           "3321", "sim_anguyen");
+    const stdair::Filename_T lDemandInputFilename ("../../test/samples/demand01.csv");
+    const stdair::BasDBParams lDBParams =
+      stdair::BasDBParams ("dsim", "dsim", "localhost", "3306", "dsim");
     TRADEMGEN_ServicePtr_T lTRADEMGEN_Service =
-      TRADEMGEN_ServicePtr_T (new TRADEMGEN::TRADEMGEN_Service (lDBParams));
+      TRADEMGEN_ServicePtr_T (new TRADEMGEN::TRADEMGEN_Service (ioSTDAIR_ServicePtr,
+                                                                lDemandInputFilename));
     lDSIM_ServiceContext.setTRADEMGEN_Service (lTRADEMGEN_Service);
-    
   }
   
   // //////////////////////////////////////////////////////////////////////

Modified: trunk/dsim/test/dsim/simulate.cpp
===================================================================
--- trunk/dsim/test/dsim/simulate.cpp	2010-02-03 16:28:56 UTC (rev 60)
+++ trunk/dsim/test/dsim/simulate.cpp	2010-02-06 17:58:43 UTC (rev 61)
@@ -11,8 +11,6 @@
 // ///////// M A I N ////////////
 int main (int argc, char* argv[]) {
 
-  try {
-    
     // Schedule input file name
     std::string lScheduleInputFilename ("../samples/schedule01.csv");
 
@@ -32,13 +30,6 @@
     // Perform a simulation
     dsimService.simulate();
     
-  } catch (const std::exception& stde) {
-    std::cerr << "Standard exception: " << stde.what() << std::endl;
-    return -1;
-    
-  } catch (...) {
-    return -1;
-  }
-  
   return 0;	
 }
+


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