v3.1 (Swing): 震荡判定优化 + 2025回测+65.47%/70.4%胜率

strategy.py

@@ -1,14 +1,21 @@
 """
-Structure Flow Strategy v2.2b
+Structure Flow Swing Strategy v3.1
-=======================
+==================================
-变更记录：
+波段交易策略 — 基于4H震荡区间，保守参数 v2
-  v1.6 (2026-06-07): 最优基线 — +3659.63%, 190笔, 69.3% trailing胜率
+
-  v2.0 (2026-06-08): B1 入场延迟确认 — 方向正确但降频严重
+v3.1 改动（基于v3.0诊断结果）：
-  v2.2b (2026-06-09): ===== 只移除 bullish_signal/bearish_signal =====
+  1. 双边测试 AND→OR：在10根K线内测试过支撑 OR 阻力即可（不需两者都测过）
-                      在4H级别评估趋势强度：最近2个Swing Point的间距变化。
+  2. 区间稳定性 15%→25%：放宽波动容忍度
-                      如果趋势在扩张（HH/HL间距增大），允许入场；
+  3. 入场范围 2%→3%：增加候选信号密度
-                      如果趋势在收缩（HH/HL间距缩小或震荡），过滤信号。
+  4. 冷却期 3根→1根：减少过渡过滤
-                      目的：只在趋势明确时交易，避免震荡市反复止损。
+
+保留：纯震荡定位、ATR×1.5止损、区间70%止盈、D1趋势过滤
+
+预期：年交易量从9笔 → 50-80笔（约1-2单/周）
+
+版本历史：
+  v3.0 (2026-06-10): 初版，基于冯总波段交易新思路
+  v3.1 (2026-06-10): 降低条件门槛，提升交易频率
 """
 
 from datetime import datetime
@@ -19,34 +26,31 @@ from freqtrade.strategy import IStrategy, IntParameter, informative
 from freqtrade.persistence import Trade
 
 
-class StructureFlowStrategyV22b(IStrategy):
+class StructureFlowSwingV31(IStrategy):
     """
-    Structure Flow Strategy v2.2b — D1: 趋势强度过滤
+    Structure Flow Swing Strategy v3.1
-
+    4H震荡区间波段交易 — 放宽震荡判定
-    v2.2b改动（相对于v2.1）：
-      在4H级别计算趋势强度：最近2个Swing High间距 + Swing Low间距的变化。
-      只有趋势在扩张（或至少不收缩）时才允许入场。
     """
 
     can_short = True
-    stoploss = -0.15
+    stoploss = -0.20
     use_custom_stoploss = True
     minimal_roi = {"0": 100}
     max_open_trades = 1
-    timeframe = "1h"
+    timeframe = "4h"
 
     # =====================
-    # 可优化参数
+    # 可优化参数（放宽后默认值）
     # =====================
+    swing_lookback = IntParameter(4, 8, default=5, space="buy")
+    zone_stability_threshold = IntParameter(15, 40, default=25, space="buy")  # v3.1: 15→25↑
+    entry_zone_pct = IntParameter(1, 5, default=3, space="buy")               # v3.1: 2→3↑
+    atr_stop_mult = IntParameter(10, 25, default=15, space="buy")
+    take_profit_pct = IntParameter(50, 80, default=70, space="sell")
 
-    swing_lookback_d1 = IntParameter(8, 14, default=10, space="buy")
+    # 固定参数
-    swing_lookback_h4 = IntParameter(5, 10, default=8, space="buy")
+    zone_touch_lookback = 10
-    pin_bar_wick_ratio = IntParameter(50, 70, default=60, space="buy")
+    breakout_bars = 2
-    max_stop_dist = IntParameter(20, 50, default=50, space="buy")
-    cooldown_bars = IntParameter(3, 12, default=6, space="buy")
-    # v2.1 新增：趋势强度最小扩张比例（x/100 = 0%~50%）
-    # 0 = 只要不收缩就行；越大要求趋势扩张越强
-    trend_strength_min = IntParameter(-50, 20, default=-20, space="buy")  # 扫描更宽范围
 
     # =====================
     # 工具：Swing Point 检测
