Changeset 828

Timestamp:

02/23/10 14:14:39 (15 years ago)

Author:

prikryl

Message:

Value of szBasePath is already the base path.
Different placement of windows includes.

Files:

• applications/doprava/aimsun_bdm/aimsun_ds.cpp (modified) (7 diffs)

applications/doprava/aimsun_bdm/aimsun_ds.cpp

@@ -2 +2 @@
  */
 
-/* WIN32 stuff */
-#include <windows.h>
-#include <stdio.h>
-#include <tchar.h>
+/* Class definition */
+#include "aimsun_ds.h"
+#include "tools.h"
 
 // TODO: reference additional headers your program requires here
@@ -14 +13 @@
 
 #include <atlbase.h>
-
-extern "C" {
-#include "eh_hrd.h"
-#include "els3_comm.h"
-#include "vgs_hrd.h"
-}
-
-/* Class definition */
-#include "aimsun_ds.h"
-#include "tools.h"
 
 #define MAX_PATH_BYTES  (MAX_PATH*sizeof(TCHAR))
@@ -92 +81 @@
            The first search for backslash removes the executable from the
            path.*/
-        last = _tcsrchr ( szBasePath, '\\' );
-        *last = '\0';
+        //last = _tcsrchr ( szBasePath, '\\' );
+        //*last = '\0';
         /* The second moves to the root of the installation. */
-        last = _tcsrchr ( szBasePath, '\\' );
-        *last = '\0';
+        //last = _tcsrchr ( szBasePath, '\\' );
+        //*last = '\0';
 
         /* Create the path to DLL directory.
@@ -280 +269 @@
         }
 
+        /* Aaaaggggrrrrrhhhh!
+           C++ is much much faster than Matlab and we have a synchronisation
+           issue with els3 controllers starting too late. */
+        Sleep ( 5000 );
+
         /* Prepare full path for vehicle input data. */
         StringCbCopy ( szEntrancePath, MAX_EXE_PATH, szSceDir );
@@ -320 +314 @@
   /* Remember the size of the input vector. */
   utsize = Urv._dsize();
+
+  set_log_level(0);
+  /* Initialise the pointer to received data. */
+  p_rsp = NULL;
 }
 
@@ -441 +439 @@
     }
     /* Check that the phase lengths sum to correct cycle time. */
-    if ( ut[0]+ut[1]+ut[2] != 80 )
+    /*
+        if ( ut[0]+ut[1]+ut[2] != 80 )
     {
       fprintf ( stderr, "Intersection 495: F1+F2+F3 != Tc (should be 80)" );
@@ -450 +449 @@
       fprintf ( stderr, "Intersection 601: F1+F2+F3 != Tc (should be 80)" );
       exit(-1);
-    }
+    }*/
 
     hrdsp[0].id = 495;