Changeset 836 for applications/doprava

Timestamp:

02/23/10 15:48:19 (14 years ago)

Author:

smidl

Message:

details

Location:

applications/doprava

Files:

• Zlicin.cfg (modified) (2 diffs)
• main_loop.cpp (modified) (1 diff)
• traffic_agent.h (modified) (2 diffs)

applications/doprava/Zlicin.cfg

@@ -19 +19 @@
       name = "601DVA1";
                 distance = 100;
-      to = ("VC","VD");
+      to_sg = ("VC","VD");
     },
     {
       name = "601DVA";
                 distance = 100;
-      to = ("VC","VD");
+      to_sg = ("VC","VD");
     }
   );
@@ -36 +36 @@
 
   offset = 40; //s
+  moje_special=14;
 },
 { //agent 2

applications/doprava/main_loop.cpp

@@ -57 +57 @@
         glob_ut[11] = 20;
 
-        for ( int tK=0;tK<Ds.max_length();tK++ ) {
+        for ( int tK=0; tK < Ds.max_length(); tK++ ) {
                 Ds.log_write ( ); // write stuff to 
                 Ds.getdata(glob_dt);

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){
@@ -30 +30 @@
 class DetectorIn : public Detector{
         string from; // from agent
-        Array<string> to; // to signal plans
+        Array<string> to_sg; // to signal plans
         void from_setting(const Setting &set){
                 Detector::from_setting(set);
                 UI::get(from,set,"from",UI::compulsory);
-                UI::get(to, set, "to", UI::compulsory);
+                UI::get(to_sg, set, "to_sg", UI::compulsory);
         }
 };