Changeset 819

Timestamp:

02/23/10 01:17:00 (15 years ago)

Author:

smidl

Message:

agents for doprava

Files:

• applications/doprava/Zlicin.cfg (modified) (3 diffs)
• applications/doprava/main_loop.cpp (modified) (2 diffs)
• applications/doprava/traffic_agent.cpp (added)
• applications/doprava/traffic_agent.h (added)
• library/bdm/base/participants.h (modified) (1 diff)
• library/bdm/mpdm/arx_agent.h (modified) (1 diff)

applications/doprava/Zlicin.cfg

@@ -1 +1 @@
 agents = {
 { // agent 1
+        class = "BaseTrafficAgent";
   name = "495";
   sg = {
@@ -18 +19 @@
     }
   };
-  input = {
+  input = { // remote detectors 
     {
-      from = "601";
-      name = "DVA1";
+      name = "601DVA1";
+                distance = 100;
       to = {"VC","VD"};
     },
     {
-      from = "601";
-      name = "DVA";
+      name = "601DVA";
+                distance = 100;
       to = {"VC","VD"};
     }
   };
-  output = {
+  output = { // 
      {
-      from = {"DVC","DVD"};
+      from = "VC";
+                detector ="495DVC";
       to = "601";
       }
@@ -40 +42 @@
 },
 { // agent 2
+        class = "BaseTrafficAgent";
   name = "601";
   sg = {

applications/doprava/main_loop.cpp

@@ -2 +2 @@
 /*!
 \file
-\brief Multi-Estimator (developped for PMSM)
-
+\brief Distributed Traffic light Control Scenario 
+\author Vasek Smidl 
 
  */
@@ -9 +9 @@
 #include "base/user_info.h"
 #include "base/loggers.h"
-#include "estim/kalman.h"
-#include "pmsmDS.h"
-#include "filters.h"
 #include "aimsun_bdm/aimsun_ds.h"
-
+#include "traffic_agent.h"
 
 using namespace bdm;
+
 int main ( int argc, char* argv[] ) {
         const char *fname;
         if ( argc>1 ) {fname = argv[1]; }
         else { cout << "Missing configuration file.\n Usage: \n $> estimator config_file.cfg"<<endl; abort(); }
-        UIFile F ( fname );
+        UIFile Cfg ( fname );
 
-        AimsunDS DS;
-        shared_ptr<logger> L = UI::build <logger>( F, "logger" );
+        // SYSTEM TO CONTROL
+        AimsunDS Ds; //hard-coded so far
+
+        // AGENTS
+        Array<shared_ptr<Participant> > Ags;
+        UI::get ( Ags,Cfg, "agents" );
+
+        // LOGGER
+        shared_ptr<logger> L = UI::build <logger>( Cfg, "logger" );
+        if (!L) {L=new stdlog();} // DEFAULT LOGGER <== poor choice, use better ones
+
+        Config MsgStore;
+        MsgStore.setAutoConvert(true);
+        Setting& Queue = MsgStore.getRoot().add("queue", Setting::TypeList);
+
+        // REGISTER ACTIVE OBJECTS IN LOGGER
+        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
+        }
+        L->init();
+
+        vec glob_dt(Ds._drv()._dsize() );
+        vec glob_ut(Ds._urv()._dsize() );
+        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++ ) {
+                        Ags(i) -> adapt(glob_dt);
+                }
+                for ( int i=0; i<Ags.length(); i++ ) {
+                        Ags(i) -> broadcast(Queue);
+                }
+                // parse message queue
+                for ( int m=Queue.getLength()-1; m>=0; m-- ) { // go backwards - last mesages are discarded
+                        for ( int i=0; i<Ags.length(); i++ ) {
+                                Setting& msg=Queue[m];
+                                string m_to=msg["to"];
+                                if (m_to==Ags(i)->_name()) {
+                                        Ags(i)->receive(msg);
+                                        Queue.remove(m);
+                                        break;
+                                        // message delivered;
+                                }
+                        }
+                }
+                if (Queue.getLength()>0){bdm_error("undelivered messages - probably unknown neighbours");}
+                
+                for ( int i=0; i<Ags.length(); i++ ) {
+                        Ags(i) -> act(glob_ut);
+                }
+                
+                L->step();
+                Ds.write(glob_ut);
+                Ds.step();                                                      // simulator step
+                
+                for ( int i=0; i<Ags.length(); i++ ) {
+                        Ags(i) -> step();
+                }
+                
+        }
 
         L->finalize();
 
-        for (int i=0; i<nE; i++){
-                delete Dls(i);
-                delete Dlsc(i);
-        }
         return 0;
 }

library/bdm/base/participants.h

@@ -29 +29 @@
         //! name - ID of the participant 
         string name;
-        //! Pointers to neighbours
-        Array<string > neighbours;
 public:
         //! Empty constructor

library/bdm/mpdm/arx_agent.h

@@ -22 +22 @@
 class ARXAgent : public Participant {
         protected:
+                //! Pointers to neighbours
+                Array<string > neighbours;
                 
                 //! Internal ARX Controller