jack/Chan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改使用未来数据

Browse Source
This commit is contained in:
jackyu66git
2025-09-11 18:39:57 +08:00
parent e75aca320e
commit 4ea4b8cac5
6 changed files with 117 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChanMACDHistSet.py
+15 -14
View File
@@ -1,4 +1,4 @@
from ChanEnum import Chan_MACDHISTSET_DIR, Chan_MACDUNITTF_DIV
from ChanEnum import Chan_MACDHISTSET_DIR, Chan_MACDUNITTF_DIV, Chan_MACD_STATE
class ChanMACDHistSet():
def __init__(self, index, start_time, start_klu, pre_histset, dir):
@@ -52,11 +52,12 @@ class ChanMACDHistSet():
if self.peak_klu:
if abs(klu.pre.macdhist) > abs(self.peak_klu.macdhist):
self.peak_klu = klu.pre
self.div_count = 0
self.peak_div_list = []
#self.div_count = 0
#self.peak_div_list = []
else:
self.peak_div_list.append(klu.pre)
self.div_count += 1
if klu.pre.macd * klu.pre.macdhist > 0:
self.peak_div_list.append(klu.pre)
self.div_count += 1
else:
self.peak_klu = klu.pre
else:
@@ -66,20 +67,18 @@ class ChanMACDHistSet():
if self.peak_klu:
if abs(klu.pre.macdhist) > abs(self.peak_klu.macdhist):
self.peak_klu = klu.pre
self.div_count = 0
self.peak_div_list = []
#self.div_count = 0
#self.peak_div_list = []
else:
self.peak_div_list.append(klu.pre)
self.div_count += 1
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):
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:
klu.continue_div = True
if self.start_klu.index == end_klu.index:
self.peak_klu = self.start_klu
if self.start_klu.index + 1 == end_klu.index:
@@ -94,8 +93,10 @@ class ChanMACDHistSet():
peak = klu
self.peak_klu = peak
peak_str = ""
state_str = ""
for peak_div in self.peak_div_list:
peak_str += f"{peak_div.time}, "
state_str += f"{peak_div.macd_state}, "
#if self.peak_klu and len(self.peak_div_list) > 0:
#print("Continue Div: ",self.start_time, "Peak:", self.peak_klu.time, "Div: ", peak_str, self.histset_dir, self.div_count)
#print("Continue Div: ",self.start_time, "Peak:", self.peak_klu.time, "Div: ", peak_str, state_str)