From 3b6ca9ccaf0432853c2965a888ee675ad275d56e Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Wed, 1 Apr 2026 10:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=8F=A3=E9=81=93?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E6=80=BB=E6=95=B0=E8=81=9A=E5=90=88=E9=80=BB?= =?UTF-8?q?=E8=BE=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/eva_common.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/eva_common.py b/app/eva_common.py index 4247f4e..05d01a6 100644 --- a/app/eva_common.py +++ b/app/eva_common.py @@ -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 turn_ratio_0, turn_ratio_1, turn_ratio_2, turn_ratio_3 = 0, 0, 0, 0 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_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.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_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) else: 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 - in_flow_rate = int(car_num / cross_sum_car_num * 100) if cross_out_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 + car_num = road_delay_dict[roadid].delay_info.car_num + 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 + 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 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: