Changeset 986 for applications/doprava/traffic_agent.cpp

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.cpp (modified) (3 diffs)

applications/doprava/traffic_agent.cpp

@@ -15 +15 @@
 double LaneHandler::expected_output(double green_time){
         double last_inputs=0.0;
+        
+
 
         agentin2input.filldown(agent->inputs, inputs);
@@ -22 +24 @@
         
         /////////
-        //Velmi jednoduchy odhad
+        
         agentin2input.filldown(agent->inputs,inputs);
 
-                for (int i=0;i<inputs.length();i+=2) {
+        for (int i=0;i<inputs.length();i+=2) {
                 last_inputs+=inputs(i);
         }
@@ -35 +37 @@
 }
 
+double LaneHandler::expected_density() {
+        double density=0.0;
+
+        agentin2input.filldown(agent->inputs,inputs);
+        
+        for (int i=0;i<inputs.length();i+=2) {
+                density+=inputs(i)/agent->step_time;
+        }
+
+        return density;
+}
 
 void BaseTrafficAgent::from_setting(const Setting& set)
 {
-    bdm::Participant::from_setting(set);
+        step_time=90;
+        cycle_time=80;
+
+        bdm::Participant::from_setting(set);
         
         // load from file