diff --git a/rokae/brake/brake.py b/rokae/brake/brake.py index 9c8aa0d..911b860 100644 --- a/rokae/brake/brake.py +++ b/rokae/brake/brake.py @@ -155,7 +155,7 @@ def data_process(result_file, raw_data_dirs, AV, RR, RC, AXIS): # 参数:结果文件,数据目录,以及预读取的参数 # 返回值:- prefix = result_file.split('\\')[-1].split('_')[0] - wb_result = openpyxl.load_workbook(result_file) # 打开和关闭结果文件夹十分耗时间 + wb_result = openpyxl.load_workbook(result_file) for raw_data_dir in raw_data_dirs: if raw_data_dir.split('\\')[-1].split('_')[0] == prefix: now_doing_msg(raw_data_dir, 'start') @@ -261,7 +261,7 @@ def initialization(): # 功能:初始化,记录开始时间,读取预定义参数 # 参数:- # 返回值:结果文件,数据文件夹,以及预定义参数 - time_start = time.time() # 记录开始时间 + time_start = time.time() try: # read init configurations from config file wb_conf = openpyxl.load_workbook('./configs.xlsx', read_only=True) @@ -304,15 +304,15 @@ def execution(args): # threads.append(Thread(target=data_process, args=(result_file, raw_data_dirs, AV, RR, RC, AXIS))) # [t.start() for t in threads] # [t.join() for t in threads] - print("#---------------------------------------------------------") + print("----------------------------------------------------------") print("全部处理完毕") delete_excel_files(raw_data_dirs) except Exception as Err: print("程序运行错误,请检查配置文件是否准确设定,以及数据文件组织是否正确!") - delete_excel_files(raw_data_dirs) # 运行结束之后,删除中间临时文件 + delete_excel_files(raw_data_dirs) - time_end = time.time() # 记录结束时间 - time_total = time_end - time_start # 计算的时间差为程序的执行时间,单位为秒/s + time_end = time.time() + time_total = time_end - time_start msg = f"数据处理时间:{time_total//3600:02} h {time_total % 3600/60:05.2f} min" warn_pause_exit(msg, 1, 0)