From 3a6bb3453e5f954dde7a7f121ddc3da2f3334091 Mon Sep 17 00:00:00 2001 From: dosangyoon Date: Fri, 8 Jul 2022 01:17:48 +0900 Subject: [PATCH] init --- hts/BuySellChecker.py | 6 ++++-- hts/Simulation.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hts/BuySellChecker.py b/hts/BuySellChecker.py index b274787..e3b87d6 100644 --- a/hts/BuySellChecker.py +++ b/hts/BuySellChecker.py @@ -321,6 +321,8 @@ class BuySellChecker: avg5 = [item[0] for item in avg5_list] avg10_list = close_df.rolling(window=10).mean().fillna(close[0]).values.tolist() avg10 = [item[0] for item in avg10_list] + avg20_list = close_df.rolling(window=20).mean().fillna(close[0]).values.tolist() + avg20 = [item[0] for item in avg20_list] avg30_list = close_df.rolling(window=30).mean().fillna(close[0]).values.tolist() avg30 = [item[0] for item in avg30_list] avg60_list = close_df.rolling(window=60).mean().fillna(close[0]).values.tolist() @@ -346,7 +348,7 @@ class BuySellChecker: STOCK = [] for i in range(len(open)): STOCK.append({'volume': vol[i], 'close': close[i], 'open': open[i], 'high': high[i], 'low': low[i], - 'avg3': avg3[i], 'avg5': avg5[i],'avg10': avg10[i],'avg30': avg30[i],'avg60': avg60[i]}) + 'avg3': avg3[i], 'avg5': avg5[i],'avg10': avg10[i],'avg20': avg20[i],'avg30': avg30[i],'avg60': avg60[i]}) # stochastic 계산 stochastic_df = self.stochastic.apply(STOCK, n=30, m=5, t=5) @@ -370,7 +372,7 @@ class BuySellChecker: temp = {"date": point_temp, "open": open, "high": high, "low": low, "close": close, "volume": vol, "upper": upper, "lower": lower, - "avg3": avg3, "avg5": avg5, "avg10": avg10, "avg30": avg30, "avg60": avg60, + "avg3": avg3, "avg5": avg5, "avg10": avg10, "avg20": avg20, "avg30": avg30, "avg60": avg60, "macd": macd, "macds": macds, "macdo": macdo, "fast_k": fast_k, "slow_k": slow_k, "slow_d": slow_d, "rsi": rsi, "rsis": rsis} diff --git a/hts/Simulation.py b/hts/Simulation.py index e0113b5..f2b0596 100644 --- a/hts/Simulation.py +++ b/hts/Simulation.py @@ -63,6 +63,7 @@ class Simulation: 'avg3': 'float', 'avg5': 'float', 'avg10': 'float', + 'avg20': 'float', 'avg30': 'float', 'avg60': 'float', 'fast_k': 'float', @@ -93,8 +94,9 @@ class Simulation: upper = go.Scatter(x=data['date'], y=data["upper"], name="upper", line_color='#000000') lower = go.Scatter(x=data['date'], y=data["lower"], name="lower", line_color='#000000') avg3 = go.Scatter(x=data['date'], y=data["avg3"], name="avg3", line_color='#000000') - avg5 = go.Scatter(x=data['date'], y=data["avg5"], name="avg5", line_color='#00FF00') + avg5 = go.Scatter(x=data['date'], y=data["avg5"], name="avg5", line_color='#0A9127') avg10 = go.Scatter(x=data['date'], y=data["avg10"], name="avg10", line_color='#ff00ff') + avg20 = go.Scatter(x=data['date'], y=data["avg20"], name="avg20", line_color='#1469F4') avg30 = go.Scatter(x=data['date'], y=data["avg30"], name="avg30", line_color='#FFA500') #avg60 = go.Scatter(x=data['date'], y=data["avg60"], name="avg60", line_color='#008000') @@ -112,7 +114,7 @@ class Simulation: rsi_line = go.Scatter(x=data['date'], y=data["rsi"], mode='lines', name='rsi') rsis_line = go.Scatter(x=data['date'], y=data["rsis"], mode='lines', name='rsis') - candle_data = [candle_stick, upper, lower, avg3, avg5, avg10, avg30, buy_check, sell_check] + candle_data = [candle_stick, upper, lower, avg3, avg5, avg10, avg20, avg30, buy_check, sell_check] volume_data = [volume_line] macd_data = [macd_line, macd_s_line, macd_o_line] stochastic_data = [slow_k_line, slow_d_line]