修复趋势突破

2026-05-23 17:25:54 +08:00
parent ffba2e60e6
commit 24bfb07be1
8 changed files with 83 additions and 10 deletions
@@ -114,6 +114,8 @@ def key_hard_checks_from_rows(
            "breakout_open": open_b,
            "direction": direction,
            "swing4h_pct": swing4h_pct,
+            "amp_min_pct": breakout_amp_min_pct,
+            "amp_max_pct": breakout_amp_max_pct,
        }
    )
    return out
@@ -122,6 +124,8 @@ def key_hard_checks_from_rows(
 def key_hard_lines_from_checks(checks: dict, *, volume_ratio_min: float) -> list[str]:
    breach = float(checks.get("breach_pct") if checks.get("breach_pct") is not None else checks.get("amp_pct") or 0)
    body = float(checks.get("body_pct") or 0)
+    amp_min = float(checks.get("amp_min_pct") or 0.03)
+    amp_max = float(checks.get("amp_max_pct") or 0.5)
    br_hi = checks.get("breakout_high")
    br_lo = checks.get("breakout_low")
    return [
@@ -129,9 +133,9 @@ def key_hard_lines_from_checks(checks: dict, *, volume_ratio_min: float) -> list
        f"突破价位：{'通过' if checks.get('breakout_ok') else '不通过'}（突破K收盘 {round(float(checks.get('breakout_close') or 0), 8)}，关键位 {checks.get('edge_price')}）",
        (
            f"突破越过关键位：{'通过' if checks.get('amp_ok') else '不通过'}"
-            f"（越过 {round(breach, 4)}%，K线实体 {round(body, 4)}%，要求越过 0.03%~0.5%）"
+            f"（越过 {round(breach, 4)}%，K线实体 {round(body, 4)}%，要求越过 {amp_min:g}%~{amp_max:g}%）"
        ),
        f"第二根确认：{'通过' if checks.get('confirm_ok') else '不通过'}（确认收盘 {checks.get('confirm_close')}，关键位 {checks.get('edge_price')}）",
        f"日成交量排名：{'通过' if checks.get('rank_ok') else '不通过'}（{checks.get('rank')}/{checks.get('rank_total')}，要求前30）",
-        f"突破K极值：高 {br_hi}｜低 {br_lo}（止损据此 ± 外扩%）",
+        f"突破K极值：高 {br_hi}｜低 {br_lo}（空→高点+外扩%｜多→低点−外扩%）",
    ]