Changeset 842

Timestamp:

02/27/10 10:52:01 (15 years ago)

Author:

smidl

Message:

doprava is now working

Files:

• applications/doprava/Zlicin.cfg (modified) (3 diffs)
• applications/doprava/traffic_agent.cpp (modified) (1 diff)
• applications/doprava/traffic_agent.h (modified) (7 diffs)
• library/bdm/base/bdmbase.cpp (modified) (1 diff)

applications/doprava/Zlicin.cfg

@@ -17 +17 @@
   input = ( // remote detectors 
     {
-      name = "601_DVA1";
+      name = "601_DVAa";
                 distance = 100;
       to_sg = ("VC","VD");
@@ -29 +29 @@
   output = ( // 
      {
-      from = ("VC");
-                detector = "495_DVC";
+                detectors = ("495_DVC");
       to = "601";
       }
@@ -55 +54 @@
   offset = 60; //s
         input = ();
-        output = ();
+        output = ({to="495"; detectors=("601_DVAa","601_DVA");});
 }
 );
+logger = {class="memlog"; filename = "zlicin"; maxlen = 1000;};

applications/doprava/traffic_agent.cpp

@@ -32 +32 @@
                 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++){

applications/doprava/traffic_agent.h

@@ -41 +41 @@
         public:
         string to; // agent
-        Array<string> from; //detectors
+        Array<string> detectors; //detectors
         void from_setting(const Setting &set){
-                UI::get(from,set,"from",UI::compulsory);
+                UI::get(detectors,set,"detectors",UI::compulsory);
                 UI::get(to, set, "to", UI::compulsory);
         }
@@ -72 +72 @@
                 //! link from global measured data 
                 datalink ds2data;
-                //! link from data to global out_data
-                datalink data2out;
         public:
                 void connect_sg(SignalGroup &sg0, const string &agent_name){
@@ -98 +96 @@
         public:
                 RV rv;
-                datalink outdata2out;
         public:
                 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), 2)); //TODO intensity occupancy
+                        for (int i=0;i<rq->detectors.length();i++){
+                                rv.add(RV(rq->detectors(i), 2)); //TODO intensity occupancy
                         }
                 }
@@ -130 +127 @@
                 //! description of broadcast dataind
                 RV output_rv;
+                
+                //! datalink from DS to output variables
+                datalink ds2output;
                                         
                 //! output recepient
@@ -193 +193 @@
                                 // 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;
-                                Setting &m_what=msg.add("what",Setting::TypeString);
-                                m_what="data";
-                                //Setting &m_data=msg.add("data",Setting::TypeGroup);
-                                Setting &m_rv=msg.add("rv",Setting::TypeGroup);
-                                R.rv.to_setting(m_rv);
-                                Setting &m_val=msg.add("value",Setting::TypeGroup);
-                                vec val =R.outdata2out.pushdown(output_data);
-                                UI::save(val, m_val);
+                                UI::save ( requests(i).to, msg, "to");
+                                UI::save ( (string)"data", msg, "what");
+                                UI::save ( &R.rv, msg, "rv");
+                                UI::save(output_data, msg, "value");
                         }
                 }
@@ -210 +204 @@
                                 sgh(i).ds2data.filldown(glob_dt, sgh(i).det_data);
                         }
+                        //copy data fro neighbours
+                        ds2output.filldown(glob_dt, output_data);
                         // copy sg_length ... and others...
                 }
@@ -222 +218 @@
                 
                 void ds_register(const DS &ds){
+                        //register ds2output
+                        ds2output.set_connection(output_rv, ds._drv());
+                        output_data.set_size(output_rv._dsize());
                         for (int i=0; i<sgh.length(); i++){
                                 sgh(i).ds2data.set_connection(sgh(i).rv_det_data, ds._drv());

library/bdm/base/bdmbase.cpp

@@ -288 +288 @@
         }
 
-        bdm_assert_debug ( res.length() == dsize, "this rv is not fully present in crv!" );
+        //bdm_assert_debug ( res.length() == dsize, "this rv is not fully present in crv!" );
         return res;