From b973d8fbd2d57f3b67f34601b2215f5da581982d Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: 星期一, 14 四月 2025 18:45:46 +0800
Subject: [PATCH] 修改当日BUG
---
strategy/market_sentiment_analysis.py | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/strategy/market_sentiment_analysis.py b/strategy/market_sentiment_analysis.py
index f08c454..490817b 100644
--- a/strategy/market_sentiment_analysis.py
+++ b/strategy/market_sentiment_analysis.py
@@ -453,12 +453,12 @@
# ====================== 鏍稿績鍥犲瓙璁＄畻 ======================
def calculate_factors(data):
- data = {'-1': '284', '-10': '2', '-2': '80', '-3': '32', '-4': '11', '-5': '6', '-6': '6', '-7': '2', '-8': '0',
- '-9': '1', '0': '101', '1': '1376', '10': '8', '2': '1760', '3': '964', '4': '285', '5': '108', '6': '49',
- '7': '17', '8': '9', '9': '2', 'DT': 3, 'SJDT': '2', 'SJZT': '15', 'STDT': '1', 'STZT': '7', 'SZJS': 4600,
- 'XDJS': 427, 'ZSZDFB': '1939,238,57,446,45,8,271,19,2,42,7,1,26,19,5,217,71,12,', 'ZT': 22,
- 'sign': '甯傚満浜烘皵杈冨ソ', 'szln': 1113353, 'qscln': 3725698, 's_zrcs': 2185592, 'q_zrcs': 5573160,
- 's_zrtj': 58079140, 'q_zrtj': 134866542}
+ # data = {'-1': '284', '-10': '2', '-2': '80', '-3': '32', '-4': '11', '-5': '6', '-6': '6', '-7': '2', '-8': '0',
+ # '-9': '1', '0': '101', '1': '1376', '10': '8', '2': '1760', '3': '964', '4': '285', '5': '108', '6': '49',
+ # '7': '17', '8': '9', '9': '2', 'DT': 3, 'SJDT': '2', 'SJZT': '15', 'STDT': '1', 'STZT': '7', 'SZJS': 4600,
+ # 'XDJS': 427, 'ZSZDFB': '1939,238,57,446,45,8,271,19,2,42,7,1,26,19,5,217,71,12,', 'ZT': 22,
+ # 'sign': '甯傚満浜烘皵杈冨ソ', 'szln': 1113353, 'qscln': 3725698, 's_zrcs': 2185592, 'q_zrcs': 5573160,
+ # 's_zrtj': 58079140, 'q_zrtj': 134866542}
if data is not None and len(data) > 0:
zero = int(data.get('0'))
@@ -550,7 +550,6 @@
max_key = max(rise_and_fall_dirt, key=rise_and_fall_dirt.get)
# 鎵惧埌鏈�灏忓�煎搴旂殑閿�
min_key = min(rise_and_fall_dirt, key=rise_and_fall_dirt.get)
-
# 娑ㄨ穼姣斿洜瀛� ---------------------------------------------------
factors['rise_vs_fall'] = {
'rise_vs_fall_ratio': round(rise_sum / fall_sum, 2) if fall_sum > 0 else 0, # 娑ㄨ穼姣�
@@ -650,8 +649,6 @@
f"涓婃定瀹舵暟锛歿rise_numbers}锛屼笅璺屽鏁帮細{fall_numbers}锛屽疄闄呮定鍋滃鏁帮細{actual_limit_up_numbers}锛屽疄闄呰穼鍋滃鏁帮細{actual_limit_down_numbers}")
logger.info(f"娑ㄨ穼缁熻瀛楀吀{data_cache.rise_and_fall_statistics_dirt}")
- usefulMoney = data_cache.account_finance_dict[0].get('usefulMoney', 0)
- logger.info(f"璐︽埛鍙敤璧勯噾==={usefulMoney}鍏�")
# 浣庤糠鎯呯华姣斾緥
low_emotion_mood_ratio = 1
# 33鍒嗘槸涓袱绾у垎鍖栭樁姊笉濂斤紝鐩墠涓嶅ソ鎷挎崗锛屾殏鏃朵笉鐢�
@@ -674,6 +671,8 @@
# 瀹氫箟涓�涓粖鏃ョ殑鍓╀綑鏂板鎸佷粨鏁伴噺鐨勫彉閲�
Unfinished_opening_plan_number = 3 - addition_position_number
logger.info(f"浠婃棩鐨勫墿浣欐柊澧炴寔浠撴暟閲�==={Unfinished_opening_plan_number}")
+ usefulMoney = data_cache.account_finance_dict[0].get('usefulMoney', 0)
+ logger.info(f"璐︽埛鍙敤璧勯噾==={usefulMoney}鍏�")
if Unfinished_opening_plan_number != 0:
# 濡傛灉GUI鐪嬬洏涓婃病鏈夋墜鍔ㄨ缃叿浣撶殑涓嬪崟閲戦锛屽氨鎸夌収璇勫垎绛栫暐鐨勯噾棰濅笅鍗曪紝鍚﹀垯灏辨寜鐓UI璁剧疆鐨勯噾棰濅笅鍗曘��
if data_cache.BUY_MONEY_PER_CODE < 0:
@@ -682,8 +681,7 @@
# ((澶х洏缁煎悎寮哄害鍒嗘暟 + 澶х洏鎸囨暟鎯呯华棰勬湡鍒嗘暟) * 0.01) * (璐︽埛鍙敤閲戦 * 0.9 * 鏋佺浣庤糠鎯呯华姣斾緥 / 浠婃棩鏈�澶ф柊澧炴寔浠撶エ鏁�)
# data_cache.today_planned_order_amount = ((data_cache.real_time_market_strong + data_cache.index_trend_expectation_score) * 0.01) * (
# usefulMoney * 0.9 * low_emotion_mood_ratio / Unfinished_opening_plan_number)
- data_cache.today_planned_order_amount = (
- usefulMoney * 0.95 * low_emotion_mood_ratio / Unfinished_opening_plan_number)
+ data_cache.today_planned_order_amount = usefulMoney * 0.95 * low_emotion_mood_ratio / Unfinished_opening_plan_number
logger.info(
f"閲囩敤寮�浠撶瓥鐣ヨ绠楁柟寮�=銆嬩粖鏃ヨ鍒掍笅鍗曢噾棰�:{data_cache.today_planned_order_amount}锛�")
else:
--
Gitblit v1.8.0