From 684c035eff4ca0679b0da015d10eecceac865956 Mon Sep 17 00:00:00 2001 From: jackyu66git Date: Sat, 30 Aug 2025 01:43:45 +0800 Subject: [PATCH] complete histset recognition --- ChanMACD.py | 2 -- ChanMACDHistSet.py | 9 ++++++++- ChanMACDUnitTF.py | 6 +++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChanMACD.py b/ChanMACD.py index bf8f01a..fc4383d 100644 --- a/ChanMACD.py +++ b/ChanMACD.py @@ -102,11 +102,9 @@ class ChanMACD(): else: last_unittf.add_klu(klu) last_seg.add_klu(klu) - last_histset.add_klu(klu) else: last_unittf.add_klu(klu) last_seg.add_klu(klu) - last_histset.add_klu(klu) # 3) 直方图集合(基于当前 unittf) if klu.macdhist >= 0: if last_histset and last_histset.histset_dir == Chan_MACDHISTSET_DIR.ABOVE: diff --git a/ChanMACDHistSet.py b/ChanMACDHistSet.py index 138fd2b..11d371e 100644 --- a/ChanMACDHistSet.py +++ b/ChanMACDHistSet.py @@ -44,9 +44,16 @@ class ChanMACDHistSet(): self.klu_list.append(klu) self.area += klu.macdhist def set_end_klu(self, end_klu): - self.add_klu(end_klu) self.end_klu = end_klu self.end_time = end_klu.time + """ + if self.div_klu: + print(self.start_time, self.peak_klu.time, self.div_klu.time, self.klu_list[-1].time, len(self.klu_list), self.histset_dir) + elif self.peak_klu: + print(self.start_time, "Peak:", self.peak_klu.time, self.klu_list[-1].time, len(self.klu_list), self.histset_dir) + else: + print(self.start_time, "None", self.klu_list[-1].time, len(self.klu_list), self.histset_dir) + """ def find_peak_from(self, from_klu): peak_klu = None if from_klu in self.klu_list: diff --git a/ChanMACDUnitTF.py b/ChanMACDUnitTF.py index b9786ee..a9c35b3 100644 --- a/ChanMACDUnitTF.py +++ b/ChanMACDUnitTF.py @@ -38,4 +38,8 @@ class ChanMACDUnitTF(): self.add_klu(end_klu) self.end_type = end_type self.end_klu = end_klu - self.end_time = end_klu.time \ No newline at end of file + self.end_time = end_klu.time + if self.peak_klu: + print(self.start_klu.time, self.peak_klu.time) + else: + print("None", len(self.histset_list)) \ No newline at end of file