This commit is contained in:
dosangyoon
2022-08-11 21:08:00 +09:00
parent 19716581b5
commit c310e0a89a
2 changed files with 23 additions and 17 deletions

View File

@@ -199,7 +199,7 @@ class BuySellChecker:
# "15:00" 까지만 매수
return buy, weight
if data["macd"][i] < -25:
if i > 380 + 30 and data["macd"][i] < -25:
if data["avg3"][i] > min(data["avg5"][i], data["avg10"][i], data["avg20"][i]):
buy = data["high"][i]
if i < 381 + 30:
@@ -208,13 +208,13 @@ class BuySellChecker:
weight = 5
return buy, weight
if data["macd"][i] < -5 and data["rsi"][i] < 30:
if i > 380 + 30 and data["macd"][i] < -5 and data["rsi"][i] < 30:
if data["avg3"][i] > min(data["avg5"][i], data["avg10"][i], data["avg20"][i]):
buy = int((data["open"][i] + data["close"][i]) / 2)
weight = 2
return buy, weight
if data["slow_k"][i] < 10 and data["rsi"][i] < 30:
if i > 380 + 30 and data["slow_k"][i] < 10 and data["rsi"][i] < 30:
if data["slow_k"][i - 1] < min(data["slow_k"][i - 2], data["slow_k"][i]):
if data["avg3"][i] > min(data["avg5"][i], data["avg10"][i], data["avg20"][i]):
buy = int((data["open"][i] + data["close"][i]) / 2)
@@ -223,16 +223,19 @@ class BuySellChecker:
# 3분선이 5분선이 돌파가 이전보다 높은 경우 매수
if data["avg3"][i - 1] < data["avg5"][i - 1] and data["avg3"][i] > data["avg5"][i]:
max_avg3 = 0
p_avg3 = 999999
for c in range(1, 50):
if max_avg3 < data["avg5"][i - c]:
max_avg3 = data["avg5"][i - c]
if data["avg3"][i-c-1] < data["avg5"][i-c-1] and data["avg3"][i-c] > data["avg5"][i-c]:
p_avg3 = data["avg3"][i-c]
break
if data["avg3"][i] > p_avg3:
if i == 382 or i == 383:
if data["close"][i] != data["high"][i]:
return -1, -1
if data["slow_k"][i] < 30 or i < 381 + 10:
if data["avg3"][i] > p_avg3 and max_avg3 < data["avg3"][i]:
if max(data["avg3"][i-3], data["avg3"][i-2], data["avg3"][i-1]) - min(data["avg3"][i-3], data["avg3"][i-2], data["avg3"][i-1]) > 1:
if i == 382 or i == 383:
if data["close"][i] != data["high"][i]:
return -1, -1
buy = int((data["open"][i] + data["close"][i]) / 2)
weight = 1
return buy, weight
@@ -548,7 +551,7 @@ class BuySellChecker:
# "15:00" 까지만 매수
return buy, weight
if data["macd"][i] < -25:
if i > 380 + 30 and data["macd"][i] < -25:
if data["avg3"][i] > min(data["avg5"][i], data["avg10"][i], data["avg20"][i]):
buy = data["high"][i]
if i < 381 + 30:
@@ -557,13 +560,13 @@ class BuySellChecker:
weight = 5
return buy, weight
if data["macd"][i] < -5 and data["rsi"][i] < 30:
if i > 380 + 30 and data["macd"][i] < -5 and data["rsi"][i] < 30:
if data["avg3"][i] > min(data["avg5"][i], data["avg10"][i], data["avg20"][i]):
buy = int((data["open"][i] + data["close"][i]) / 2)
weight = 2
return buy, weight
if data["slow_k"][i] < 10 and data["rsi"][i] < 30:
if i > 380 + 30 and data["slow_k"][i] < 10 and data["rsi"][i] < 30:
if data["slow_k"][i - 1] < min(data["slow_k"][i - 2], data["slow_k"][i]):
if data["avg3"][i] > min(data["avg5"][i], data["avg10"][i], data["avg20"][i]):
buy = int((data["open"][i] + data["close"][i]) / 2)