修复进口道车流总数聚合逻辑bug
This commit is contained in:
parent
a7d4cc27ef
commit
3b6ca9ccaf
|
|
@ -148,8 +148,8 @@ def gen_avg_cross_delay_pb(cross_delay_data_list, weekdays):
|
||||||
ffs, capacity = road_delay_infos[0].delay_info.ffs, road_delay_infos[0].delay_info.capacity
|
ffs, capacity = road_delay_infos[0].delay_info.ffs, road_delay_infos[0].delay_info.capacity
|
||||||
turn_ratio_0, turn_ratio_1, turn_ratio_2, turn_ratio_3 = 0, 0, 0, 0
|
turn_ratio_0, turn_ratio_1, turn_ratio_2, turn_ratio_3 = 0, 0, 0, 0
|
||||||
for road_delay_info in road_delay_infos:
|
for road_delay_info in road_delay_infos:
|
||||||
inroad_sum_car_num += (road_delay_info.delay_info.turn_ratio_0 + road_delay_info.delay_info.turn_ratio_1)
|
inroad_sum_car_num += road_delay_info.delay_info.car_num
|
||||||
inroad_car_num = road_delay_info.delay_info.turn_ratio_0 + road_delay_info.delay_info.turn_ratio_1
|
inroad_car_num = road_delay_info.delay_info.car_num
|
||||||
inroad_delay_time += road_delay_info.delay_info.delay_time * inroad_car_num
|
inroad_delay_time += road_delay_info.delay_info.delay_time * inroad_car_num
|
||||||
inroad_stop_times += road_delay_info.delay_info.stop_times * inroad_car_num
|
inroad_stop_times += road_delay_info.delay_info.stop_times * inroad_car_num
|
||||||
inroad_queue_len += road_delay_info.delay_info.queue_len * inroad_car_num
|
inroad_queue_len += road_delay_info.delay_info.queue_len * inroad_car_num
|
||||||
|
|
@ -772,9 +772,9 @@ def gen_flow_turn_rate_index(avg_cross_delay_info, roads_dir_dict):
|
||||||
split_turns_set.add(2)
|
split_turns_set.add(2)
|
||||||
else:
|
else:
|
||||||
split_turns_set.add(1)
|
split_turns_set.add(1)
|
||||||
car_num = road_delay_dict[roadid].delay_info.turn_ratio_1 + road_delay_dict[roadid].delay_info.turn_ratio_0 + road_delay_dict[roadid].delay_info.turn_ratio_2
|
car_num = road_delay_dict[roadid].delay_info.car_num
|
||||||
in_flow_rate = int(car_num / cross_sum_car_num * 100) if cross_out_sum_car_num != 0 else 0
|
in_flow_rate = int(car_num / cross_sum_car_num * 100) if cross_sum_car_num != 0 else 0
|
||||||
l_rate = max(1, round(road_delay_dict[roadid].delay_info.turn_ratio_1 / car_num * 100)) if car_num != 0 else 0
|
l_rate = max(1, round((road_delay_dict[roadid].delay_info.turn_ratio_1 + road_delay_dict[roadid].delay_info.turn_ratio_3) / car_num * 100)) if car_num != 0 else 0
|
||||||
s_rate = max(1, round(road_delay_dict[roadid].delay_info.turn_ratio_0 / car_num * 100)) if car_num != 0 else 0
|
s_rate = max(1, round(road_delay_dict[roadid].delay_info.turn_ratio_0 / car_num * 100)) if car_num != 0 else 0
|
||||||
r_rate = max(1, round(road_delay_dict[roadid].delay_info.turn_ratio_2 / car_num * 100)) if car_num != 0 else 0
|
r_rate = max(1, round(road_delay_dict[roadid].delay_info.turn_ratio_2 / car_num * 100)) if car_num != 0 else 0
|
||||||
if 0 not in split_turns_set:
|
if 0 not in split_turns_set:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue