This commit is contained in:
dsyoon
2023-12-13 00:11:37 +09:00
parent 2617746fb8
commit dbcadb6080

View File

@@ -98,6 +98,7 @@ class BuySellChecker():
df_signal = data_signal.loc[df_tmp] df_signal = data_signal.loc[df_tmp]
si = len(df_signal) - 1 si = len(df_signal) - 1
"""
if isRealTime: if isRealTime:
macds = data['macd'][i-300:i].to_list() macds = data['macd'][i-300:i].to_list()
if 0 < len(macds): if 0 < len(macds):
@@ -116,6 +117,7 @@ class BuySellChecker():
macds_sort = sorted(macds, key=lambda x:x[0], reverse=True) macds_sort = sorted(macds, key=lambda x:x[0], reverse=True)
if data['macd'][i] < macds_sort[0][1] and macds_sort[0][2] < data['close'][i]: if data['macd'][i] < macds_sort[0][1] and macds_sort[0][2] < data['close'][i]:
return buy_ymd, buy_price, buy_count, buy_cut, buy_type return buy_ymd, buy_price, buy_count, buy_cut, buy_type
"""
duration = 3 duration = 3
if sum(data['trend_avg'][i - duration:i]) / duration < data['trend_avg'][i]: if sum(data['trend_avg'][i - duration:i]) / duration < data['trend_avg'][i]: