From 3c360ea35b40f08cac7ce1762c98245e76d8e19d Mon Sep 17 00:00:00 2001 From: jackyu66git Date: Sat, 13 Sep 2025 02:59:48 +0800 Subject: [PATCH] =?UTF-8?q?CD=E9=87=8D=E6=96=B0=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChanKLC.py | 4 ++-- ChanMACDHistSet.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChanKLC.py b/ChanKLC.py index 7f78429..020afc1 100644 --- a/ChanKLC.py +++ b/ChanKLC.py @@ -79,12 +79,12 @@ class ChanKLC(): if self.fx == Chan_FX_TYPE.TOP: #print(self.end_time, self.fx, self.macd, self.macdhist, len(self.klus)) if self.macdhist < 0 and self.macd > 0: - self.klc_fx_type = Chan_KLC_FX.TOP5 + #self.klc_fx_type = Chan_KLC_FX.TOP5 self.bb_out = True else: if self.fx == Chan_FX_TYPE.BOTTOM: if self.macdhist > 0 and self.macd < 0: - self.klc_fx_type = Chan_KLC_FX.BOTTOM5 + #self.klc_fx_type = Chan_KLC_FX.BOTTOM5 self.bb_out = True def cal_macd_state(self, dir): diff --git a/ChanMACDHistSet.py b/ChanMACDHistSet.py index 4e10807..2570ac1 100644 --- a/ChanMACDHistSet.py +++ b/ChanMACDHistSet.py @@ -70,15 +70,19 @@ class ChanMACDHistSet(): #self.div_count = 0 #self.peak_div_list = [] else: - if klu.pre.macd * klu.pre.macdhist > 0 and klu.pre.signal * klu.pre.macdhist > 0 and abs(klu.pre.signal) > abs(klu.pre.macdhist): + if klu.pre.macd * klu.pre.macdhist > 0 and klu.pre.signal * klu.pre.macdhist > 0: self.peak_div_list.append(klu.pre) self.div_count += 1 - klu.pre.continue_div = True else: self.peak_klu = klu.pre def set_end_klu(self, end_klu): self.end_klu = end_klu self.end_time = end_klu.time + if len(self.peak_div_list) > 0: + klu = self.peak_div_list[-1] + if klu.macd * klu.macdhist > 0: + end_klu.continue_div = True + print(end_klu.time, "Continue Div") if self.start_klu.index == end_klu.index: self.peak_klu = self.start_klu if self.start_klu.index + 1 == end_klu.index: