From 40dc7735171fb0854cf0e03c9ea93c1234318a94 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 15 一月 2024 18:10:39 +0800
Subject: [PATCH] 参考量距离计算
---
utils/init_data_util.py | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/utils/init_data_util.py b/utils/init_data_util.py
index 3cd570e..a353a2f 100644
--- a/utils/init_data_util.py
+++ b/utils/init_data_util.py
@@ -29,10 +29,11 @@
return datas
-# 瑙ｆ瀽鏈�澶ч噺
+# 杩斿洖锛�(60澶╂渶澶ч噺,鏄ㄦ棩閲�,閲忓弬鑰冩棩鏈�,鍙傝�冮噺鎹粖浜ゆ槗鏃ユ暟)
def parse_max_volume(datas, is_new_or_near_top=False):
max_volume = 0
max_volume_date = None
+ max_volume_index = None
# 鍒ゆ柇30澶╁唴鏄惁鏈夋定鍋�
if is_new_or_near_top:
# 30澶╁唴鏄惁鏈夋定鍋�
@@ -50,18 +51,20 @@
if latest_limit_up_index > 0 and datas[latest_limit_up_index - 1]["volume"] > datas[latest_limit_up_index][
"volume"]:
return datas[latest_limit_up_index - 1]["volume"], datas[latest_limit_up_index - 1]["volume"], \
- datas[latest_limit_up_index - 1]['bob'].strftime("%Y-%m-%d")
+ datas[latest_limit_up_index - 1]['bob'].strftime("%Y-%m-%d"), latest_limit_up_index - 1
else:
return datas[latest_limit_up_index]["volume"], datas[latest_limit_up_index]["volume"], \
- datas[latest_limit_up_index]['bob'].strftime("%Y-%m-%d")
+ datas[latest_limit_up_index]['bob'].strftime("%Y-%m-%d"), latest_limit_up_index
if is_new_or_near_top:
# 濡傛灉鏄獊鐮村墠楂樺氨鍙栨渶澶ч噺
- for item in datas:
+ for i in range(len(datas)):
+ item = datas[i]
if max_volume < item["volume"]:
max_volume = item["volume"]
max_volume_date = item["bob"]
- return max_volume, max_volume, max_volume_date.strftime("%Y-%m-%d")
+ max_volume_index = i
+ return max_volume, max_volume, max_volume_date.strftime("%Y-%m-%d"), max_volume_index
else:
date = None
target_volume = None
@@ -84,7 +87,7 @@
if volume < next_volume:
volume = next_volume
date = datas[i - 1]["bob"]
- target_volume = (volume, date)
+ target_volume = (volume, date, i)
break
# 90涓氦鏄撴棩鏃犳定鍋滐紝鍙栨渶杩�30澶╁唴鐨勬渶楂橀噺浣滀负鍙傝�冮噺
@@ -97,6 +100,6 @@
item = datas[i]
volume = item["volume"]
if max_30_volume_info[0] < volume:
- max_30_volume_info = [volume, item["bob"]]
+ max_30_volume_info = [volume, item["bob"], i]
target_volume = max_30_volume_info
- return target_volume[0], target_volume[0], target_volume[1].strftime("%Y-%m-%d")
+ return target_volume[0], target_volume[0], target_volume[1].strftime("%Y-%m-%d"), target_volume[2]
--
Gitblit v1.8.0