From 2434e067e22adb8a6107bd4ded4267a09f51b645 Mon Sep 17 00:00:00 2001 From: dsyoon Date: Sat, 26 Aug 2023 06:14:27 +0900 Subject: [PATCH] init --- stock/analysis/AnalyzerSqlite.py | 18 +++++++++--------- stock/analysis/Common.py | 6 ++++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/stock/analysis/AnalyzerSqlite.py b/stock/analysis/AnalyzerSqlite.py index 7f42bfa..a2e743f 100644 --- a/stock/analysis/AnalyzerSqlite.py +++ b/stock/analysis/AnalyzerSqlite.py @@ -166,11 +166,11 @@ class AnalyzerSqlite: candle_stick = go.Candlestick(x=ymd, open=open, high=high, low=low, close=close, increasing_line_color='red', decreasing_line_color='blue') #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='#6C2507') + avg5 = go.Scatter(x=ymd, y=avg5, name="avg5", line_color='#F73B13') #avg6 = go.Scatter(x=ymd, y=avg6, name="avg6", line_color='#698D09') avg10 = go.Scatter(x=ymd, y=avg10, name="avg10", line_color='#8013ED') #avg12 = go.Scatter(x=ymd, y=avg12, name="avg12", line_color='#000000') - avg20 = go.Scatter(x=ymd, y=avg20, name="avg20", line_color='#f84c43') + avg20 = go.Scatter(x=ymd, y=avg20, name="avg20", line_color='#0A86F4') #avg36 = go.Scatter(x=ymd, y=avg36, name="avg36", line_color='#370557') #avg40 = go.Scatter(x=ymd, y=avg40, name="avg40", line_color='#041366') #avg48 = go.Scatter(x=ymd, y=avg48, name="avg48", line_color='#7A1E66') @@ -186,8 +186,8 @@ class AnalyzerSqlite: baseLine = go.Scatter(x=ymd, y=ichimokucloud_baseLine, name="baseLine", line_color='#FF0000') #candle_data = [candle_stick, avg3, avg4, avg5, avg6, avg10, avg12, avg20, avg36, avg40, avg48, avg60, avg120, avg240, avg300, bolinger_upper, bolinger_lower, changeLine, baseLine] - candle_data = [candle_stick, avg5, avg10, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, env_upper, env_lower, changeLine, baseLine] - #candle_data = [candle_stick, bolinger_upper, bolinger_lower, changeLine, baseLine] + #candle_data = [candle_stick, avg5, avg10, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, env_upper, env_lower, changeLine, baseLine] + candle_data = [candle_stick, avg5, avg20, bolinger_upper, bolinger_lower] volume = go.Bar(x=ymd, y=volume, marker_color='red', name="volume") volume_data = [volume] @@ -217,10 +217,10 @@ class AnalyzerSqlite: fig = subplots.make_subplots( rows=6, cols=1, - subplot_titles=("MACD", "스토캐스틱", "RSI", "거래량", "이격도", '캔들'), + subplot_titles=("MACD", "스토캐스틱", "RSI", "이격도", "거래량", '캔들'), # specs=[[{}], [{}], [{}], [{}], [{}], [{}]], shared_xaxes=True, horizontal_spacing=0.03, vertical_spacing=0.01, - row_heights=[200, 200, 200, 200, 200, 1200] + row_heights=[200, 200, 200, 200, 200, 800] ) for trace in macd_data: fig.append_trace(trace, 1, 1) @@ -228,14 +228,14 @@ class AnalyzerSqlite: fig.append_trace(trace, 2, 1) for trace in rsi_data: fig.append_trace(trace, 3, 1) - for trace in volume_data: - fig.append_trace(trace, 4, 1) for trace in disparity_data: + fig.append_trace(trace, 4, 1) + for trace in volume_data: fig.append_trace(trace, 5, 1) for trace in candle_data: fig.append_trace(trace, 6, 1) - fig.update_layout(height=2200, xaxis_rangeslider_visible=False) + fig.update_layout(height=1900, xaxis_rangeslider_visible=False) return fig diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index b7a8284..c289260 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -566,8 +566,10 @@ class Common: # daily_5일선_돌파 def check_5_moving_line(self, stock, type="daily"): - if (stock['close'][1] < stock['avg5'][1] and stock['avg5'][0] <= stock['close'][0]): - return True + if (stock['close'][1] < stock['avg5'][1] and stock['avg5'][0] < stock['close'][0]): + if stock['volume'][1] * 1.5 < stock['volume'][0]: + if stock['open'][0] < stock['close'][0]: + return True return False