From 2b1b50010843ba34a6da47b90bf55a0d9d97ae85 Mon Sep 17 00:00:00 2001 From: jackyu66git Date: Sat, 12 Sep 2026 02:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=94=E7=A1=AE=E8=AE=A4=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E5=8E=9F=E8=91=97=E5=8F=A3=E5=BE=84=EF=BC=8C=E5=B9=B6=E7=95=99?= =?UTF-8?q?=E4=B8=8B=E4=B8=A5=E6=A0=BC=E7=AC=94=E5=AF=B9=E7=85=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 顶底分型仍用分型自身高低判断重叠；三K盒子那种更严的算法先注释保留。 Co-authored-by: Cursor --- chanlun/pipeline/builders/bi.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/chanlun/pipeline/builders/bi.py b/chanlun/pipeline/builders/bi.py index ba82710..e8b5b1f 100644 --- a/chanlun/pipeline/builders/bi.py +++ b/chanlun/pipeline/builders/bi.py @@ -668,13 +668,22 @@ class BiBuilderMixin: return bi_list def check_top_fx(self, last_bottom, klc): - if (last_bottom.high > klc.pre.low or last_bottom.high > klc.next.low) and (klc.index - last_bottom.index < 100): + #严格笔 + #last_bottom_high = max(last_bottom.high, last_bottom.pre.high, last_bottom.next.high) + #缠论原著笔 + last_bottom_high = last_bottom.high + if (last_bottom_high > klc.pre.low or last_bottom_high > klc.next.low) and (klc.index - last_bottom.index < 100): + #print(klc.end_time, "check_top_fx False") return False return True def check_bottom_fx(self, last_top, klc): - if (last_top.low < klc.pre.high or last_top.low < klc.next.high) and (klc.index - last_top.index < 100): + #严格笔 + #last_top_low = min(last_top.low, last_top.pre.low, last_top.next.low) + #缠论原著笔 + last_top_low = last_top.low + if (last_top_low < klc.pre.high or last_top_low < klc.next.high) and (klc.index - last_top.index < 100): return False return True # 线段内的中枢