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 # 线段内的中枢