Changeset 1111 for applications/doprava

Timestamp:

06/20/10 23:58:00 (14 years ago)

Author:

ondrak

Message:

One agent made passive - doesn't send offset_change_request

Location:

applications/doprava

Files:

• Zlicingw.cfg (modified) (2 diffs)
• traffic_agent.h (modified) (1 diff)
• traffic_agent_offset.h (modified) (8 diffs)

applications/doprava/Zlicingw.cfg

@@ -38 +38 @@
         stage_names = ("601_F1","601_F2","601_F3");
         stage_times = [30,30,20];
+        passive=1;
 }
 );
@@ -59 +60 @@
         // 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=5;
         
 };

applications/doprava/traffic_agent.h

@@ -190 +190 @@
                         for (int r=0; r<rv_outputs.length(); r++){
                                 int str_pos = rv_outputs.name(r).compare(neighbours(i));
-                                if (str_pos>neighbours(i).length()){
+                                if (str_pos>(int)neighbours(i).length()){
                                         rv_neighbours_out(i).add(rv_outputs.subselect(vec_1(r)));
                                 }

applications/doprava/traffic_agent_offset.h

@@ -4 +4 @@
 
 class GreenWaveTrafficAgent : public BaseTrafficAgent {
+LOG_LEVEL(GreenWaveTrafficAgent,logoffset);
 protected:
         double rating_change;
         int negot_offset;
+        int negot_limit;
 
         int actual_time;
@@ -39 +41 @@
         bool final_state;
         //bool reset_negot_offset;
+
+        int passive;
 
         //! sum of final planned_offset values since last reach of cycle_count
@@ -501 +505 @@
                 send_requests=false;
                 need_exps=true;
-                negot_offset=8;
+                negot_offset=4;
         }
 
@@ -622 +626 @@
                         planned_rating=count_rating(planned_offset);
 
-                        for (int i=0;i<neighbours.length();i++) {
-                                rv_change_request.add(RV(neighbours(i)+"_change",2));
-                                change_request.set_size(rv_change_request._dsize()); 
-                                ivec ind=RV(neighbours(i)+"_change",2).dataind(rv_change_request);
-                                // offset change
-                                change_request(ind(0))=find_best_exps(negot_offset,neighbours(i),rating_change);
-                                // rating change
-                                change_request(ind(1))=rating_change;
-                        }
-
-                        if (negot_offset>2) { 
-                                negot_offset/=2;
+                        if (!passive) {
+
+                                for (int i=0;i<neighbours.length();i++) {
+                                        rv_change_request.add(RV(neighbours(i)+"_change",2));
+                                        change_request.set_size(rv_change_request._dsize()); 
+                                        ivec ind=RV(neighbours(i)+"_change",2).dataind(rv_change_request);
+                                        // offset change
+                                        change_request(ind(0))=find_best_exps(negot_offset,neighbours(i),rating_change);
+                                        // rating change
+                                        change_request(ind(1))=rating_change;
+                                }
+
+                                if (negot_offset>negot_limit) { 
+                                        negot_offset/=2;
                                         send_requests=true;
+                                }
+                                else {
+                                        final_state=true;
+
+                                }
                         }
                         else {
@@ -687 +698 @@
                 total_offset=0;
 
-                negot_offset=8;
+                negot_offset=4;
+                negot_limit=1;
+
+                passive=0;
                 
                 // load from file
@@ -694 +708 @@
                 //UI::get(green_starts, set, "green_starts", UI::compulsory);
                 UI::get(last_offset, set, "offset", UI::compulsory);
+                UI::get(passive, set, "passive", UI::optional);
 
                 for (int i=0;i<lanes.length();i++) {
@@ -704 +719 @@
                 }
                 outputs.set_size(rv_outputs._dsize());  
+
+                log_level[logoffset]=true;
         }
 
@@ -731 +748 @@
         }
 
+        //void log_register(logger &l, const string &prefix){
+        //      if ( log_level[logoffset]){
+        //              l.add_vector ( log_level, logoffset, RV("mujoffset",1), prefix );       
+        //      }
+        //}
+        //void log_write() const {
+        //      if (log_level[logoffset]){
+        //              log_level.store(logoffset, (double)planned_offset);
+        //              //log_level.store(logoffset, planned_rating);
+        //      }
+        //}
+
+
 
 };