Changeset 860 for applications/doprava

Timestamp:

03/08/10 19:17:16 (14 years ago)

Author:

prikryl

Message:

New global varibles IntersectionIDs and NumIntersections.
Measured RV has two dimensions, which allows us to unify IntensityOffsets and OccupancyOffests into MeasurementOffsets.
Use DLL_PATH to tell us the location of the global DLL directory.
Do not call set_log_level().
Corrected the measured data processing loops in getdata().

Files:

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

applications/doprava/aimsun_bdm/aimsun_ds.cpp

@@ -22 +22 @@
 const TCHAR * ControllerList[NUM_CONTROLLERS] = { TEXT("K_5_495"), TEXT("K_5_601") };
 const TCHAR * WindowStr[NUM_CONTROLLERS]      = { TEXT("els3@5.495"), TEXT("els3@5.601") };
+const int IntersectionIDs[] = { 495, 601 }; 
+const int NumIntersections = sizeof ( IntersectionIDs );
 
 /* Entrance sections are hardwired for Aimsun scenario `zlicin_495_601.sce` */
@@ -43 +45 @@
    values of all measurements for all intersections in the system). */
 const int SignalPlanOffsets[] = {  0, 36 };
-const int IntensityOffsets[]  = {  6, 42 };
-const int OccupancyOffsets[]  = { 21, 60 };
+const int MeasurementOffsets[]  = {  6, 42 };
 
 AimsunDS::AimsunDS() : DS()
@@ -73 +74 @@
         StringCbCopy ( szBasePath, MAX_PATH_BYTES, BASE_PATH );
 
-        /* Create the path to DLL directory.
+        /* Create the path to DLL directory. The path is defined externally
+           in  "CMakeLists.txt".
            The path will be used to inject the appropriate location of
            Getram extensions into the selected Aimsun scenario and also
            to modify PATH variable of executed processes in order to
            provide access to API DLLs. */
-        StringCbCopy ( szDllPath, MAX_PATH_BYTES, szBasePath );
-        StringCbCat ( szDllPath, MAX_PATH_BYTES, TEXT("\\dlls") );
+        StringCbCopy ( szDllPath, MAX_PATH_BYTES, DLL_PATH );
 
         /* Add the DLL directory to the PATH used by this process.
@@ -360 +361 @@
         }
 
-        /* Loop over all measurement sets (currently we will deliver
-        just the last one, but this will surely change. */
+        /* Loop over all controllers in the measurement set. */
         for ( int i = 0; i < p_rsp->count; i++)
         {
-                det_stats * ds_ptr = p_rsp->dets + i;
-                sp_stats *  sp_ptr = p_rsp->sps  + i;
+                det_stats * ds_ptr  = p_rsp->dets + i;
+                sp_stats *  sp_ptr  = p_rsp->sps  + i;
 
                 printf ( "\tRealised signal plans:\n" );
 
-                /* Loop over all intersections and fill in signal plan
-                data. */
+                /* Loop over all measurement sets. We will deliver just
+                   the last one. */
                 for ( int j = 0; j < sp_ptr->count ; j++ )
                 {
                         sp_stattab * dat_ptr = sp_ptr->splans + j;
-                        int          offset  = SignalPlanOffsets[j];
+                        int          pos     = _search_index ( IntersectionIDs, NumIntersections, dat_ptr->its_id );
+                        int          offset  = SignalPlanOffsets[pos];
 
                         printf ( "\t[%3d] t=%6ds ", j, dat_ptr->global_time );
 
+                        /* Copy particular signals. */
                         for ( int k = 0 ; k < dat_ptr->num_siggroups ; k++ )
                         {
@@ -388 +390 @@
                 printf ( "\n\tDetector data:\n" );
 
-                /* Loop over all intersections and fill in the
-                detector measurements. */
+                /* Loop over all mesurement records with intensities and
+                   occupancies. */
                 for ( int j = 0 ; j < ds_ptr->count ; j++ )
                 {
                         det_aggreg_table * dat_ptr = ds_ptr->stats + j;
-                        int                ioffset  = IntensityOffsets[j];
-                        int                ooffset  = OccupancyOffsets[j];
+                        int  pos     = _search_index ( IntersectionIDs, NumIntersections, dat_ptr->its_id );
+                        int  moffset = MeasurementOffsets[pos];
 
                         printf ( "\t[%3d] t=%6ds ", j, dat_ptr->global_time );
@@ -400 +402 @@
                         for ( int k = 0 ; k < dat_ptr->num_det ; k++ )
                         {
-                                dt[k+ioffset] = dat_ptr->dt_intensity[k];
-                                dt[k+ooffset] = dat_ptr->dt_occupancy[k];
+                                dt[2*k+moffset]   = dat_ptr->dt_intensity[k];
+                                dt[2*k+moffset+1] = dat_ptr->dt_occupancy[k];
                                 printf ( "{%2d/%2d} ",
                                         dat_ptr->dt_intensity[k], dat_ptr->dt_occupancy[k] );
@@ -408 +410 @@
                 }
         }
+
         printf ( "\tAimsunDS::getdata() finished\n" );
+        cout << dt ;
 }