Преглед на файлове

修改“预警时机相对背景车辆减速度达到-4 m/s2后延时”指标名称,删除延迟指标

XGJ_zhaoyuan преди 2 седмици
родител
ревизия
563f309231
променени са 1 файла, в които са добавени 22 реда и са изтрити 22 реда
  1. 22 22
      modules/metric/function.py

+ 22 - 22
modules/metric/function.py

@@ -159,37 +159,37 @@ def earliestWarningDistance_TTC_LST(data) -> dict:
     return {"earliestWarningDistance_TTC_LST": float(ttc[0]) if len(ttc) > 0 else value}
 
 
-def warningDelayTime_LST(data):
-    scenario_name = data.function_config["function"]["scenario"]["name"]
-    correctwarning = scenario_sign_dict[scenario_name]
-    ego_df = data.ego_data
-    HMI_warning_rows = ego_df[(ego_df['ifwarning'] == correctwarning)]['simTime'].tolist()
-    simTime_HMI = HMI_warning_rows[0] if len(HMI_warning_rows) > 0 else None
-    rosbag_warning_rows = ego_df[(ego_df['event_Type'].notna()) & ((ego_df['event_Type'] != np.nan))][
-        'simTime'].tolist()
-    simTime_rosbag = rosbag_warning_rows[0] if len(rosbag_warning_rows) > 0 else None
-    if (simTime_HMI is None) or (simTime_rosbag is None):
-        print("预警出错!")
-        delay_time = 100.0
-    else:
-        delay_time = abs(simTime_HMI - simTime_rosbag)
-    return {"warningDelayTime_LST": delay_time}
-
-
-def warningDelayTimeOf4_LST(data):
+# def warningDelayTime_LST(data):
+#     scenario_name = data.function_config["function"]["scenario"]["name"]
+#     correctwarning = scenario_sign_dict[scenario_name]
+#     ego_df = data.ego_data
+#     HMI_warning_rows = ego_df[(ego_df['ifwarning'] == correctwarning)]['simTime'].tolist()
+#     simTime_HMI = HMI_warning_rows[0] if len(HMI_warning_rows) > 0 else None
+#     rosbag_warning_rows = ego_df[(ego_df['event_Type'].notna()) & ((ego_df['event_Type'] != np.nan))][
+#         'simTime'].tolist()
+#     simTime_rosbag = rosbag_warning_rows[0] if len(rosbag_warning_rows) > 0 else None
+#     if (simTime_HMI is None) or (simTime_rosbag is None):
+#         print("预警出错!")
+#         delay_time = 100.0
+#     else:
+#         delay_time = abs(simTime_HMI - simTime_rosbag)
+#     return {"warningDelayTime_LST": delay_time}
+
+
+def warningDelayTimeofReachDecel_LST(data):
     scenario_name = data.function_config["function"]["scenario"]["name"]
     correctwarning = scenario_sign_dict[scenario_name]
     ego_df = data.ego_data
     ego_speed_simtime = ego_df[ego_df['accel'] <= -4]['simTime'].tolist()  # 单位m/s^2
     warning_simTime = ego_df[ego_df['ifwarning'] == correctwarning]['simTime'].tolist()
     if (len(warning_simTime) == 0) and (len(ego_speed_simtime) == 0):
-        return {"warningDelayTimeOf4_LST": 0}
+        return {"warningDelayTimeofReachDecel_LST": 0}
     elif (len(warning_simTime) == 0) and (len(ego_speed_simtime) > 0):
-        return {"warningDelayTimeOf4_LST": ego_speed_simtime[0]}
+        return {"warningDelayTimeofReachDecel_LST": ego_speed_simtime[0]}
     elif (len(warning_simTime) > 0) and (len(ego_speed_simtime) == 0):
-        return {"warningDelayTimeOf4_LST": None}
+        return {"warningDelayTimeofReachDecel_LST": None}
     else:
-        return {"warningDelayTimeOf4_LST": warning_simTime[0] - ego_speed_simtime[0]}
+        return {"warningDelayTimeofReachDecel_LST": warning_simTime[0] - ego_speed_simtime[0]}
 
 
 def rightWarningSignal_LST(data):