This commit is contained in:
dsyoon
2024-11-15 21:25:18 +09:00
parent 8b5a55d78c
commit a9ffc0ebbb
2 changed files with 5 additions and 11 deletions

View File

@@ -196,7 +196,7 @@ class AnalyzerSqlite:
trend = go.Scatter(x=ymd, y=trend, name="trend", line_color='#574e4c') trend = go.Scatter(x=ymd, y=trend, name="trend", line_color='#574e4c')
candle_data = [candle_stick, trend, avg5, avg20, avg60, avg120, avg240, avg480, bolinger_upper, bolinger_lower, changeLine, baseLine, laggingSpan] candle_data = [candle_stick, trend, avg5, avg20, avg60, avg120, avg240, avg480, bolinger_upper, bolinger_lower, changeLine, baseLine, laggingSpan, leadingSpan1, leadingSpan2]
#candle_data = [candle_stick, trend, avg5, avg10, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, env_upper, env_lower, changeLine, baseLine] #candle_data = [candle_stick, trend, avg5, avg10, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, env_upper, env_lower, changeLine, baseLine]
#candle_data = [avg5, avg20, trend, changeLine, baseLine, laggingSpan, candle_stick] #candle_data = [avg5, avg20, trend, changeLine, baseLine, laggingSpan, candle_stick]

View File

@@ -735,22 +735,16 @@ class Common:
return check_buy return check_buy
# 체크 1 # 체크 1
min_open_close_1 = min(stock_daily['open'][1], stock_daily['close'][1]) if (stock_daily['ichimokucloud_leadingSpan1'][1] < stock_daily['close'][1] <= stock_daily['ichimokucloud_leadingSpan2'][1] and
min_open_close = min(stock_daily['open'][0], stock_daily['close'][0]) stock_daily['ichimokucloud_leadingSpan1'][0] < stock_daily['ichimokucloud_leadingSpan2'][0] < stock_daily['close'][0]):
if (stock_daily['ichimokucloud_leadingSpan1'][1] < min_open_close_1 <= stock_daily['ichimokucloud_leadingSpan2'][1] and
stock_daily['ichimokucloud_leadingSpan1'][0] < stock_daily['ichimokucloud_leadingSpan2'][0] < min_open_close):
check_buy = True check_buy = True
# 체크 2 # 체크 2
for c in range(0, 3): for c in range(0, 3):
min_open_close_1 = stock_daily['close'][(c+1)]
min_open_close = stock_daily['close'][c]
if ( if (
# 선행1 (상승) < 종가 혹은 시가 < 선행2 (하락) 였는데, 오늘은 선행1 (상승) < 선행2 (하락) < 종가 혹은 시가 # 선행1 (상승) < 종가 혹은 시가 < 선행2 (하락) 였는데, 오늘은 선행1 (상승) < 선행2 (하락) < 종가 혹은 시가
(min_open_close_1 <= max(stock_daily['ichimokucloud_leadingSpan1'][(c+1)], stock_daily['ichimokucloud_leadingSpan2'][(c+1)])) and (stock_daily['close'][(c+1)] <= max(stock_daily['ichimokucloud_leadingSpan1'][(c+1)], stock_daily['ichimokucloud_leadingSpan2'][(c+1)])) and
(max(stock_daily['ichimokucloud_leadingSpan1'][c], stock_daily['ichimokucloud_leadingSpan2'][c]) < min_open_close) (max(stock_daily['ichimokucloud_leadingSpan1'][c], stock_daily['ichimokucloud_leadingSpan2'][c]) < stock_daily['close'][(c)])
): ):
check_buy = True check_buy = True
break break