diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index 69c97a9..caf48a2 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -732,13 +732,13 @@ class Common: ### 주가가 구름대를 상향 돌파함 # 오늘: max(선행 1,2) < 시가 < 종가, 어제 종가 < 오늘 종가 - if (max(stock_daily['leadingSpan1'].iloc[0], stock_daily['leadingSpan2'].iloc[0]) < stock_daily['open'].iloc[0] < stock_daily['close'].iloc[0]) and (stock_daily['close'].iloc[1] < stock_daily['close'].iloc[0]): + if (max(stock_daily['ichimokucloud_leadingSpan1'].iloc[0], stock_daily['ichimokucloud_leadingSpan2'].iloc[0]) < stock_daily['open'].iloc[0] < stock_daily['close'].iloc[0]) and (stock_daily['close'].iloc[1] < stock_daily['close'].iloc[0]): # 어제: 시가 < 종가 <= max(스팬1,2) 이거나 # 어제: 시가 < max(스팬1,2) < 종가 이거나 # 어제: 시가 < 종가 < max(스팬1,2) 임 - if ((stock_daily['open'].iloc[1] < stock_daily['close'].iloc[1] <= max(stock_daily['leadingSpan1'].iloc[1], stock_daily['leadingSpan2'].iloc[1])) or - (stock_daily['open'].iloc[1] < max(stock_daily['leadingSpan1'].iloc[1], stock_daily['leadingSpan2'].iloc[1]) < stock_daily['close'].iloc[1]) or - (stock_daily['open'].iloc[1] < stock_daily['close'].iloc[1]) < max(stock_daily['leadingSpan1'].iloc[1], stock_daily['leadingSpan2'].iloc[1])): + if ((stock_daily['open'].iloc[1] < stock_daily['close'].iloc[1] <= max(stock_daily['ichimokucloud_leadingSpan1'].iloc[1], stock_daily['ichimokucloud_leadingSpan2'].iloc[1])) or + (stock_daily['open'].iloc[1] < max(stock_daily['ichimokucloud_leadingSpan1'].iloc[1], stock_daily['ichimokucloud_leadingSpan2'].iloc[1]) < stock_daily['close'].iloc[1]) or + (stock_daily['open'].iloc[1] < stock_daily['close'].iloc[1]) < max(stock_daily['ichimokucloud_leadingSpan1'].iloc[1], stock_daily['ichimokucloud_leadingSpan2'].iloc[1])): check_buy = True return check_buy