Changeset 927 for applications/doprava/traffic_agent.cpp

Timestamp:

05/06/10 17:42:05 (14 years ago)

Author:

smidl

Message:

traffic agents -- pro BDM > r904

Files:

• applications/doprava/traffic_agent.cpp (modified) (2 diffs)

applications/doprava/traffic_agent.cpp

@@ -1 +1 @@
 #include "traffic_agent.h"
 
-void SignalGroup::from_setting(const libconfig::Setting& set)
+void LaneHandler::connect_data(BaseTrafficAgent& agent0)
 {
-UI::get(name,set, "name", UI::compulsory);
-UI::get(detectors, set, "detectors", UI::optional);
-//
-// TODO make some analysis of the detectors
+        agent = &agent0;
+        agentin2input.set_connection(rv_inputs, agent->rv_inputs);
+        ivec queue_index_tmp = agent->rv_queues.dataind(rv_queue);
+        if (queue_index_tmp.length()==1){
+                queue_index=queue_index_tmp(0);
+        } else {
+                bdm_error("queue " + lane.queue + " not found");
+        }               
+}
 
+double LaneHandler::expected_output(double green_time){
+        agentin2input.filldown(agent->inputs, inputs);
+        queue = agent->queues(queue_index);
+        
+        double exp_output=0.0;
+        /////////
+        
+        
+        ////////
+        return exp_output;
 }
+
 
 void BaseTrafficAgent::from_setting(const Setting& set)
@@ -15 +31 @@
         
         // 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);
+        if (set.exists("lanes")){
+                Setting &Slanes=set["lanes"];
+                lanes.set_length(Slanes.getLength());
+                for(int l=0; l<lanes.length(); l++){
+                        lanes(l).from_setting(Slanes[l]);
+                }
         }
-        
-        // 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);
-        }
-
-        // 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());
+        //UI::get(lanes,set,"lanes", UI::compulsory);
+        UI::get(neighbours, set, "neighbours", UI::optional);
 }