Changeset 1146 for applications/doprava

Timestamp:

07/21/10 00:43:16 (14 years ago)

Author:

ondrak

Message:

bugfix - average speed conversion
bugfix - negot_offset now correctly resets every cycle
now agent don't act in first cycles, before getting correct values from detectors
final version used in thesis (including cfg file)

Location:

applications/doprava

Files:

• Zlicingw.cfg (modified) (2 diffs)
• texty/Zelena_vlna/bp.tps (deleted)
• traffic_agent_offset.h (modified) (13 diffs)

applications/doprava/Zlicingw.cfg

@@ -18 +18 @@
         stage_names = ("495_F1","495_F2","495_F3");
         stage_times = [30,30,20];
-        passive=0;
-        VP=40;                                  //average speed of cars
+        passive=1;
+        VP=45;                                  //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
@@ -47 +47 @@
         stage_names = ("601_F1","601_F2","601_F3");
         stage_times = [30,30,20];
-        passive=1;
-        VP=40;                                  //average speed of cars
+        passive=0;
+        VP=45;                                  //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

applications/doprava/traffic_agent_offset.h

@@ -8 +8 @@
         double rating_change;
         int negot_start;
+        int negot_offset;
         int negot_limit;
 
@@ -88 +89 @@
                                         exp(0)=lanehs(i)->expected_output(green_time)*lanes(i).alpha(j) / green_time;   
 
-                                        start_time = green_starts(group_index(name+"_"+lanes(i).sg)) + lanes(i).output_distances(j)/VP + planned_offset;
+                                        start_time = green_starts(group_index(name+"_"+lanes(i).sg)) + (3.6*lanes(i).output_distances(j))/(VP) + planned_offset;
                                         //first car arrive time
                                         exp(1)=start_time;
@@ -324 +325 @@
 
                 rating_c=count_rating(planned_offset, recieved_exps, rv_recieved_exps);
-                rating_p=count_rating(planned_offset, positive_exps,  rv_recieved_exps);
-                rating_n=count_rating(planned_offset, negative_exps,  rv_recieved_exps);
-
+                rating_p=count_rating(planned_offset, positive_exps, rv_recieved_exps);
+                rating_n=count_rating(planned_offset, negative_exps, rv_recieved_exps);
+                
                 int max_index=max_i_of_three(rating_p,rating_c,rating_n);
                 switch (max_index) {
@@ -464 +465 @@
 
                 planned_offset=last_offset;
+                planned_rating=0;
                 
                 //set state variables to default values
@@ -470 +472 @@
                 send_requests=false;
                 need_exps=true;
-                negot_start=4;
+                negot_offset=negot_start;
+
+                if (actual_time/cycle_length<2) {
+                        need_exps=false;
+                        final_state=true;               
+                }
         }
 
@@ -488 +495 @@
                 // broadcast expected cars
                 if (!requesters.empty()) {
-                        double a;
                         expected_cars();
                         do {
@@ -498 +504 @@
                                 UI::save ( outputs, msg, "value");
                                 requesters.pop_back();
-                                a=outputs (10);
                         } while (!requesters.empty());                  
                 }
@@ -578 +583 @@
                                         
                                         // offset change
-                                        change_request(ind(0))=find_best_exps(negot_start,neighbours(i),rating_change);
+                                        change_request(ind(0))=find_best_exps(negot_offset,neighbours(i),rating_change);
                                         // rating change
                                         change_request(ind(1))=rating_change;
                                 }
 
-                                if (negot_start>=negot_limit) { 
-                                        negot_start/=2;
+                                if (negot_offset>negot_limit) { 
+                                        negot_offset/=2;
                                         send_requests=true;
                                 }
@@ -597 +602 @@
                 else if (what=="offset_change_request") {
                         double final_rating_diff;
+                        
+                        planned_rating=count_rating(planned_offset, recieved_exps, rv_recieved_exps);
 
                         rv_recieved_changes=*rv;
@@ -602 +609 @@
 
                         for (int i=0;i<rv_recieved_changes.length();i++) {
-
                                 ivec ind=RV(rv_recieved_changes.name(i),2).dataind(rv_recieved_changes);
-
                                 final_rating_diff=-planned_rating+count_rating(planned_offset+(int)recieved_changes(ind(0)), recieved_exps, rv_recieved_exps)+recieved_changes(ind(1));
+
                                 if (final_rating_diff>=0) {
                                         planned_offset+=(int)recieved_changes(ind(0));
@@ -612 +618 @@
                                 }
                         }
-
                         new_stable_state=true;
                 }
@@ -648 +653 @@
                 
                 UI::get(last_offset, set, "offset", UI::compulsory);
+                
+                //optional reading parameters from config
                 UI::get(passive, set, "passive", UI::optional);
-                UI::get(car_leaving_time, set, "car_leaving_time", UI::compulsory);
+                UI::get(car_leaving_time, set, "car_leaving_time", UI::optional);
                 UI::get(VP, set, "VP", UI::optional);
                 UI::get(cycle_count, set, "cycle_count", UI::optional);
@@ -697 +704 @@
         void log_register(logger &l, const string &prefix){
                 if ( log_level[logoffset]){
-                        l.add_vector ( log_level, logoffset, RV("1",2), "x"+prefix );   //TODO 
+                        l.add_vector ( log_level, logoffset, RV("a",2), "x"+prefix );
                 }
         }