From a9ffc0ebbb863e6e8e6a571a04e1036b0a96638f Mon Sep 17 00:00:00 2001 From: dsyoon Date: Fri, 15 Nov 2024 21:25:18 +0900 Subject: [PATCH] init --- AnalyzerSqlite.py | 2 +- stock/analysis/Common.py | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/AnalyzerSqlite.py b/AnalyzerSqlite.py index ec1fb4c..863bb7d 100644 --- a/AnalyzerSqlite.py +++ b/AnalyzerSqlite.py @@ -196,7 +196,7 @@ class AnalyzerSqlite: 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 = [avg5, avg20, trend, changeLine, baseLine, laggingSpan, candle_stick] diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index 00068c4..ecec471 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -735,22 +735,16 @@ class Common: return check_buy # 체크 1 - min_open_close_1 = min(stock_daily['open'][1], stock_daily['close'][1]) - min_open_close = min(stock_daily['open'][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): + if (stock_daily['ichimokucloud_leadingSpan1'][1] < stock_daily['close'][1] <= stock_daily['ichimokucloud_leadingSpan2'][1] and + stock_daily['ichimokucloud_leadingSpan1'][0] < stock_daily['ichimokucloud_leadingSpan2'][0] < stock_daily['close'][0]): check_buy = True # 체크 2 for c in range(0, 3): - min_open_close_1 = stock_daily['close'][(c+1)] - min_open_close = stock_daily['close'][c] - if ( # 선행1 (상승) < 종가 혹은 시가 < 선행2 (하락) 였는데, 오늘은 선행1 (상승) < 선행2 (하락) < 종가 혹은 시가 - (min_open_close_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) + (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]) < stock_daily['close'][(c)]) ): check_buy = True break