Changeset 874

Timestamp:

03/22/10 17:02:09 (15 years ago)

Author:

prikryl

Message:

Constructor of AimsunDS needs user-info config as parameter.
AimsunDS accepts two parameters from config file: entrances and stop_time.

Location:

applications/doprava/aimsun_bdm

Files:

• aimsun_ds.cpp (modified) (5 diffs)
• aimsun_ds.h (modified) (1 diff)

applications/doprava/aimsun_bdm/aimsun_ds.cpp

@@ -15 +15 @@
 
 #define MAX_PATH_BYTES  (MAX_PATH*sizeof(TCHAR))
-#define MAX_EXE_PATH    (2*MAX_PATH)
 #define MAX_EXE_BYTES   (MAX_EXE_PATH*sizeof(TCHAR))
 
@@ -47 +46 @@
 const int MeasurementOffsets[]  = {  6, 42 };
 
-AimsunDS::AimsunDS() : DS()
+AimsunDS::AimsunDS ( UIFile &cfg ) : DS()
 {
         HKEY  hKey;
@@ -63 +62 @@
         TCHAR szExePath[MAX_EXE_PATH];  /**< Command line when staring ELS3 controllers. */
         TCHAR szEntrancePath[MAX_PATH]; /**< Points to the CSV file with vehicle entrances for the simulation. */
+        string entranceFileName;
+        string stopTime;
         DWORD dwBufLen = MAX_PATH_BYTES;
         LONG  res;
@@ -211 +212 @@
                 );
 
+        /* Fourth modification step.
+           Replace the `stop time` field of RunTime information. */
+        UI::get ( stopTime, cfg, "stop_time" );
+        replace_stoptime (
+                szNetPath,
+                stopTime.c_str()
+                );
+
         StringCbCat ( szScePath, MAX_EXE_PATH, TEXT("\"") );
         StringCbCat ( szScePath, MAX_EXE_PATH, TEXT("\"") );
@@ -261 +270 @@
         Sleep ( 5000 );
 
+        /* Query the configuration file for the name of the file containsing
+           vehicle entrances. */
+        UI::get ( entranceFileName, cfg, "entrances" );
+
         /* Prepare full path for vehicle input data. */
         StringCbCopy ( szEntrancePath, MAX_EXE_PATH, szSceDir );
-        StringCbCat ( szEntrancePath, MAX_EXE_PATH, TEXT("\\zlicin_20071212_495_601.csv") );
+        StringCbCat  ( szEntrancePath, MAX_EXE_PATH, TEXT("\\") );
+        StringCbCat  ( szEntrancePath, MAX_EXE_PATH, entranceFileName.c_str() );
 
         /* Initialise and start the vehicle input.

applications/doprava/aimsun_bdm/aimsun_ds.h

@@ -30 +30 @@
 public:
     //! Constructor with fixed sampling period
-    AimsunDS ();
+    AimsunDS ( UIFile &cfg );
 
     //! Get measurements and signal plans from ELS3 controllers