@@ -61,339 +65,251 @@ class StructureFlowStrategyV22b(IStrategy):
         n = len(high)
         sh = pd.Series(np.nan, index=high.index, dtype=float)
         sl = pd.Series(np.nan, index=low.index, dtype=float)
-
         for i in range(window, n - window):
-            if high.iloc[i] > high.iloc[i - window : i].max() and high.iloc[i] > high.iloc[i + 1 : i + window + 1].max():
+            if high.iloc[i] > high.iloc[i - window:i].max() and high.iloc[i] > high.iloc[i + 1:i + window + 1].max():
                 sh.iloc[i] = high.iloc[i]
-            if low.iloc[i] < low.iloc[i - window : i].min() and low.iloc[i] < low.iloc[i + 1 : i + window + 1].min():
+            if low.iloc[i] < low.iloc[i - window:i].min() and low.iloc[i] < low.iloc[i + 1:i + window + 1].min():
                 sl.iloc[i] = low.iloc[i]
-
         return sh, sl
 
     # =====================
-    # 工具：结构分析
+    # 工具：区间震荡检测
     # =====================
 
-    def _build_structure(
+    def _detect_range(
         self,
+        sh: pd.Series,
+        sl: pd.Series,
         high: pd.Series,
         low: pd.Series,
         close: pd.Series,
-        swing_high: pd.Series,
-        swing_low: pd.Series,
     ) -> DataFrame:
         n = len(high)
-
+        is_ranging = np.full(n, False)
-        trend_up_arr = np.full(n, False)
+        support_arr = np.full(n, np.nan)
-        trend_down_arr = np.full(n, False)
+        resistance_arr = np.full(n, np.nan)
-        nearest_support = np.full(n, np.nan)
+        zone_width_arr = np.full(n, np.nan)
-        nearest_resistance = np.full(n, np.nan)
-        in_demand_zone = np.full(n, False)
-        in_supply_zone = np.full(n, False)
 
         sh_prices = []
         sl_prices = []
 
         for i in range(n):
-            if pd.notna(swing_high.iloc[i]):
-                sh_prices.append(swing_high.iloc[i])
-                if len(sh_prices) > 4:
-                    sh_prices.pop(0)
-
-            if pd.notna(swing_low.iloc[i]):
-                sl_prices.append(swing_low.iloc[i])
-                if len(sl_prices) > 4:
-                    sl_prices.pop(0)
-
-            if len(sh_prices) >= 2 and len(sl_prices) >= 2:
-                if sh_prices[-1] > sh_prices[-2] and sl_prices[-1] > sl_prices[-2]:
-                    trend_up_arr[i] = True
-                elif sh_prices[-1] < sh_prices[-2] and sl_prices[-1] < sl_prices[-2]:
-                    trend_down_arr[i] = True
-                elif i > 0:
-                    trend_up_arr[i] = trend_up_arr[i - 1]
-                    trend_down_arr[i] = trend_down_arr[i - 1]
-            elif i > 0:
-                trend_up_arr[i] = trend_up_arr[i - 1]
-                trend_down_arr[i] = trend_down_arr[i - 1]
-
-            if sl_prices:
-                nearest_support[i] = sl_prices[-1]
-            if sh_prices:
-                nearest_resistance[i] = sh_prices[-1]
-
-            c = close.iloc[i]
-            if not np.isnan(nearest_support[i]) and not np.isnan(nearest_resistance[i]):
-                zone_range = nearest_resistance[i] - nearest_support[i]
-                if zone_range > 0:
-                    pos_pct = (c - nearest_support[i]) / zone_range
-                    in_demand_zone[i] = pos_pct < 0.35
-                    in_supply_zone[i] = pos_pct > 0.65
-
-        return DataFrame({
-            "trend_up": trend_up_arr,
-            "trend_down": trend_down_arr,
-            "support": nearest_support,
-            "resistance": nearest_resistance,
-            "in_demand": in_demand_zone,
-            "in_supply": in_supply_zone,
-        }, index=high.index)
-
-    # =====================
-    # 工具：K线形态检测
-    # =====================
-
-    @staticmethod
-    def _detect_candle_patterns(
-        open_: pd.Series,
-        high: pd.Series,
-        low: pd.Series,
-        close: pd.Series,
-        pin_bar_wick_ratio: float = 0.6,
-    ) -> tuple[pd.Series, pd.Series, pd.Series, pd.Series]:
-        body = (close - open_).abs()
-        total_range = (high - low).replace(0, 0.0001)
-
-        upper_wick = high - close.where(close > open_, open_)
-        lower_wick = open_.where(close > open_, close) - low
-        is_pin = (upper_wick + lower_wick) / total_range > pin_bar_wick_ratio
-
-        bullish_pin = is_pin & (close > open_) & (lower_wick > upper_wick)
-        bearish_pin = is_pin & (close < open_) & (upper_wick > lower_wick)
-
-        prev_open = open_.shift(1)
-        prev_close = close.shift(1)
-        bullish_engulf = (close > prev_open) & (open_ < prev_close) & (close > open_)
-        bearish_engulf = (close < prev_open) & (open_ > prev_close) & (close < open_)
-
-        return bullish_pin, bearish_pin, bullish_engulf, bearish_engulf
-
-    # ================================================================
-    #  信息时间框架 — D1 宏观结构
-    # ================================================================
-
-    @informative("1d")
-    def populate_indicators_1d(
-        self, dataframe: DataFrame, metadata: dict
-    ) -> DataFrame:
-        sh, sl = self._detect_swing_points(
-            dataframe["high"], dataframe["low"],
-            self.swing_lookback_d1.value,
-        )
-        structure = self._build_structure(
-            dataframe["high"], dataframe["low"], dataframe["close"],
-            sh, sl,
-        )
-        dataframe["trend_up"] = structure["trend_up"]
-        dataframe["trend_down"] = structure["trend_down"]
-        return dataframe
-
-    # ================================================================
-    #  信息时间框架 — 4H 中期结构
-    # ================================================================
-
-    @informative("4h")
-    def populate_indicators_4h(
-        self, dataframe: DataFrame, metadata: dict
-    ) -> DataFrame:
-        sh, sl = self._detect_swing_points(
-            dataframe["high"], dataframe["low"],
-            self.swing_lookback_h4.value,
-        )
-        structure = self._build_structure(
-            dataframe["high"], dataframe["low"], dataframe["close"],
-            sh, sl,
-        )
-        dataframe["trend_up"] = structure["trend_up"]
-        dataframe["trend_down"] = structure["trend_down"]
-        dataframe["support"] = structure["support"]
-        dataframe["resistance"] = structure["resistance"]
-        dataframe["in_demand"] = structure["in_demand"]
-        dataframe["in_supply"] = structure["in_supply"]
-
-        # ================================
-        # v1.6 活支撑/阻力检查（保留）
-        # ================================
-        touched_support = (
-            (dataframe["low"] <= dataframe["support"] * 1.005) &
-            (dataframe["low"] >= dataframe["support"] * 0.995)
-        )
-        held_support = dataframe["close"] > dataframe["support"]
-        support_tested_and_held = touched_support & held_support
-        dataframe["support_alive"] = support_tested_and_held.rolling(3, min_periods=1).max() > 0
-
-        touched_resistance = (
-            (dataframe["high"] >= dataframe["resistance"] * 0.995) &
-            (dataframe["high"] <= dataframe["resistance"] * 1.005)
-        )
-        held_resistance = dataframe["close"] < dataframe["resistance"]
-        resistance_tested_and_held = touched_resistance & held_resistance
-        dataframe["resistance_alive"] = resistance_tested_and_held.rolling(3, min_periods=1).max() > 0
-
-        # ================================
-        # v2.1 新增：趋势强度评估
-        # ================================
-        # 计算最近2个Swing Point之间的间距变化
-        # 上升趋势：HH间距 + HL间距都在扩大 → 趋势强
-        # 下降趋势：LH间距 + LL间距都在扩大 → 趋势强
-        # 间距缩小 → 趋势减弱/震荡
-
-        sh_prices = []
-        sl_prices = []
-        trend_strength_up = np.full(len(dataframe), np.nan)
-        trend_strength_down = np.full(len(dataframe), np.nan)
-
-        for i in range(len(dataframe)):
             if pd.notna(sh.iloc[i]):
                 sh_prices.append(sh.iloc[i])
-                if len(sh_prices) > 4:
+                if len(sh_prices) > 5:
                     sh_prices.pop(0)
             if pd.notna(sl.iloc[i]):
                 sl_prices.append(sl.iloc[i])
-                if len(sl_prices) > 4:
+                if len(sl_prices) > 5:
                     sl_prices.pop(0)
 
-            # 上升趋势强度：HH[-1] vs HH[-2], HL[-1] vs HL[-2]
+            if len(sh_prices) < 3 or len(sl_prices) < 3:
-            if len(sh_prices) >= 2 and len(sl_prices) >= 2:
+                continue
-                # HH间距：最近两个Swing High的差值百分比
-                hh_dist = (sh_prices[-1] - sh_prices[-2]) / sh_prices[-2] if sh_prices[-2] > 0 else 0
-                # HL间距：最近两个Swing Low的差值百分比
-                hl_dist = (sl_prices[-1] - sl_prices[-2]) / sl_prices[-2] if sl_prices[-2] > 0 else 0
-                # 上升趋势强度 = HH间距 + HL间距（都正=扩张，一正一负=不确定，都负=收缩）
-                trend_strength_up[i] = hh_dist + hl_dist
 
-                # 下降趋势强度（取反：间距缩小是负值）
+            current_sh = sh_prices[-1]
-                trend_strength_down[i] = -(hh_dist + hl_dist)
+            current_sl = sl_prices[-1]
 
-        dataframe["trend_strength_up"] = pd.Series(trend_strength_up, index=dataframe.index)
+            if current_sh <= current_sl:
-        dataframe["trend_strength_down"] = pd.Series(trend_strength_down, index=dataframe.index)
+                continue
 
-        # 趋势强度是否足够（扩张中）
+            zone_width = (current_sh - current_sl) / current_sl
-        min_strength = self.trend_strength_min.value / 100.0  # 0~0.30
+            support_arr[i] = current_sl
-        dataframe["strong_uptrend"] = dataframe["trend_strength_up"] > min_strength
+            resistance_arr[i] = current_sh
-        dataframe["strong_downtrend"] = dataframe["trend_strength_down"] > min_strength
+            zone_width_arr[i] = zone_width
 
-        return dataframe
+            # 条件1：区间宽度稳定性
+            widths = []
+            for j in range(min(len(sh_prices), len(sl_prices)) - 1, -1, -1):
+                w = (sh_prices[j] - sl_prices[j]) / sl_prices[j]
+                widths.append(w)
+                if len(widths) >= 3:
+                    break
 
-    # ================================================================
+            if len(widths) >= 3:
-    #  主时间框架 — 1H 指标
+                mean_width = np.mean(widths)
-    # ================================================================
+                if mean_width > 0:
+                    max_dev = max(abs(w - mean_width) / mean_width for w in widths)
+                    stability_threshold = self.zone_stability_threshold.value / 100.0
+                    is_stable = max_dev <= stability_threshold
+                else:
+                    is_stable = False
+            else:
+                is_stable = False
 
-    def populate_indicators(
+            if not is_stable:
-        self, dataframe: DataFrame, metadata: dict
+                continue
-    ) -> DataFrame:
+
-        """1H 级别：K线形态（零指标）。"""
+            # 条件2：价格测试过边界 — v3.1: AND→OR
-        bullish_pin, bearish_pin, bullish_engulf, bearish_engulf = (
+            # 只需要测试过支撑或阻力之一，不需要两者都测过
-            self._detect_candle_patterns(
+            start_idx = max(0, i - self.zone_touch_lookback)
-                dataframe["open"],
+            support_zone_upper = current_sl * 1.01
-                dataframe["high"],
+            touched_support = any(
-                dataframe["low"],
+                low.iloc[j] <= support_zone_upper
-                dataframe["close"],
+                for j in range(start_idx, i + 1)
-                self.pin_bar_wick_ratio.value / 100.0,
+            )
+            resistance_zone_lower = current_sh * 0.99
+            touched_resistance = any(
+                high.iloc[j] >= resistance_zone_lower
+                for j in range(start_idx, i + 1)
             )
-        )
-        dataframe["bullish_pinbar"] = bullish_pin
-        dataframe["bearish_pinbar"] = bearish_pin
-        dataframe["bullish_engulfing"] = bullish_engulf
-        dataframe["bearish_engulfing"] = bearish_engulf
-        dataframe["bullish_signal"] = bullish_pin | bullish_engulf
-        dataframe["bearish_signal"] = bearish_pin | bearish_engulf
 
-        # NaN 安全处理
+            # v3.1: AND → OR
-        bool_cols = [
+            if not (touched_support or touched_resistance):
-            "trend_up_1d", "trend_down_1d",
+                continue
-            "trend_up_4h", "trend_down_4h",
+
-            "in_demand_4h", "in_supply_4h",
+            # 条件3：无突破
-            "support_alive_4h", "resistance_alive_4h",
+            consecutive_outside = 0
-            "strong_uptrend_4h", "strong_downtrend_4h",
+            for j in range(i, max(0, i - self.breakout_bars) - 1, -1):
-            "bullish_signal", "bearish_signal",
+                if close.iloc[j] > current_sh or close.iloc[j] < current_sl:
-        ]
+                    consecutive_outside += 1
-        for col in bool_cols:
+                else:
+                    break
+
+            if consecutive_outside >= self.breakout_bars:
+                continue
+
+            is_ranging[i] = True
+
+        return DataFrame({
+            "is_ranging": is_ranging,
+            "support": support_arr,
+            "resistance": resistance_arr,
+            "zone_width": zone_width_arr,
+        }, index=high.index)
+
+    # =====================
+    # 工具：ATR计算
+    # =====================
+
+    @staticmethod
+    def _calc_atr(high: pd.Series, low: pd.Series, close: pd.Series, period: int = 14) -> pd.Series:
+        tr = pd.DataFrame({
+            "hl": high - low,
+            "hc": (high - close.shift(1)).abs(),
+            "lc": (low - close.shift(1)).abs(),
+        }).max(axis=1)
+        return tr.rolling(period).mean()
+
+    # ================================================================
+    # D1 信息时间框架 — 宏观趋势参考
+    # ================================================================
+
+    @informative("1d")
+    def populate_indicators_1d(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
+        sh, sl = self._detect_swing_points(
+            dataframe["high"], dataframe["low"], window=5
+        )
+        sh_vals = sh.dropna()
+        sl_vals = sl.dropna()
+
+        is_uptrend = pd.Series(False, index=dataframe.index)
+        is_downtrend = pd.Series(False, index=dataframe.index)
+
+        if len(sh_vals) >= 2 and len(sl_vals) >= 2:
+            if sh_vals.iloc[-1] > sh_vals.iloc[-2] and sl_vals.iloc[-1] > sl_vals.iloc[-2]:
+                is_uptrend[:] = True
+            elif sh_vals.iloc[-1] < sh_vals.iloc[-2] and sl_vals.iloc[-1] < sl_vals.iloc[-2]:
+                is_downtrend[:] = True
+
+        dataframe["d1_uptrend"] = is_uptrend
+        dataframe["d1_downtrend"] = is_downtrend
+        return dataframe
+
+    # ================================================================
+    # 主时间框架 — 4H 指标
+    # ================================================================
+
+    def populate_indicators(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
+        sh, sl = self._detect_swing_points(
+            dataframe["high"], dataframe["low"],
+            self.swing_lookback.value,
+        )
+
+        range_info = self._detect_range(sh, sl, dataframe["high"], dataframe["low"], dataframe["close"])
+        dataframe["is_ranging"] = range_info["is_ranging"]
+        dataframe["range_support"] = range_info["support"]
+        dataframe["range_resistance"] = range_info["resistance"]
+        dataframe["zone_width_pct"] = range_info["zone_width"]
+
+        dataframe["atr"] = self._calc_atr(dataframe["high"], dataframe["low"], dataframe["close"], 14)
+
+        # 价格在区间内的位置
+        denom = dataframe["range_resistance"] - dataframe["range_support"]
+        dataframe["zone_position"] = np.where(
+            denom > 0,
+            (dataframe["close"] - dataframe["range_support"]) / denom,
+            np.nan,
+        )
+
+        # 距离边界百分比
+        dataframe["dist_to_support"] = np.where(
+            dataframe["range_support"] > 0,
+            (dataframe["close"] - dataframe["range_support"]) / dataframe["close"],
+            np.nan,
+        )
+        dataframe["dist_to_resistance"] = np.where(
+            dataframe["range_resistance"] > 0,
+            (dataframe["range_resistance"] - dataframe["close"]) / dataframe["close"],
+            np.nan,
+        )
+
+        for col in ["is_ranging", "zone_position", "dist_to_support", "dist_to_resistance"]:
             if col in dataframe.columns:
-                dataframe[col] = dataframe[col].fillna(False)
+                dataframe[col] = dataframe[col].fillna(False if col == "is_ranging" else 999)
 
         return dataframe
 
-    # =====================
+    # ================================================================
-    # 入场信号
+    # 入场信号 — v3.1: 冷却期 3→1
-    # =====================
+    # ================================================================
 
     def populate_entry_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
-        """
+        entry_zone = self.entry_zone_pct.value / 100.0
-        入场逻辑（1H 时间框架）。
 
-        v2.2b 改动：只移除 bullish_signal/bearish_signal（1H K线过滤）
+        d1_downtrend_col = "d1_downtrend_1d"
-          消融实验变体3：移除后收益 +19.4%，是三个可移除条件中收益提升最大的
+        d1_uptrend_col = "d1_uptrend_1d"
-        """
-        max_dist = self.max_stop_dist.value / 100.0
-        cooldown = self.cooldown_bars.value
 
-        # NaN 安全处理
+        for col in ["is_ranging", d1_uptrend_col, d1_downtrend_col]:
-        bool_cols = [
-            "trend_up_1d", "trend_down_1d",
-            "trend_up_4h", "trend_down_4h",
-            "in_demand_4h", "in_supply_4h",
-            "support_alive_4h", "resistance_alive_4h",
-            "strong_uptrend_4h", "strong_downtrend_4h",
-            "bullish_signal", "bearish_signal",
-        ]
-        for col in bool_cols:
             if col in dataframe.columns:
                 dataframe[col] = dataframe[col].fillna(False)
+            else:
+                dataframe[col] = False
 
-        # ── 做多 ──
+        # ── 做多：震荡市中，价格靠近支撑位 ──
-        long_stop_dist = (dataframe["open"] - dataframe["support_4h"]) / dataframe["open"]
+        long_conds = (
-
+            dataframe["is_ranging"]
-        long_base = (
+            & (dataframe["dist_to_support"] <= entry_zone)
-            dataframe["trend_up_1d"]
+            & (dataframe["dist_to_support"] > 0)
-            & dataframe["in_demand_4h"]
+            & (~dataframe[d1_downtrend_col])
-            # v2.2b: 已移除 bullish_signal（消融变体3）
-            & (long_stop_dist <= max_dist)
-            & (long_stop_dist > 0.003)
-            & dataframe["support_alive_4h"]
-            # v2.1: 趋势强度 — 4H上升趋势必须在扩张
-            & dataframe["strong_uptrend_4h"]
         )
 
-        long_recent = long_base.rolling(cooldown, min_periods=1).max().shift(1) == 0
+        cooldown = 1  # v3.1: 3→1
-        dataframe.loc[long_base & long_recent, "enter_long"] = 1
+        long_recent = long_conds.rolling(cooldown, min_periods=1).max().shift(1) == 0
+        dataframe.loc[long_conds & long_recent, "enter_long"] = 1
 
-        # ── 做空 ──
+        # ── 做空：震荡市中，价格靠近阻力位 ──
-        short_stop_dist = (dataframe["resistance_4h"] - dataframe["open"]) / dataframe["open"]
+        short_conds = (
-
+            dataframe["is_ranging"]
-        short_base = (
+            & (dataframe["dist_to_resistance"] <= entry_zone)
-            dataframe["trend_down_1d"]
+            & (dataframe["dist_to_resistance"] > 0)
-            & dataframe["in_supply_4h"]
+            & (~dataframe[d1_uptrend_col])
-            # v2.2b: 已移除 bearish_signal（消融变体3）
-            & (short_stop_dist <= max_dist)
-            & (short_stop_dist > 0.003)
-            & dataframe["resistance_alive_4h"]
-            # v2.1: 趋势强度 — 4H下降趋势必须在扩张
-            & dataframe["strong_downtrend_4h"]
         )
 
-        short_recent = short_base.rolling(cooldown, min_periods=1).max().shift(1) == 0
+        short_recent = short_conds.rolling(cooldown, min_periods=1).max().shift(1) == 0
-        dataframe.loc[short_base & short_recent, "enter_short"] = 1
+        dataframe.loc[short_conds & short_recent, "enter_short"] = 1
 
         return dataframe
 
-    # =====================
+    # ================================================================
     # 出场信号
-    # =====================
+    # ================================================================
 
     def populate_exit_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
-        """出场逻辑 — 由结构反转触发。"""
-        exit_long = ~dataframe["trend_up_1d"].fillna(True)
-        dataframe.loc[exit_long, "exit_long"] = 1
-
-        exit_short = dataframe["trend_up_1d"].fillna(False)
-        dataframe.loc[exit_short, "exit_short"] = 1
-
         return dataframe
 
-    # =====================
+    # ================================================================
-    # 动态止损 — 纯价格结构（基于Swing Point）
+    # 自定义止损：支撑/阻力外侧，ATR*1.5 缓冲
-    # =====================
+    # ================================================================
 
     def custom_stoploss(
         self,
@@ -405,51 +321,103 @@ class StructureFlowStrategyV22b(IStrategy):
         after_fill: bool,
         **kwargs,
     ) -> float:
-        """
-        止损逻辑：完全基于价格结构，零指标（与v1.6相同）。
-        """
         dataframe, _ = self.dp.get_analyzed_dataframe(pair, self.timeframe)
         if dataframe is None or len(dataframe) == 0:
             return -0.02 if not trade.is_short else 0.02
 
         last = dataframe.iloc[-1]
+        atr_mult = self.atr_stop_mult.value / 10.0
 
         if not trade.is_short:
-            support = last.get("support_4h", np.nan)
+            support = last.get("range_support", np.nan)
+            atr = last.get("atr", np.nan)
+
             if pd.isna(support) or support <= 0:
                 return -0.02
-            sl_price = support * 0.999
+
+            if pd.notna(atr) and atr > 0:
+                sl_price = support - atr * atr_mult
+            else:
+                sl_price = support * 0.985
+
             sl_ratio = (sl_price / current_rate) - 1.0
-            return max(sl_ratio, -0.15)
+            return max(sl_ratio, -0.20)
         else:
-            resistance = last.get("resistance_4h", np.nan)
+            resistance = last.get("range_resistance", np.nan)
+            atr = last.get("atr", np.nan)
+
             if pd.isna(resistance) or resistance <= 0:
                 return 0.02
-            sl_price = resistance * 1.001
-            sl_ratio = 1.0 - (sl_price / current_rate)
-            return min(sl_ratio, 0.15)
 
-    # =====================
+            if pd.notna(atr) and atr > 0:
+                sl_price = resistance + atr * atr_mult
+            else:
+                sl_price = resistance * 1.015
+
+            sl_ratio = 1.0 - (sl_price / current_rate)
+            return min(sl_ratio, 0.20)
+
+    # ================================================================
+    # 自定义止盈：区间70%
+    # ================================================================
+
+    def custom_exit(
+        self,
+        pair: str,
+        trade: Trade,
+        current_time: datetime,
+        current_rate: float,
+        current_profit: float,
+        **kwargs,
+    ) -> str | None:
+        tp_pct = self.take_profit_pct.value / 100.0
+
+        dataframe, _ = self.dp.get_analyzed_dataframe(pair, self.timeframe)
+        if dataframe is None or len(dataframe) == 0:
+            return None
+
+        last = dataframe.iloc[-1]
+
+        if not trade.is_short:
+            support = last.get("range_support", np.nan)
+            resistance = last.get("range_resistance", np.nan)
+
+            if pd.notna(support) and pd.notna(resistance) and resistance > support:
+                zone_height = (resistance - support) / support
+                tp_target = zone_height * tp_pct
+                if current_profit >= tp_target:
+                    return "take_profit"
+        else:
+            support = last.get("range_support", np.nan)
+            resistance = last.get("range_resistance", np.nan)
+
+            if pd.notna(support) and pd.notna(resistance) and resistance > support:
+                zone_height = (resistance - support) / resistance
+                tp_target = zone_height * tp_pct
+                if current_profit >= tp_target:
+                    return "take_profit"
+
+        return None
+
+    # ================================================================
     # Plot config
-    # =====================
+    # ================================================================
 
     @staticmethod
     def plot_config() -> dict:
         return {
             "main_plot": {
-                "support_4h": {"color": "green", "type": "line"},
+                "range_support": {"color": "green", "type": "line"},
-                "resistance_4h": {"color": "red", "type": "line"},
+                "range_resistance": {"color": "red", "type": "line"},
             },
             "subplots": {
-                "signals": {
+                "range": {
-                    "bullish_pinbar": {"color": "green", "type": "scatter"},
+                    "is_ranging": {"color": "blue", "type": "line"},
-                    "bearish_pinbar": {"color": "red", "type": "scatter"},
+                    "zone_width_pct": {"color": "purple", "type": "line"},
                 },
-                "filters": {
+                "position": {
-                    "support_alive_4h": {"color": "green", "type": "line"},
+                    "dist_to_support": {"color": "green", "type": "line"},
-                    "resistance_alive_4h": {"color": "red", "type": "line"},
+                    "dist_to_resistance": {"color": "red", "type": "line"},
-                    "strong_uptrend_4h": {"color": "blue", "type": "line"},
-                    "strong_downtrend_4h": {"color": "orange", "type": "line"},
                 },
             },
         }