From a6692893d04a54c14e1b96dc3352cc9fac4cc096 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 18 八月 2023 17:02:21 +0800
Subject: [PATCH] 删除策略中的废代码
---
l2/l2_data_manager_new.py | 117 ++++++++++++++++++++++------------------------------------
1 files changed, 45 insertions(+), 72 deletions(-)
diff --git a/l2/l2_data_manager_new.py b/l2/l2_data_manager_new.py
index 5fcf09f..775effb 100644
--- a/l2/l2_data_manager_new.py
+++ b/l2/l2_data_manager_new.py
@@ -580,7 +580,8 @@
if code in cls.unreal_buy_dict:
cls.unreal_buy_dict.pop(code)
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(code)
+ buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
+ code)
if not can:
l2_log.debug(code, "涓嶅彲浠ヤ笅鍗曪紝鍘熷洜锛歿}", reason)
if need_clear_data:
@@ -807,7 +808,9 @@
for i in range(trade_index + 1, total_data[-1]["index"] + 1):
if L2DataUtil.is_limit_up_price_buy(total_data[i]["val"]):
left_count = l2_data_source_util.L2DataSourceUtils.get_limit_up_buy_no_canceled_count(code,
- total_data[i]["index"],
+ total_data[
+ i][
+ "index"],
total_data,
num_operate_map)
if left_count > 0:
@@ -837,29 +840,29 @@
float(open_limit_up_lowest_price) - price_pre_close) / price_pre_close < 0.05:
return False, True, f"鐐告澘鍚庢渶浣庝环璺岃嚦5%浠ヤ笅"
- limit_up_info = cls.__Buy1PriceManager.get_limit_up_info(code)
- if limit_up_info[0] is None and False:
- total_data = local_today_datas.get(code)
- buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
- code)
- # 涔嬪墠娌℃湁娑ㄥ仠杩�
- # 缁熻涔板叆淇″彿浣嶅埌褰撳墠浣嶇疆娌℃湁鎾ょ殑澶у崟閲戦
- min_money_w = l2_data_util.get_big_money_val(float(total_data[buy_single_index]["val"]["price"])) // 10000
- left_big_num = cls.__SecondCancelBigNumComputer.compute_left_big_num(code,
- buy_single_index,
- buy_exec_index,
- total_data[-1][
- "index"],
- total_data,
- 0, min_money_w)
- if left_big_num > 0:
- # 閲嶆柊鑾峰彇鍒嗘暟涓庡垎鏁扮储寮�
- limit_up_time = cls.__LimitUpTimeManager.get_limit_up_time_cache(code)
- if limit_up_time is None:
- limit_up_time = tool.get_now_time_str()
- score = first_code_score_manager.get_score(code, cls.volume_rate_info[code][0], limit_up_time, True,
- left_big_num)
- cls.__l2PlaceOrderParamsManagerDict[code].set_score(score)
+ # limit_up_info = cls.__Buy1PriceManager.get_limit_up_info(code)
+ # if limit_up_info[0] is None and False:
+ # total_data = local_today_datas.get(code)
+ # buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
+ # code)
+ # # 涔嬪墠娌℃湁娑ㄥ仠杩�
+ # # 缁熻涔板叆淇″彿浣嶅埌褰撳墠浣嶇疆娌℃湁鎾ょ殑澶у崟閲戦
+ # min_money_w = l2_data_util.get_big_money_val(float(total_data[buy_single_index]["val"]["price"])) // 10000
+ # left_big_num = cls.__SecondCancelBigNumComputer.compute_left_big_num(code,
+ # buy_single_index,
+ # buy_exec_index,
+ # total_data[-1][
+ # "index"],
+ # total_data,
+ # 0, min_money_w)
+ # if left_big_num > 0:
+ # # 閲嶆柊鑾峰彇鍒嗘暟涓庡垎鏁扮储寮�
+ # limit_up_time = cls.__LimitUpTimeManager.get_limit_up_time_cache(code)
+ # if limit_up_time is None:
+ # limit_up_time = tool.get_now_time_str()
+ # score = first_code_score_manager.get_score(code, cls.volume_rate_info[code][0], limit_up_time, True,
+ # left_big_num)
+ # cls.__l2PlaceOrderParamsManagerDict[code].set_score(score)
# logger_place_order_score.info("code={},data='score_index':{},'score_info':{}", code,
# cls.__l2PlaceOrderParamsManagerDict[code].score_index,
@@ -883,58 +886,28 @@
# f.write(output.getvalue())
# return results
return cls.can_buy_first(code, limit_up_price)
-
else:
return True, False, "鍦ㄦ兂涔板悕鍗曚腑"
@classmethod
def can_buy_first(cls, code, limit_up_price):
- l2_log.debug(code,"can_buy_first start")
- # def is_has_k_format(score_info):
- # # (15涓氦鏄撴棩娑ㄥ箙鏄惁澶т簬24.9%,鏄惁鐮村墠楂橈紝鏄惁瓒呰穼锛屾槸鍚︽帴杩戝墠楂橈紝鏄惁N,鏄惁V,鏄惁鏈夊舰鎬�,澶╅噺澶ч槼淇℃伅,鏄惁鍏锋湁杈ㄨ瘑搴�)
- #
- # if score_info[1][3][6][0] and not score_info[1][3][3][0]:
- # return True
- # if score_info[1][3][7][0]:
- # return True
- # return False
-
- if float(limit_up_price) >= constant.MAX_CODE_PRICE:
- return False, True, f"鑲′环澶т簬{constant.MAX_CODE_PRICE}鍧�"
-
- # 9:35涔嬪墠涔板ぇ甯傚��(>=80浜�)绁�
- # if int(tool.get_now_date_str("%Y%m%d")) < int("093500"):
- # zyltgb = global_util.zyltgb_map.get(code)
- # if zyltgb is None:
- # global_data_loader.load_zyltgb()
- # zyltgb = global_util.zyltgb_map.get(code)
- # if zyltgb >= 80 * 100000000:
- # return True, False, "{9:30:00-9:35:00}鑷敱甯傚�尖墺80浜�"
# 鍒ゆ柇鏉垮潡
- yesterday_codes = kpl_data_manager.get_yesterday_limit_up_codes()
- l2_log.debug(code, "block_can_buy")
- plate_can_buy, msg = CodePlateKeyBuyManager.can_buy(code,
- kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
- kpl_data_manager.KPLLimitUpDataRecordManager.total_datas,
- yesterday_codes,
- block_info.get_before_blocks_dict())
- l2_log.debug(code, "can_buy_first end")
- if not plate_can_buy:
- return False, True, msg
- return True, False, msg
+ can_buy_result = CodePlateKeyBuyManager.can_buy(code)
+ if can_buy_result is None:
+ logger_debug.warning("娌℃湁鑾峰彇鍒版澘鍧楃紦瀛橈紝灏嗚幏鍙栨澘鍧�")
+ yesterday_codes = kpl_data_manager.get_yesterday_limit_up_codes()
+ CodePlateKeyBuyManager.update_can_buy_blocks(code,
+ kpl_data_manager.KPLLimitUpDataRecordManager.latest_origin_datas,
+ kpl_data_manager.KPLLimitUpDataRecordManager.total_datas,
+ yesterday_codes,
+ block_info.get_before_blocks_dict())
+ can_buy_result = CodePlateKeyBuyManager.can_buy(code)
- # if volume_rate_info[0] < 0.4:
- # return False, True, f"閲忓ぇ浜�40%鎵嶄笅鍗�,閲忔瘮锛歿volume_rate_info[0]}"
-
- # 鏄惁鏈塊绾垮舰鎬�(鏈塊绾垮舰鎬佹垨鑰呭ぉ閲忓ぇ闃�),10鐐瑰悗鎵嶉渶瑕佸垽鏂槸鍚︽湁K绾垮舰鎬佷笌鍒嗗��
- # if int(tool.get_now_time_str().replace(":", "")) > int("100000"):
- # has_k_format = score_info[1][3][6][0] or score_info[1][3][7][0]
- # if not has_k_format:
- # return False, True, f"鏃燢绾垮舰鎬�"
- #
- # if score_index < 0:
- # return False, True, f"鍒嗗�硷細{score}鏈揪鍒伴渶瑕佷拱鍏ョ殑鍒嗘暟绾�"
- # return True, False, ""
+ if can_buy_result is None:
+ return False, True, "灏氭湭鑾峰彇鍒版澘鍧椾俊鎭�"
+ if not can_buy_result[0]:
+ return False, True, can_buy_result[1]
+ return True, False, can_buy_result[1]
@classmethod
def __cancel_buy(cls, code):
@@ -1000,8 +973,8 @@
_start_time = tool.get_now_timestamp()
total_datas = local_today_datas[code]
# 澶勭悊瀹夊叏绗旀暟
- cls.__buyL2SafeCountManager.compute_left_rate(code, compute_start_index, compute_end_index, total_datas,
- local_today_num_operate_map.get(code))
+ # cls.__buyL2SafeCountManager.compute_left_rate(code, compute_start_index, compute_end_index, total_datas,
+ # local_today_num_operate_map.get(code))
# 鑾峰彇涔板叆淇″彿璁＄畻璧峰浣嶇疆
buy_single_index, buy_exec_index, buy_compute_index, num, count, max_num_set, buy_volume_rate = cls.__get_order_begin_pos(
--
Gitblit v1.8.0