From 9513c56bfd52852356d177a0c68d957b2219a6ad Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 20 十二月 2023 18:02:27 +0800
Subject: [PATCH] 买入条件调整

---
 code_attribute/code_nature_analyse.py |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/code_attribute/code_nature_analyse.py b/code_attribute/code_nature_analyse.py
index 3a4da8a..1328355 100644
--- a/code_attribute/code_nature_analyse.py
+++ b/code_attribute/code_nature_analyse.py
@@ -219,13 +219,15 @@
     p9 = is_special(record_datas)
     p10 = is_latest_10d_max_volume_at_latest_2d(record_datas)
     p11 = __is_yesterday_open_limit_up(record_datas)
+    # 30澶╁唴鏄惁鏈夋定鍋�
+    p12 = __has_limit_up(record_datas, 30)
 
-    return p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11
+    return p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12
 
 
 # 鏄惁鍏锋湁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, is_special, has_max_volume, open_limit_up = get_k_format(
+    is_too_high, is_new_top, is_lowest, is_near_new_top, is_n, is_v, has_format, volume_info, is_special, has_max_volume, open_limit_up, is_limit_up_in_30days = get_k_format(
         float(limit_up_price), record_datas)
     if not has_format:
         return False, "涓嶆弧瓒矺绾垮舰鎬�"
@@ -365,8 +367,8 @@
             min_price = d["low"]
         if max_price < d["high"]:
             max_price = d["high"]
-    if max_price > float(limit_up_price):
-        return False
+    # if max_price > float(limit_up_price):
+    #     return False
     rate = (float(limit_up_price) - min_price) / min_price
     # print(rate)
     if rate >= 0.28:
@@ -404,6 +406,10 @@
 
 def is_new_top(limit_up_price, datas):
     return __is_new_top(float(limit_up_price), datas)[0]
+
+
+def is_near_top(limit_up_price, datas):
+    return __is_near_new_top(float(limit_up_price), datas)[0]
 
 
 # 鎺ヨ繎鏂伴珮
@@ -533,6 +539,19 @@
     return abs(limit_up_price - data["high"]) < 0.001
 
 
+# 澶氬皯澶╁唴鏄惁鏈夋定鍋�/鏇炬定鍋�
+def __has_limit_up(datas, day_count):
+    datas = copy.deepcopy(datas)
+    datas.sort(key=lambda x: x["bob"])
+    datas = datas[0 - day_count:]
+    if len(datas) >= 1:
+        for i in range(0, len(datas)):
+            item = datas[i]
+            if __is_limit_up(item):
+                return True
+    return False
+
+
 # 棣栨澘娑ㄥ仠婧环鐜�
 def get_limit_up_premium_rate(datas):
     datas = copy.deepcopy(datas)

--
Gitblit v1.8.0