Changeset 903

Timestamp:

04/13/10 21:13:07 (15 years ago)

Author:

smidl

Message:

UI build for AimsunDS

Location:

applications/doprava

Files:

• Zlicin.cfg (modified) (1 diff)
• aimsun_bdm/aimsun_ds.h (modified) (1 diff)
• aimsun_bdm/aimsun_fake.h (modified) (1 diff)
• main_loop.cpp (modified) (4 diffs)

applications/doprava/Zlicin.cfg

@@ -60 +60 @@
 logger = {class="memlog"; filename = "zlicin"; maxlen = 1000;};
 
-// CSV file with input intensities for simulation
-// original .........: entrances = "zlicin_20071212_495_601.csv";
-// constant entrances: entrances = "zlicin_const01_495_601.csv";
-//                     entrances = "zlicin_const02_495_601.csv";
-entrances = "zlicin_const02_495_601.csv";
+system = {
+        class = "AimsunDS";
+        // CSV file with input intensities for simulation
+        // original .........: entrances = "zlicin_20071212_495_601.csv";
+        // constant entrances: entrances = "zlicin_const01_495_601.csv";
+        //                     entrances = "zlicin_const02_495_601.csv";
+        entrances = "zlicin_const02_495_601.csv";
 
-// Simulation length. Due to design of the Aimsun simulator,
-// simulation in our case starts always at 00:00:00. Default simulation
-// length is 24 hours (24:00:00).
-stop_time = "01:00:00";
+        // Simulation length. Due to design of the Aimsun simulator,
+        // simulation in our case starts always at 00:00:00. Default simulation
+        // length is 24 hours (24:00:00).
+        stop_time = "01:00:00";
+};

applications/doprava/aimsun_bdm/aimsun_ds.h

@@ -63 +63 @@
 
 };
+UIREGISTER(AimsunDS);

applications/doprava/aimsun_bdm/aimsun_fake.h

@@ -31 +31 @@
         int max_length() {return 960;}
 };
+UIREGISTER(AimsunDS);

applications/doprava/main_loop.cpp

@@ -25 +25 @@
 
         // SYSTEM TO CONTROL
-        AimsunDS Ds;
-        UI::get(Ds, Cfg, UI::compulsory ); // Mostly hard-coded so far
-        Ds.validate();
+        shared_ptr<AimsunDS> Ds=UI::build<AimsunDS>(Cfg.lookup("system"),UI::compulsory);
 
         // AGENTS
@@ -42 +40 @@
 
         // REGISTER ACTIVE OBJECTS IN LOGGER
-        Ds.log_register ( *L, "DS" );
+        Ds->log_register ( *L, "DS" );
         for ( int i=0; i<Ags.length(); i++ ) {
                 Ags ( i )->log_register ( *L,Ags(i)->_name() ); // estimate
-                Ags ( i )->ds_register(Ds);            // allows agents to update their datalinks
+                Ags ( i )->ds_register(*Ds);            // allows agents to update their datalinks
         }
         L->init();
 
-        vec glob_dt(Ds._drv()._dsize() );
-        vec glob_ut(Ds._urv()._dsize() );
+        vec glob_dt(Ds->_drv()._dsize() );
+        vec glob_ut(Ds->_urv()._dsize() );
 
         // INITIALISATION OF UT
@@ -63 +61 @@
         glob_ut[11] = 20;
 
-        for ( int tK=0; tK < Ds.max_length(); tK++ ) {
-                Ds.log_write ( ); // write stuff to 
-                Ds.getdata(glob_dt);
+        for ( int tK=0; tK < Ds->max_length(); tK++ ) {
+                Ds->log_write ( ); // write stuff to 
+                Ds->getdata(glob_dt);
                 
                 for ( int i=0; i<Ags.length(); i++ ) {
@@ -95 +93 @@
                 
                 L->step();
-                Ds.write(glob_ut);
-                Ds.step();                                                      // simulator step
+                Ds->write(glob_ut);
+                Ds->step();                                                     // simulator step
                 
                 for ( int i=0; i<Ags.length(); i++ ) {