From 2f00a0565dcf8d652b8bb5c4caefbce1c2c92d62 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 23 六月 2025 09:58:15 +0800
Subject: [PATCH] bug修复/策略完善

---
 strategy/strategy_variable_factory.py |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/strategy/strategy_variable_factory.py b/strategy/strategy_variable_factory.py
index 648b294..63013eb 100644
--- a/strategy/strategy_variable_factory.py
+++ b/strategy/strategy_variable_factory.py
@@ -343,6 +343,8 @@
                     continue
                 if re.match(r"椋庨櫓|绔嬫", r[2]):
                     continue
+                if re.match(r"閫�甯�", r[1]):
+                    continue
                 if r[1].find("ST") >= 0:
                     continue
                 if r[1].find("S") >= 0:
@@ -381,12 +383,16 @@
                         if not is_for_buy:
                             if r[3] < 1:
                                 continue
+                            if re.match(r"閫�甯�", r[1]):
+                                continue
                             if r[1].find("ST") >= 0:
                                 continue
                             if r[1].find("S") >= 0:
                                 continue
                         else:
                             if re.match(r"椋庨櫓|绔嬫", r[2]):
+                                continue
+                            if re.match(r"閫�甯�", r[1]):
                                 continue
                             if r[1].find("ST") >= 0:
                                 continue
@@ -603,10 +609,15 @@
             fdata = K60SLineAnalyzer.get_close_price_of_max_volume(kline_data_60s)
             instance.__setattr__(f"鏄ㄦ棩鍒嗘椂鏈�楂橀噺浠�", fdata)
 
-        if KTickLineAnalyzer.is_too_high_and_not_relase_volume(kline_data_1d):
+        if KTickLineAnalyzer.is_too_high_and_not_release_volume(kline_data_1d):
             instance.娑ㄥ緱楂樻湭鏀鹃噺 = True
         else:
             instance.娑ㄥ緱楂樻湭鏀鹃噺 = False
+
+        if KTickLineAnalyzer.is_latest_limit_up_with_no_release_volume(kline_data_1d):
+            instance.娑ㄥ仠杩囨湭鏀鹃噺 = True
+        else:
+            instance.娑ㄥ仠杩囨湭鏀鹃噺 = False
 
         return instance
 
@@ -661,7 +672,7 @@
     results = __DataLoader.load_target_plate_and_codes()
     # for k in results:
     #     print(k, results[k])
-    plates = ["澶╃劧姘�", "鍐涘伐"]
+    plates = ["閿傜數姹�", "鍖栧伐"]
     print("==========鏂伴鏉�=======")
     for p in plates:
         codes = [x for x in results.get(p)]  # if get_zylt(x) < 31e8
@@ -674,7 +685,7 @@
 
     # __load_target_codes_v1()
 
-    __DataLoader = DataLoader("2025-06-04")
+    __DataLoader = DataLoader("2025-06-19")
     # __test_jx_blocks(__DataLoader)
 
     # instance = StockVariables()
@@ -692,7 +703,7 @@
     results = __DataLoader.load_target_plate_and_codes()
     # for k in results:
     #     print(k, results[k])
-    plates = ["閿傜數姹�"]
+    plates = ["閿傜數姹�", "鍖栧伐"]
     print("==========鏂伴鏉�=======")
     for p in plates:
         print(p, results.get(p))

--
Gitblit v1.8.0