From d1bf04791ad095b17660a1f383b7a12f0a59b1d1 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 26 四月 2023 19:15:06 +0800
Subject: [PATCH] 优化H撤/融入网页看盘页面/开盘啦数据应用
---
trade/first_code_score_manager.py | 78 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/trade/first_code_score_manager.py b/trade/first_code_score_manager.py
index 8e1c2bc..df362a6 100644
--- a/trade/first_code_score_manager.py
+++ b/trade/first_code_score_manager.py
@@ -16,8 +16,16 @@
import global_util
import gpcode_manager
import tool
-from third_data import hot_block_data_process
+from third_data import block_info
from trade import l2_trade_factor, deal_big_money_manager, bidding_money_manager
+
+
+# 鑾峰彇鍑犳澘
+def __get_ban_count(str_):
+ for i in range(len(str_)-1, -1, -1):
+ if str_[i].isnumeric():
+ return int(str_[i])
+ return 0
def __get_score(zyltgb, limit_price, bidding, k_form, code_nature, hot_block, volume_rate, limit_up_time,
@@ -28,7 +36,7 @@
if zyltgb_y <= 80:
score_list.append(max(int(round(0.5 * zyltgb_y - 10, 0)), -10))
else:
- score_list.append(max(int(round(30 - 5 * ((zyltgb_y-80)//20), 0)), -10))
+ score_list.append(max(int(round(30 - 5 * ((zyltgb_y - 80) // 20), 0)), -10))
else:
score_list.append(0)
@@ -114,32 +122,48 @@
# 鏉垮潡 - 浠ｇ爜骞冲潎娑ㄥ箙
__average_rate = round(hot_block["block_codes_rates_info"][0] / hot_block["block_codes_rates_info"][1], 2)
if hot_block["target_block_info"][0] == "鏃犳澘鍧�":
- hot_block_score.append(5)
- else:
- hot_block_score.append(min(int(round(__average_rate * 2 - 10)), 10))
- # 鏉垮潡 - 娑ㄥ仠鍙暟
- if hot_block["limit_up_codes_count"] <= 1:
- hot_block_score.append(1)
- else:
- hot_block_score.append(max(12 - hot_block["limit_up_codes_count"], 2))
- # 鏉垮潡 - 鏉垮潡娑ㄥ箙
- hot_block_score.append(min(int(round(hot_block["target_block_info"][1] * 2)), 10))
- # 鏉垮潡 - 绗嚑鍙定鍋�
- if hot_block["limit_up_index"] <= 0:
+ # 鏃犳澘鍧楃殑鏉垮潡寰楀垎鍙兘鏄�25
hot_block_score.append(25)
+ # 琛ュ厖澶氫綑鏁版嵁
+ for i in range(10):
+ hot_block_score.append(0)
else:
- hot_block_score.append(max(60 - hot_block["limit_up_index"] * 5, 10))
- # 鏉垮潡 - 楂樹綅鏉�
- high_score = 0
- for high_info in hot_block["high_block_infos"]:
- c_count = int(high_info[1][-2:-1])
- high_score += min(2 * c_count - 2, 10)
- hot_block_score.append(high_score)
- # 鏉垮潡 - 鏉垮潡鍘嗗彶鍑虹幇娆℃暟
- if hot_block["target_block_info"][2] <= 1:
- hot_block_score.append(10)
- else:
- hot_block_score.append(max(-3 * hot_block["target_block_info"][2] + 20, -10))
+ if hot_block["target_block_info"][0] == "鏃犳澘鍧�":
+ hot_block_score.append(5)
+ else:
+ hot_block_score.append(min(int(round(__average_rate * 2 - 10)), 10))
+
+ # 鏉垮潡 - 娑ㄥ仠鍙暟
+ #--鍏堟敞閲婅缃负0
+ # if hot_block["limit_up_codes_count"] <= 1:
+ # hot_block_score.append(1)
+ # else:
+ # hot_block_score.append(max(12 - hot_block["limit_up_codes_count"], 2))
+ hot_block_score.append(0)
+
+
+ # 鏉垮潡 - 鏉垮潡娑ㄥ箙
+ # hot_block_score.append(min(int(round(hot_block["target_block_info"][1] * 2)), 10))
+ #--鍏堟敞閲婅缃负0
+ hot_block_score.append(0)
+
+
+ # 鏉垮潡 - 绗嚑鍙定鍋�
+ if hot_block["limit_up_index"] <= 0:
+ hot_block_score.append(0)
+ else:
+ hot_block_score.append(max(90 - hot_block["limit_up_index"] * 10, 0))
+ # 鏉垮潡 - 楂樹綅鏉�
+ high_score = 0
+ for high_info in hot_block["high_block_infos"]:
+ c_count = __get_ban_count(high_info[1])
+ high_score += min(2 * c_count - 2, 10)
+ hot_block_score.append(high_score)
+ # 鏉垮潡 - 鏉垮潡鍘嗗彶鍑虹幇娆℃暟
+ if hot_block["target_block_info"][2] <= 1:
+ hot_block_score.append(10)
+ else:
+ hot_block_score.append(max(-3 * hot_block["target_block_info"][2] + 20, -10))
score_list.append(hot_block_score)
# --------------- 鏉垮潡缁撴潫-----------------
@@ -232,7 +256,7 @@
code_nature = code_nature_analyse.CodeNatureRecordManager.get_nature(code)
source_datas.append(code_nature)
- hot_block = hot_block_data_process.get_info(code)
+ hot_block = block_info.get_info(code)
if hot_block is None:
hot_block = {
# 鐩爣鏉垮潡淇℃伅锛堟澘鍧楀悕绉�,鏉垮潡娑ㄥ箙,鍘嗗彶鏉垮潡鍑虹幇娆℃暟锛�
--
Gitblit v1.8.0