From 92371eb784282a445a45abbce452c5b505f99727 Mon Sep 17 00:00:00 2001 From: "zhangkun9038@dingtalk.com" Date: Sun, 1 Jun 2025 04:08:47 +0000 Subject: [PATCH] combined_condition update --- freqtrade/templates/freqaiprimer.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/freqtrade/templates/freqaiprimer.py b/freqtrade/templates/freqaiprimer.py index 82cacc1..a5ec6a6 100644 --- a/freqtrade/templates/freqaiprimer.py +++ b/freqtrade/templates/freqaiprimer.py @@ -277,13 +277,19 @@ class FreqaiPrimer(IStrategy): logger.warning(f"[{pair}] ⚠️ &-price_value_divergence 列缺失，跳过该条件") if len(conditions) > 0: - dataframe.loc[reduce(lambda x, y: x & y, conditions), 'enter_long'] = 1 - # 检查是否同时有卖出信号 - if 'exit_long' in dataframe.columns and (dataframe["exit_long"] == 1).any(): - logger.warning(f"[{pair}] 同时检测到买入和卖出信号，忽略买入信号") - dataframe['enter_long'] = 0 + combined_condition = reduce(lambda x, y: x & y, conditions) + if combined_condition.any(): + dataframe.loc[combined_condition, 'enter_long'] = 1 + + if 'exit_long' in dataframe.columns and (dataframe["exit_long"] == 1).any(): + logger.warning(f"[{pair}] 同时检测到买入和卖出信号，忽略买入信号") + dataframe['enter_long'] = 0 + else: + logger.debug(f"[{pair}] 入场信号触发，条件满足") else: - logger.debug(f"[{pair}] 入场信号触发，条件满足") # 改为 DEBUG 级别 + logger.debug(f"[{pair}] 买入条件均不满足，未触发入场信号") + else: + logger.debug(f"[{pair}] 无有效买入条件") return dataframe