diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index 307410e..8daa440 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -319,7 +319,7 @@ class Common: # 그저께 시가보다 어제의 시가가, 어제의 시가보다는 오늘의 시가가 높다. if (stochastic[i-1]['slow_k'] < stochastic[i-1]['slow_d'] and stochastic[i]['slow_d'] < stochastic[i]['slow_k']): if (stochastic[i - 1]['slow_k'] < 20 and stochastic[i]['slow_k'] < 30): - if ((stock[i-3]['close'] < ichimoku[i-3]['leadingSpan1'] or stock[i-2]['close'] < ichimoku[i-2]['leadingSpan1'] or stock[i-1]['close'] < ichimoku[i-1]['leadingSpan1']) and ichimoku[i-1]['leadingSpan1'] < stock[i-1]['high']): + if ((stock[i-3]['close'] < ichimoku[i-3]['ichimokucloud_leadingSpan1'] or stock[i-2]['close'] < ichimoku[i-2]['ichimokucloud_leadingSpan1'] or stock[i-1]['close'] < ichimoku[i-1]['ichimokucloud_leadingSpan1']) and ichimoku[i-1]['ichimokucloud_leadingSpan1'] < stock[i-1]['high']): if stock[i-2]['open'] < stock[i-1]['open'] < stock[i]['open']: return "STOCHASTIC#1_" @@ -734,8 +734,8 @@ class Common: min_open_close_1 = min(stock_daily['open'][1], stock_daily['close'][1]) min_open_close = min(stock_daily['open'][0], stock_daily['close'][0]) - if (stock_daily['leadingSpan1'][1] < min_open_close_1 <= stock_daily['leadingSpan2'][1] and - stock_daily['leadingSpan1'][0] < stock_daily['leadingSpan2'][0] < min_open_close): + if (stock_daily['ichimokucloud_leadingSpan1'][1] < min_open_close_1 <= stock_daily['ichimokucloud_leadingSpan2'][1] and + stock_daily['ichimokucloud_leadingSpan1'][0] < stock_daily['ichimokucloud_leadingSpan2'][0] < min_open_close): check_buy = True # 체크 2 @@ -745,8 +745,8 @@ class Common: if ( # 선행1 (상승) < 종가 혹은 시가 < 선행2 (하락) 였는데, 오늘은 선행1 (상승) < 선행2 (하락) < 종가 혹은 시가 - (min_open_close_1 <= max(stock_daily['leadingSpan1'][(c+1)], stock_daily['leadingSpan2'][(c+1)])) and - (max(stock_daily['leadingSpan1'][c], stock_daily['leadingSpan2'][c]) < min_open_close) + (min_open_close_1 <= max(stock_daily['ichimokucloud_leadingSpan1'][(c+1)], stock_daily['ichimokucloud_leadingSpan2'][(c+1)])) and + (max(stock_daily['ichimokucloud_leadingSpan1'][c], stock_daily['ichimokucloud_leadingSpan2'][c]) < min_open_close) ): check_buy = True break