From eddc6a14e2fe22ba91ab5c1346e2a3a629790692 Mon Sep 17 00:00:00 2001 From: dsyoon Date: Mon, 12 Feb 2024 23:50:53 +0900 Subject: [PATCH] init --- stock/analysis/AnalyzerSqlite.py | 2 +- stock/analysis/Common.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stock/analysis/AnalyzerSqlite.py b/stock/analysis/AnalyzerSqlite.py index 136eebd..a68a7bd 100644 --- a/stock/analysis/AnalyzerSqlite.py +++ b/stock/analysis/AnalyzerSqlite.py @@ -171,7 +171,7 @@ class AnalyzerSqlite: trend_k = list(reversed(stock['trend_k'])) # general - candle_stick = go.Candlestick(x=ymd, open=open, high=high, low=low, close=close, increasing_line_color='red', decreasing_line_color='blue') + candle_stick = go.Candlestick(x=ymd, open=open, high=high, low=low, close=close, increasing_line_color='red', decreasing_line_color='blue', name='candle') #avg3 = go.Scatter(x=ymd, y=avg3, name="avg3", line_color='#085F1B') #avg4 = go.Scatter(x=ymd, y=avg4, name="avg4", line_color='#085F1B') avg5 = go.Scatter(x=ymd, y=avg5, name="avg5", line_color='#ff0000') diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index 21a710a..a3d4b9b 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -570,8 +570,7 @@ class Common: if len(stock['trend']) < 10: return check - if np.average(stock['trend'][1:21]) < stock['trend'][0] and np.average(stock['trend_k'][1:21]) < \ - stock['trend_k'][0]: + if np.average(stock['trend'][1:21]) < stock['trend'][0] and np.average(stock['trend_k'][1:21]) < stock['trend_k'][0]: # 1일 트렌드가 시그널 위로 상승 돌파 할 때 if stock['trend_k'][1] <= stock['trend_s'][1] and stock['trend_s'][0] < stock['trend_k'][0]: @@ -582,16 +581,14 @@ class Common: # 추세가 상승 중일 때 매수의 관점 (소추세가 하락해 있을 때 매수의 기회) # macd가 0 이하에서 macd 매수 체크 (macd가 macds를 상승 돌파) - if stock['macd'][1] < stock['macds'][1] and stock['macds'][0] < stock['macd'][0] and stock['macd'][ - 0] < np.min(stock['macd'][1:]) * 0.5: + if stock['macd'][1] < stock['macds'][1] and stock['macds'][0] < stock['macd'][0] and stock['macd'][0] < np.min(stock['macd'][1:]) * 0.5: if stock['avg120'][0] < stock['trend_k'][0]: # slow_k가 50이하에서 상승 중이고 slow_d를 상승 돌파 할 때 check = True # slow_k가 10이하에서 상승 중이고 slow_d를 상승 돌파 할 때 if stock['slow_k'][0] is not None and stock['slow_k'][1] is not None: - if stock['slow_k'][1] < stock['slow_d'][1] and stock['slow_d'][0] < stock['slow_k'][0] and \ - stock['slow_k'][0] < 10: + if stock['slow_k'][1] < stock['slow_d'][1] and stock['slow_d'][0] < stock['slow_k'][0] and stock['slow_k'][0] < 10: if stock['avg120'][0] < stock['trend_k'][0]: check = True