Changeset 840 for applications/doprava

Timestamp:

02/24/10 00:56:13 (14 years ago)

Author:

smidl

Message:

aimsunDS minor correction + improvements in Agents

Location:

applications/doprava

Files:

• CMakeLists.txt (modified) (1 diff)
• Zlicin.cfg (modified) (3 diffs)
• aimsun_bdm/CMakeLists.txt (modified) (1 diff)
• aimsun_bdm/aimsun_ds.h (modified) (1 diff)
• aimsun_bdm/aimsun_fake.cpp (added)
• aimsun_bdm/aimsun_fake.h (added)
• main_loop.cpp (modified) (3 diffs)
• traffic_agent.cpp (modified) (1 diff)
• traffic_agent.h (modified) (10 diffs)

applications/doprava/CMakeLists.txt

@@ -19 +19 @@
 add_library(traffic_agents traffic_agent.cpp traffic_agent.h)
 
+IF(WIN32)
 include_directories ( aimsun_bdm/eh_api aimsun_bdm/els3/include aimsun_bdm/vgs_api )
-# executable
-EXEC(main_loop traffic_agents aimsun_bdm eh_api vgs_api)
+        # executable
+        EXEC(main_loop traffic_agents aimsun_bdm eh_api vgs_api)
+ELSE(WIN32)
+        EXEC(main_loop aimsun_bdm traffic_agents )
+ENDIF(WIN32)
 
+

applications/doprava/Zlicin.cfg

