Changeset 1136 for applications/doprava

Timestamp:

07/14/10 12:38:29 (14 years ago)

Author:

ondrak

Message:

bugfix again...

Location:

applications/doprava

Files:

• Zlicingw.cfg (modified) (5 diffs)
• traffic_agent_offset.h (modified) (2 diffs)

applications/doprava/Zlicingw.cfg

@@ -1 +1 @@
 agents = (
         { // agent 1
-        class = "GreenWaveTrafficAgent";
-        name = "495";
-        lanes = (
+    class = "GreenWaveTrafficAgent";
+    name = "495";
+    lanes = (
                         { sg="VA"; inputs = ("495_DVA1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="495_QA"; beta=1;}, 
                         { sg="VB"; inputs = ("495_DVB1");  outputs= ("601_DVA","601_DVAa"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="495_QB"; beta=1;},
@@ -10 +10 @@
                         { sg="VE"; inputs = ("495_DVE");  outputs= ("601_DVA","601_DVAa"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="495_QE"; beta=1;}, 
                         { sg="VF"; inputs = ("495_DVF1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="495_QF"; beta=1;}
-        );
-        neighbours = ("601");
-        offset = 60; //s
-  green_names = ("495_VA","495_VB","495_VC","495_VD","495_VE","495_VF");
-  green_starts= [72,4,5,35,36,71];
-  green_times = [0.4875,0.3375,0.775,0.4,0.5375,0.1];// fractions of cycle_length
-  stage_names = ("495_F1","495_F2","495_F3");
-  stage_times = [30,30,20];},
-{ //agent 2
-        class = "GreenWaveTrafficAgent";
-        name = "601";
-        lanes = (
+    );
+    neighbours = ("601");
+    offset = 60; //s
+        green_names = ("495_VA","495_VB","495_VC","495_VD","495_VE","495_VF");
+        green_starts= [72,4,5,35,36,71];
+        green_times = [0.4875,0.3375,0.775,0.4,0.5375,0.1];// fractions of cycle_length
+        stage_names = ("495_F1","495_F2","495_F3");
+        stage_times = [30,30,20];
+        passive=0;
+        VP=40;                                  //average speed of cars
+        car_leaving_time=2;     //time cars need to leave queue
+        cycle_count=5;                  //number of complete negotiation cycles before making avarage offset and sending it to Aimsun
+    negot_start=4;                      //starting offset for negotiation
+    negot_limit=1;                      //ending offset for negotitation
+    find_best_start=8;          //starting offset for find_best_offset
+    find_best_limit=2;          //ending offset for find_best_offset
+  },
+  { //agent 2
+    class = "GreenWaveTrafficAgent";
+    name = "601";
+    lanes = (
                         { sg="VA"; inputs = ("601_DVA");  outputs= ("DUMMY_DET","DUMMY_DET"); input_distances=[30]; output_distances=[200,200]; alpha= [0.54, 0.46 ]; queue="601_QA2"; beta=1;}, 
                         { sg="VA"; inputs = ("601_DVAa");  outputs= ("DUMMY_DET","DUMMY_DET"); input_distances=[30]; output_distances=[200,200]; alpha= [0.44,0.56]; queue="601_QA1"; beta=1;},
@@ -29 +38 @@
                         { sg="VD"; inputs = ("601_DVD1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="601_QD"; beta=1;},
                         { sg="SE"; inputs = ("601_DSE1");  outputs= ("DUMMY_DET"); input_distances=[30]; output_distances=[200]; alpha= [1.0 ]; queue="601_QSE"; beta=1;}, 
-                        { sg="VE"; inputs = ("601_DVE1");  outputs= ("495_DVC","495_DVD"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="601_QE"; beta=1;}
-        );  
-        neighbours = ("495");
-        offset = 40;
-        green_names = ("601_VA","601_VB","601_VC","601_VD","601_VE","601_SE");
+                        { sg="VE"; inputs = ("601_DVE1");  outputs= ("495_DVC","495_DVD"); input_distances=[30]; output_distances=[190,190]; alpha= [0.5,0.5 ]; queue="601_QE"; beta=1;}   
+    );  
+    neighbours = ("495");
+    offset = 40;
+    green_names = ("601_VA","601_VB","601_VC","601_VD","601_VE","601_SE");
         green_starts= [54,9,26,25,9,9];
         green_times = [0.325,0.1375,0.65,0.275,0.1375,0.5125];// fractions of cycle_length
@@ -39 +48 @@
         stage_times = [30,30,20];
         passive=1;
-}
+        VP=40;                                  //average speed of cars
+        car_leaving_time=2;     //time cars need to leave queue
+        cycle_count=5;                  //number of complete negotiation cycles before making avarage offset and sending it to Aimsun
+    negot_start=4;                      //starting offset for negotiation
+    negot_limit=1;                      //ending offset for negotitation
+    find_best_start=8;          //starting offset for find_best_offset
+    find_best_limit=2;          //ending offset for find_best_offset
+  }
 );
 
@@ -50 +66 @@
         // constant entrances: entrances = "zlicin_const01_495_601.csv";
         //                     entrances = "zlicin_const02_495_601.csv";
-        entrances = "zlicin_const02_495_601.csv";
+        entrances = "zlicin_20071212_495_601.csv";
 
         // Simulation length. Due to design of the Aimsun simulator,
         // simulation in our case starts always at 00:00:00. Default simulation
         // length is 24 hours (24:00:00).
-        stop_time = "24:00:00";
+        //stop_time = "00:05:00";
         
         // Simulation length in number of cycles (one cycle = 90 s)
         // If present, overwrites stop_time. Ensures corrent termination of simulation
         // Example: 1 hour = 40 cycles, 6 hours = 240 cycles, 24 hours = 960 
-        stop_cycle=5;
+        stop_cycle=960;
         
 };

applications/doprava/traffic_agent_offset.h

@@ -225 +225 @@
                                                                 t_end=min(t_gb_vec(l),t_cars_begin(k));
                                                         }
-                                                        t_act=t_end;
                                                 }
+                                                t_act=t_end;
+
                                                 //raising rating
                                                 if (virtual_queue<0) {
@@ -243 +244 @@
                                                         t_ge_vec.del(l);
                                                 }
-
                                         }
                                         //if no other expectations found