This commit is contained in:
dsyoon
2023-12-20 22:53:19 +09:00
parent a8d65e58f6
commit 1f0fccd7be
2 changed files with 64 additions and 35 deletions

View File

@@ -178,31 +178,35 @@ class BuySellChecker():
check = False
if 0 < len(BUY_LIST['buy_list']):
"""
if 1.05 < data['disparity_avg20'][i]:
check = True
# 매수한지 3시간 이내라면
if data['ymd'][i] - timedelta(hours=3) < BUY_LIST['buy_list'][-1]['buy_ymd']:
if 1.10 < data['disparity_avg480'][i]:
check = True
if BUY_LIST['disparity']['limit_top_3']['avg20'] < data['disparity_avg20'][i]:
check = True
if 1.15 < data['disparity_avg1500'][i]:
check = True
"""
if BUY_LIST['disparity']['limit_top_3']['avg60'] < data['disparity_avg60'][i]:
check = True
if BUY_LIST['disparity']['limit_top_3']['avg20'] < data['disparity_avg20'][i]:
check = True
if BUY_LIST['disparity']['limit_top_5']['avg480'] < data['disparity_avg480'][i]:
check = True
if BUY_LIST['disparity']['limit_top_3']['avg60'] < data['disparity_avg60'][i]:
check = True
if BUY_LIST['disparity']['limit_top_10']['avg1500'] < data['disparity_avg1500'][i]:
check = True
else:
# 매수한지 3시간 이후라면
if BUY_LIST['buy_list'][-1]['buy_price'] * 1.002 < data['close'][i]:
if BUY_LIST['disparity']['limit_top_5']['avg480'] < data['disparity_avg480'][i]:
check = True
if BUY_LIST['disparity']['limit_top_99']['avg20'] < data['disparity_avg20'][i]:
check = True
if BUY_LIST['disparity']['limit_top_10']['avg1500'] < data['disparity_avg1500'][i]:
check = True
if BUY_LIST['disparity']['limit_top_99']['avg60'] < data['disparity_avg60'][i]:
check = True
# if data['avg1500'][i-1] < data['trend_avg'][i-1] and data['trend_avg'][i] <= data['avg1500'][i]:
# check = True
if BUY_LIST['disparity']['limit_top_99']['avg480'] < data['disparity_avg480'][i]:
check = True
if BUY_LIST['disparity']['limit_top_99']['avg1500'] < data['disparity_avg1500'][i]:
check = True
if check:
sell_price = data['close'][i]