Changeset 820

Timestamp:

02/23/10 10:16:46 (14 years ago)

Author:

smidl

Message:

Dorpava Zlicin

Location:

applications/doprava

Files:

• CMakeLists.txt (modified) (1 diff)
• Zlicin.cfg (modified) (1 diff)
• traffic_agent.cpp (modified) (1 diff)
• traffic_agent.h (modified) (3 diffs)

applications/doprava/CMakeLists.txt

@@ -16 +16 @@
 add_subdirectory (aimsun_bdm)
 link_directories (./aimsun_bdm)
+
+add_library(traffic_agents traffic_agent.cpp traffic_agent.h)
 # executable
-EXEC(main_loop aimsun_bdm)
+EXEC(main_loop traffic_agents aimsun_bdm)
 

applications/doprava/Zlicin.cfg

@@ -1 @@
-agents = {
-{ // agent 1
+agents = (
+        { // agent 1
         class = "BaseTrafficAgent";
-  name = "495";
-  sg = {
-    { name = "VA";
-      detectors = {
-        { name = "DVA1";
-          distance = 10;
-        }, {name = "DVA";
-          distance = 20;
-        };
-      };
-    }, 
-    { name = "VB";
-      detectors = { };
-      input = {};
-      output = {};
-    }
-  };
-  input = { // remote detectors 
+          name = "495";
+          sg = (
+            { name = "VA";
+              detectors = (
+                        { name = "DVA1";  distance = 10;}, 
+              {name = "DVA";  distance = 20; }
+              );
+            }, 
+            { name = "VB";
+              detectors = ();
+              input = {};
+              output = {};
+            });
+  input = ( // remote detectors 
     {
       name = "601DVA1";
                 distance = 100;
-      to = {"VC","VD"};
+      to = ("VC","VD");
     },
     {
       name = "601DVA";
                 distance = 100;
-      to = {"VC","VD"};
+      to = ("VC","VD");
     }
-  };
-  output = { // 
+  );
+  output = ( // 
      {
-      from = "VC";
+      from = ("VC");
                 detector ="495DVC";
       to = "601";
       }
-  };
+  );
 
   offset = 40; //s
 },
-{ // agent 2
+{ //agent 2
         class = "BaseTrafficAgent";
   name = "601";
-  sg = {
+  sg = (
     { name = "VA";
-      detectors = {
-        { name = "DVA1";
-          distance = 10;
-        }, {name = "DVA";
-          distance = 20;
-        };
-      };
+      detectors = (
+                { name = "DVA1"; distance = 10; }, 
+                 {name = "DVA"; distance = 20; }
+      );
     }, 
     { name = "VB";
-      detectors = { };
+      detectors = ();
     }
-  };
+  );
   
   offset = 60; //s
-
+        input = ();
+        output = ();
 }
-};
+);

applications/doprava/traffic_agent.cpp

@@ -10 +10 @@
 }
 
-void ARXAgent::from_setting(const libconfig::Setting& set)
+void BaseTrafficAgent::from_setting(const Setting& set)
 {
     bdm::Participant::from_setting(set);
         
-        
+        UI::get(sg,set,"sg", UI::compulsory);
+        UI::get(requests,set,"output",UI::compulsory);
 }

applications/doprava/traffic_agent.h

@@ -18 +18 @@
                 string name;             //! detector name
                 int distance;                //! distance from stop-line
+                RV rv;
                 //! function loading info from Setting
                 void from_setting(const Setting &set){
                         UI::get(name,set,"name",UI::compulsory);
                         UI::get(distance,set,"distance",UI::compulsory);
+                        
                 }
 };
@@ -184 +186 @@
                                 sgh(i).ds2data.filldown(glob_dt, sgh(i).det_data);
                         }
-                        // copy sg_length ...
+                        // copy sg_length ... and others...
                 }
                 void act(vec &glob_ut){
@@ -202 +204 @@
                 }
                 
-                void from_setting(const Setting &set){};
+                void from_setting(const Setting &set);
 };
 UIREGISTER(BaseTrafficAgent);