Changeset 986 for applications/doprava/traffic_agent.h

Timestamp:

05/25/10 23:53:49 (14 years ago)

Author:

ondrak

Message:

added queues 601_Q1 and 601_Q2 to aimsun_ds.cpp
added function to count expected_density to LaneHandler?
added compulsory input_distances and output_distances to cfg
action_rv renamed to rv_action (to match convention)
some work on GreenWaveTrafficAgent?

Files:

• applications/doprava/traffic_agent.h (modified) (7 diffs)

applications/doprava/traffic_agent.h

@@ -20 +20 @@
                 Array<string> inputs;
                 Array<string> outputs;
+                vec input_distances;
+                vec output_distances;
                 vec alpha; //size of outputs
                 string queue;
@@ -28 +30 @@
                         UI::get(inputs,set,"inputs",UI::compulsory);
                         UI::get(outputs,set,"outputs",UI::compulsory);
+                        UI::get(input_distances,set,"input_distances",UI::compulsory);
+                        UI::get(output_distances,set,"output_distances",UI::compulsory);
                         UI::get(alpha,set,"alpha",UI::compulsory);
                         UI::get(queue,set,"queue",UI::compulsory);
@@ -61 +65 @@
                 //!
                 int queue_index;
+
         public:
                 LaneHandler(const Lane &lane0): lane(lane0){
@@ -70 +75 @@
                         }
                         rv_queue.add(RV(lane.queue, 1)); 
-                }
+                        inputs.set_size(rv_inputs._dsize());
+                }
+                
                 
                 void connect_data(BaseTrafficAgent &agent0);
-                
+
+                //! computes expected density in cars/s
+                double expected_density();
+
                 //! arbitrary function that computes the need of the signal group for green light in common units (number of waiting cars?)
                 double expected_output(double green_time);
@@ -114 +124 @@
 
                 //! action description
-                RV action_rv;
+                RV rv_action;
                                 
                 datalink_part action2ds;
@@ -132 +142 @@
         public:
                 void validate(){
-                        //TODO Tohle asi ne
-                        step_time=90;
-                        cycle_time=80;
                         
                         lanehs.set_length(lanes.length());
@@ -236 +243 @@
                         
                         inputs.set_size(rv_inputs._dsize());
-                        action2ds.set_connection( ds._urv(), action_rv);
+                        action2ds.set_connection( ds._urv(), rv_action);
 
                 }