This commit is contained in:
dsyoon
2023-10-24 21:54:46 +09:00
parent 2bd4c60855
commit 25a6e77125
3 changed files with 14 additions and 11 deletions

View File

@@ -253,22 +253,22 @@ class BuySellChecker:
if stock_code in ("233740"):
if data['macd'][i] < -10:
if data['macd'][i-1] < -30:
if data['macd'][i-1] < data['macds'][i-1] and data['macds'][i] < data['macd'][i]:
buy, weight = data['close'][i], 3
if stock_code in ("122630"):
if data['macd'][i] < -15:
if data['macd'][i-1] < -30:
if data['macd'][i-1] < data['macds'][i-1] and data['macds'][i] < data['macd'][i]:
buy, weight = data['close'][i], 2
if stock_code in ("251340"):
if data['macd'][i] < -3:
if data['macd'][i-1] < -7:
if data['macd'][i-1] < data['macds'][i-1] and data['macds'][i] < data['macd'][i]:
buy, weight = data['close'][i], 3
if stock_code in ("252670"):
if data['macd'][i] < -1:
if data['macd'][i-1] < -4:
if data['macd'][i-1] < data['macds'][i-1] and data['macds'][i] < data['macd'][i]:
buy, weight = data['close'][i], 3
@@ -369,7 +369,8 @@ class BuySellChecker:
slow_d = stochastic_df['slow_d'].values.tolist()
# macd
macd_df = self.macd.apply(STOCK, short=12, long=26, t=9)
#macd_df = self.macd.apply(STOCK, short=12, long=26, t=9)
macd_df = self.macd.apply(STOCK, short=5, long=20, t=5)
macd = macd_df['macd'].values.tolist()
macds = macd_df['macds'].values.tolist()
macdo = macd_df['macdo'].values.tolist()