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

add new line of code

Browse Source
This commit is contained in:
jackyu66git
2025-09-24 01:42:44 +08:00
parent 81cccb2b7a
commit daa8c25c91
5 changed files with 103 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChanLun.py
+10 -11
View File
@@ -23,6 +23,7 @@ class ChanLun():
time1 = 1
time3 = 3
time5 = 5
time10 = 10
time15 = 15
time30 = 30
time60 = 60
@@ -32,7 +33,7 @@ class ChanLun():
time8h = 480
time12h = 720
time1d = 1440
timeframes = [time1, time3, time5, time15, time30, time60]
timeframes = [time1, time3, time5, time10, time15, time30, time60]
tf_df_dict = {}
def init_data(self, dataframe, ticker_indicator):
for timeframe in self.timeframes:
@@ -52,16 +53,14 @@ class ChanLun():
return klu_list, klc_list, bi_list
def check_fx(self, klc):
if klc.pre and klc.next:
if klc.high > klc.pre.high and klc.high > klc.next.high:
if klc.signal > 0 and klc.macd > klc.signal:
klc.set_fx(Chan_FX_TYPE.TOP)
#print(klc.start_time, klc.end_time,klc.next.start_time, klc.next.end_time,klc.fx, "TOP")
return Chan_FX_TYPE.TOP
elif klc.low < klc.pre.low and klc.low < klc.next.low:
if klc.signal < 0 and klc.macd < klc.signal:
klc.set_fx(Chan_FX_TYPE.BOTTOM)
#print(klc.start_time, klc.end_time,klc.next.start_time, klc.next.end_time,klc.fx, "BOTTOM")
return Chan_FX_TYPE.BOTTOM
if klc.high > klc.pre.high and klc.high > klc.next.high and klc.ema24 > klc.ema52:
klc.set_fx(Chan_FX_TYPE.TOP)
#print(klc.start_time, klc.end_time,klc.next.start_time, klc.next.end_time,klc.fx, "TOP")
return Chan_FX_TYPE.TOP
elif klc.low < klc.pre.low and klc.low < klc.next.low and klc.ema24 < klc.ema52:
klc.set_fx(Chan_FX_TYPE.BOTTOM)
#print(klc.start_time, klc.end_time,klc.next.start_time, klc.next.end_time,klc.fx, "BOTTOM")
return Chan_FX_TYPE.BOTTOM
return Chan_FX_TYPE.UNKNOWN
def add_indicators(self, df):
fast = 12