Changeset 1120 for applications/doprava/traffic_agent_offset.h

Timestamp:

06/29/10 14:58:04 (14 years ago)

Author:

ondrak

Message:

bugfix in count_rating

v textech rozpracován popis výpočtu hodnocení

Files:

• applications/doprava/traffic_agent_offset.h (modified) (6 diffs)

applications/doprava/traffic_agent_offset.h

@@ -158 +158 @@
                                 do {
                                         k=min_i(t_cars_begin);
-
                                         if (k!=-1) {                                            
-                                                double a=cars_count(k);
-                                                double b=t_cars_begin(k);
-                                                double c=t_cars_end(k);
-
                                                 //in case there are cars comming before t_green begin
                                                 if (t_cars_begin(k)<t_act) {
@@ -175 +170 @@
                                                         }
                                                         else {
-                                                                double pomer=(t_cars_begin(k)-t_act)/(t_cars_end(k)-t_cars_begin(k));
-                                                                virtual_queue+=cars_count(k)*pomer;
+                                                                double frac=(t_cars_begin(k)-t_act)/(t_cars_end(k)-t_cars_begin(k));
+                                                                virtual_queue+=cars_count(k)*frac;
                                                                 t_cars_begin(k)=t_act;
                                                         }
@@ -184 +179 @@
                                                                 virtual_queue+=cars_count(k)-(t_cars_end(k)-t_act)/car_leaving;
                                                                 t_act=t_cars_end(k);
-
-                                                                cars_count.del(k);
-                                                                t_cars_begin.del(k);
-                                                                t_cars_end.del(k);
                                                         }
                                                         //if t_cars_end>=t_green_end
@@ -193 +184 @@
                                                                 virtual_queue+=cars_count(k)-(t_green_end-t_act)/car_leaving;
                                                                 t_act=t_green_end;
-
-                                                                cars_count.del(k);
-                                                                t_cars_begin.del(k);
-                                                                t_cars_end.del(k);                                                      
                                                         }
+                                                        //more cars than cars_count(k) couldn't pass without stopping
+                                                        if (virtual_queue < -cars_count(k)) {
+                                                                virtual_queue = -cars_count(k);
+                                                        }
+                                                        cars_count.del(k);
+                                                        t_cars_begin.del(k);
+                                                        t_cars_end.del(k);
                                                 }
                                                 //if t_cars_begin(k)>=t_act
                                                 else {
-                                                        if (t_cars_end(k)<t_green_end) {
-                                                                virtual_queue-=(t_cars_end(k)-t_act)/car_leaving;
-                                                                t_act=t_cars_end(k);
+                                                        if (t_cars_begin(k)<t_green_end) {
+                                                                virtual_queue-=(t_cars_begin(k)-t_act)/car_leaving;
+                                                                t_act=t_cars_begin(k);
                                                         }
                                                         else {
                                                                 virtual_queue-=(t_green_end-t_act)/car_leaving;
                                                                 t_act=t_green_end;
+                                                        }
+                                                        // in case we managed to empty whole queue
+                                                        if (virtual_queue<0) {
+                                                                virtual_queue=0;
                                                         }
                                                 }
@@ -220 +218 @@
                                                 virtual_queue=0;
                                         }
-
                                 } while (t_act<t_green_end);
                         }
@@ -762 +759 @@
                 }
         }
-
-
-
 };
 UIREGISTER(GreenWaveTrafficAgent);