|
From: <den...@us...> - 2010-08-30 12:58:09
|
Revision: 121
http://dsim.svn.sourceforge.net/dsim/?rev=121&view=rev
Author: denis_arnaud
Date: 2010-08-30 12:58:03 +0000 (Mon, 30 Aug 2010)
Log Message:
-----------
[Test] Suppressed unused source code file.
Modified Paths:
--------------
trunk/dsim/test/dsim/Makefile.am
trunk/dsim/test/dsim/SimulationTestSuite.cpp
Removed Paths:
-------------
trunk/dsim/test/dsim/simulate.cpp
Property Changed:
----------------
trunk/dsim/test/dsim/
Property changes on: trunk/dsim/test/dsim
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
simulate
simulate.log
SimulationTestSuite
SimulationTestSuite_results.xml
+ .deps
.libs
Makefile.in
Makefile
SimulationTestSuite
SimulationTestSuite_results.xml
SimulationTestSuite.log
Modified: trunk/dsim/test/dsim/Makefile.am
===================================================================
--- trunk/dsim/test/dsim/Makefile.am 2010-08-20 14:56:17 UTC (rev 120)
+++ trunk/dsim/test/dsim/Makefile.am 2010-08-30 12:58:03 UTC (rev 121)
@@ -21,11 +21,3 @@
$(top_builddir)/extracppunit/libextracppunit.la \
$(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/dsim/core/libdsim.la
-
-#simulate_SOURCES = simulate.cpp
-#simulate_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
-#simulate_LDADD =
-#simulate_LDFLAGS = $(BOOST_LIBS) \
-# $(top_builddir)/stdair/core/libstdair.la \
-# $(top_builddir)/dsim/core/libdsim.la
-
Modified: trunk/dsim/test/dsim/SimulationTestSuite.cpp
===================================================================
--- trunk/dsim/test/dsim/SimulationTestSuite.cpp 2010-08-20 14:56:17 UTC (rev 120)
+++ trunk/dsim/test/dsim/SimulationTestSuite.cpp 2010-08-30 12:58:03 UTC (rev 121)
@@ -29,7 +29,7 @@
const stdair::Filename_T lDemandInputFilename ("../samples/demand01.csv");
// Output log File
- const std::string lLogFilename ("simulate.log");
+ const std::string lLogFilename ("SimulationTestSuite.log");
// Set the log parameters
std::ofstream logOutputFile;
Deleted: trunk/dsim/test/dsim/simulate.cpp
===================================================================
--- trunk/dsim/test/dsim/simulate.cpp 2010-08-20 14:56:17 UTC (rev 120)
+++ trunk/dsim/test/dsim/simulate.cpp 2010-08-30 12:58:03 UTC (rev 121)
@@ -1,59 +0,0 @@
-// STL
-#include <cassert>
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <string>
-// StdAir
-#include <stdair/STDAIR_Types.hpp>
-#include <stdair/basic/BasLogParams.hpp>
-#include <stdair/basic/BasDBParams.hpp>
-// DSIM
-#include <dsim/DSIM_Service.hpp>
-#include <dsim/config/dsim-paths.hpp>
-
-// ///////// M A I N ////////////
-int main (int argc, char* argv[]) {
-
- try {
-
- // Schedule input file name
- const std::string lScheduleInputFilename ("../samples/schedule01.csv");
-
- // Demand input file name
- const stdair::Filename_T lDemandInputFilename ("../samples/demand01.csv");
-
- // Output log File
- const std::string lLogFilename ("simulate.log");
-
- // Set the log parameters
- std::ofstream logOutputFile;
- // Open and clean the log outputfile
- logOutputFile.open (lLogFilename.c_str());
- logOutputFile.clear();
-
- // Initialise the simulation context
- const stdair::BasLogParams lLogParams (stdair::LOG::DEBUG, logOutputFile);
- const stdair::BasDBParams lDBParams ("dsim", "dsim", "localhost", "3306",
- "dsim");
- DSIM::DSIM_Service dsimService (lLogParams, lDBParams,
- lScheduleInputFilename,
- lDemandInputFilename);
- // Perform a simulation
- dsimService.simulate();
-
- } catch (const DSIM::RootException& otexp) {
- std::cerr << "Standard exception: " << otexp.what() << std::endl;
- return -1;
-
- } 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.
|