From 0e68e24f54db11d340785b17570fff2bc5fc7ac6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 24 七月 2023 13:05:16 +0800
Subject: [PATCH] bug修复
---
code_attribute/code_nature_analyse.py | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/code_attribute/code_nature_analyse.py b/code_attribute/code_nature_analyse.py
index 7d022fd..b3c6fab 100644
--- a/code_attribute/code_nature_analyse.py
+++ b/code_attribute/code_nature_analyse.py
@@ -54,7 +54,7 @@
# 鑾峰彇K绾垮舰鎬�
-# 杩斿洖 (15涓氦鏄撴棩娑ㄥ箙鏄惁澶т簬24.9%,鏄惁鐮村墠楂橈紝鏄惁瓒呰穼锛屾槸鍚︽帴杩戝墠楂橈紝鏄惁N,鏄惁V)
+# 杩斿洖 (15涓氦鏄撴棩娑ㄥ箙鏄惁澶т簬24.9%,鏄惁鐮村墠楂橈紝鏄惁瓒呰穼锛屾槸鍚︽帴杩戝墠楂橈紝鏄惁N,鏄惁V,鏄惁鏈夊舰鎬�,澶╅噺澶ч槼淇℃伅,鏄惁鍏锋湁杈ㄨ瘑搴�)
def get_k_format(limit_up_price, record_datas):
p1_data = get_lowest_price_rate(record_datas)
p1 = p1_data[0] >= 0.249, p1_data[1]
@@ -71,14 +71,15 @@
p7 = (p1[0] or p2[0] or p3[0] or p4[0] or p5[0] or p6[0], '')
- return p1, p2, p3, p4, p5, p6, p7, p8
+ # 鏄惁鍏锋湁杈ㄨ瘑搴�
+ p9 = is_special(record_datas)
+
+ return p1, p2, p3, p4, p5, p6, p7, p8, p9
# 鏄惁鍏锋湁K绾垮舰鎬�
def is_has_k_format(limit_up_price, record_datas):
- is_too_high, is_new_top, is_lowest, is_near_new_top, is_n, is_v, has_format, volume_info = get_k_format(
- float(limit_up_price),
- record_datas)
+ is_too_high, is_new_top, is_lowest, is_near_new_top, is_n, is_v, has_format, volume_info,is_special = get_k_format(float(limit_up_price),record_datas)
if not has_format:
return False, "涓嶆弧瓒矺绾垮舰鎬�"
return True, "鏈夊舰鎬�"
@@ -114,9 +115,9 @@
for i in range(len(datas)):
item = datas[i]
# 鑾峰彇棣栨澘娑ㄥ仠娆℃暟
- if __is_limit_up(item) and i>0 and not __is_limit_up(datas[i-1]):
+ if __is_limit_up(item) and i > 0 and not __is_limit_up(datas[i - 1]):
# 棣栨澘娑ㄥ仠
- count+=1
+ count += 1
return count
@@ -264,6 +265,12 @@
return abs(limit_up_price - data["close"]) < 0.001
+# 鏄惁娑ㄥ仠杩�
+def __is_limited_up(data):
+ limit_up_price = float(gpcode_manager.get_limit_up_price_by_preprice(data["pre_close"]))
+ return abs(limit_up_price - data["high"]) < 0.001
+
+
# 棣栨澘娑ㄥ仠婧环鐜�
def get_limit_up_premium_rate(datas):
datas = copy.deepcopy(datas)
@@ -311,5 +318,25 @@
return count / len(first_rate_list)
+# 鏄惁鍏锋湁杈ㄨ瘑搴�
+def is_special(datas):
+ # 30涓氦鏄撴棩鍐呮湁鈮�5澶╂浘娑ㄥ仠涓旇繛缁定鍋滄暟鎴栨浘娑ㄥ仠鈮�2澶�
+ if len(datas) > 30:
+ datas = datas[-30:]
+
+ count = 0
+ continue_count = 0
+ last_index = -1
+ for i in range(len(datas)):
+ if __is_limited_up(datas[i]):
+ if last_index >= 0 and i - last_index == 1:
+ continue_count += 1
+ count += 1
+ last_index = i
+ if count >= 5 and continue_count > 0:
+ return True, ''
+ return False, ''
+
+
if __name__ == "__main__":
print(CodeNatureRecordManager.get_k_format("603717"))
--
Gitblit v1.8.0