@@ -17 +17 @@
   input = ( // remote detectors 
     {
-      name = "601DVA1";
+      name = "601_DVA1";
                 distance = 100;
       to_sg = ("VC","VD");
     },
     {
-      name = "601DVA";
+      name = "601_DVA";
                 distance = 100;
       to_sg = ("VC","VD");
@@ -30 +30 @@
      {
       from = ("VC");
-                detector ="495DVC";
+                detector = "495_DVC";
       to = "601";
       }
@@ -44 +44 @@
     { name = "VA";
       detectors = (
-                { name = "DVA1"; distance = 10; }, 
-                 {name = "DVA"; distance = 20; }
+                { name = "DVA"; distance = 10; }, 
+                 {name = "DVAa"; distance = 20; }
       );
     }, 

applications/doprava/aimsun_bdm/CMakeLists.txt

@@ -1 +1 @@
 # Simulator library
-add_subdirectory(eh_api)
-add_subdirectory(vgs_api)
+IF(WIN32)
+        add_subdirectory(eh_api)
+        add_subdirectory(vgs_api)
 
-include_directories(./els3/include ./eh_api ./vgs_api)
-add_definitions(-DBASE_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
-add_library (aimsun_bdm aimsun_ds.cpp aimsun_ds.h tools.cpp tools.h)
+        include_directories(./els3/include ./eh_api ./vgs_api)
+        add_definitions(-DBASE_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
+        add_library (aimsun_bdm aimsun_ds.cpp aimsun_ds.h tools.cpp tools.h)
+ELSE(WIN32)
+        add_library (aimsun_bdm aimsun_fake.cpp aimsun_fake.h)
+endif(WIN32)

applications/doprava/aimsun_bdm/aimsun_ds.h

@@ -40 +40 @@
     //! Wait for new data and copy them out to local buffers
     void step();
-
+        
+        //! number of steps
+        int max_length() {return 960;}
+        
     // TODO dodelat void to_setting( Setting &root ) const;
 private:

applications/doprava/main_loop.cpp

@@ -9 +9 @@
 #include "base/user_info.h"
 #include "base/loggers.h"
+#ifdef _WIN32
 #include "aimsun_bdm/aimsun_ds.h"
+#else 
+#include "aimsun_bdm/aimsun_fake.h"
+#endif
 #include "traffic_agent.h"
 
@@ -67 +71 @@
                         Ags(i) -> broadcast(Queue);
                 }
+                //DBG
+                MsgStore.writeFile("xxx");
                 // parse message queue
                 for ( int m=Queue.getLength()-1; m>=0; m-- ) { // go backwards - last mesages are discarded
@@ -91 +97 @@
                 
                 for ( int i=0; i<Ags.length(); i++ ) {
+                        Ags(i) -> log_write();
                         Ags(i) -> step();
                 }

applications/doprava/traffic_agent.cpp

@@ -14 +14 @@
     bdm::Participant::from_setting(set);
         
+        // load from file
         UI::get(sg,set,"sg", UI::compulsory);
         UI::get(requests,set,"output",UI::compulsory);
+        Array<DetectorIn> det_in;
+        UI::get(det_in, set, "input",UI::compulsory);
+        
+        // process sg == create handles
+        sgh.set_length(sg.length());
+        for(int i=0;i<sg.length();i++){
+                sgh(i).connect_sg(sg(i),name);
+        }
+        
+        // process output == handles
+        request_handler.set_length(requests.length());
+        for(int i=0;i<requests.length();i++){
+                request_handler(i).connect_request(requests(i),name);
+                output_rv.add(request_handler(i).rv);
+        }
+        // connect
+        for(int i=0;i<requests.length();i++){
+                request_handler(i).outdata2out.set_connection(request_handler(i).rv, output_rv);
+                // search teh right section == probably inefficient
+/*              int j;
+                for (j=0;j<sg.length();j++){
+                        if (sg(i).name==requests(i).from){
+                                sgh(i).data2out.set_connection(output_rv, sgh(i).det_data);
+                                break;
+                        }
+                }*/
+        }
+        
+        // process DetIn - create input
+        for (int i=0; i<det_in.length(); i++){
+                input_rv.add(RV(det_in(i).name,2));
+        }
+        input_data.set_size(input_rv._dsize());
 }

applications/doprava/traffic_agent.h

@@ -29 +29 @@
 //! detector fo incomming flow
 class DetectorIn : public Detector{
-        string from; // from agent
+        public:
         Array<string> to_sg; // to signal plans
         void from_setting(const Setting &set){
                 Detector::from_setting(set);
-                UI::get(from,set,"from",UI::compulsory);
                 UI::get(to_sg, set, "to_sg", UI::compulsory);
         }
@@ -76 +75 @@
                 datalink data2out;
         public:
-                SignalGroupHandler(SignalGroup *sg0, const string &agent_name):rv_det_data(){
-                        sg=sg0;
+                void connect_sg(SignalGroup &sg0, const string &agent_name){
+                        sg=&sg0;
                         for (int i=0;i<sg->detectors.length();i++){
-                                rv_det_data.add(RV(agent_name + sg->detectors(i).name, 1)); //TODO intensity occupancy
+                                rv_det_data.add(RV(agent_name +"_"+ sg->detectors(i).name, 2)); //TODO intensity occupancy
                         }
                         
@@ -101 +100 @@
                 datalink outdata2out;
         public:
-                RequestHandler(RequestOut *rq0, const string &agent_name){
-                        rq=rq0;
+                void connect_request(RequestOut &rq0, const string &agent_name){
+                        rq=&rq0;
                         for (int i=0;i<rq->from.length();i++){
-                                rv.add(RV(agent_name + rq->from(i), 1)); //TODO intensity occupancy
+                                rv.add(RV(agent_name +"_"+ rq->from(i), 2)); //TODO intensity occupancy
                         }
                 }
@@ -131 +130 @@
                 //! description of broadcast dataind
                 RV output_rv;
-                        
-                RV action_rv;
-                
-                datalink_part action2ds;
-                
+                                        
                 //! output recepient
                 Array<RequestOut> requests;
                 Array<RequestHandler> request_handler;
                 
+                //! action description
+                RV action_rv;
+                
+                datalink_part action2ds;
+                
         public:
                 void validate(){
                         // write internal checks if all was loaded OK
+                        
+                        // set action variable == this is a feature of the agent!
+                        action_rv = RV(name+"_Tc", 1); // <======= example
                 }
                 void receive(const Setting &msg){
@@ -150 +153 @@
                         if (what=="data"){ // 
                                 // field data 
-                                //! decription of detected data
+                                // extract decription of teh received datavector
                                 shared_ptr<RV> rv=UI::build<RV>(msg,"rv",UI::compulsory);
+                                // find if it is needed
                                 ivec ind=rv->dataind(input_rv); // position of rv in in_rv;
-                                if (ind.length()>0){ //data belong here
+                                if (ind.length()>0){ //data are interesting
                                         vec dt;
-                                        UI::get(dt, msg, "value",UI::compulsory);
+                                        UI::get(dt, msg, "value",UI::compulsory); // get data
                                         set_subvector(input_data, ind,  dt); //check size?
                                 }                               
@@ -162 +166 @@
                         }
                 }
+                void log_register(logger &L, const string &prefix){
+                        root::log_register ( L, prefix );
+                        logrec->ids.set_size(sg.length()+2);
+                        int i;
+                        for (i=0;i <sg.length(); i++) {
+                                logrec->ids(i)=logrec->L.add_vector(sgh(i).rv_det_data, "");
+                        }
+                        logrec->ids(i)=logrec->L.add_vector(input_rv,"in_"); i++;
+                        logrec->ids(i)=logrec->L.add_vector(output_rv,"out_");
+                }
+                void log_write() const {
+                        int i;
+                        for (i=0;i <sg.length(); i++) {
+                                logrec->L.log_vector(logrec->ids(i), sgh(i).det_data);
+                        }
+                        logrec->L.log_vector(logrec->ids(i),input_data); i++;
+                        logrec->L.log_vector(logrec->ids(i),output_data); i++;
+                }
+                
                 void broadcast(Setting& set){
                         // broadcast data to all neighbours
@@ -169 +192 @@
                                 
                                 // copy from create message
+                                // create msg with fields {to=..., what=data, rv=..., value = ...}
                                 Setting &m_to=msg.add("to",Setting::TypeString);
                                 m_to=requests(i).to;
@@ -181 +205 @@
                         }
                 }
-                void adapt(const vec &glob_dt){                 
+                void adapt(const vec &glob_dt){
                         // copy data from global vector to sSGHandlers
                         for (int i=0; i<sgh.length();i++){
@@ -193 +217 @@
                                 needs(i) = sgh(i).expected_load();
                         }
-                        vec action = needs/sum(needs); // trivial stuff
+                        vec action; // trivial stuff
                         action2ds.filldown(action,glob_ut);
                 }
@@ -199 +223 @@
                 void ds_register(const DS &ds){
                         for (int i=0; i<sgh.length(); i++){
-                                sgh(i).ds2data.set_connection(ds._drv(), sgh(i).rv_det_data);
-                        }
-                        action2ds.set_connection(action_rv, ds._urv());
+                                sgh(i).ds2data.set_connection(sgh(i).rv_det_data, ds._drv());
+                        }
+                        action2ds.set_connection( ds._urv(), action_rv);
                 }