From 5421f799aee2d972bcbc3a1975edf594e4819f73 Mon Sep 17 00:00:00 2001 From: dsyoon Date: Fri, 15 Nov 2024 20:09:07 +0900 Subject: [PATCH] init --- stock/analysis/Common.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index 3824567..ea1f487 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -731,22 +731,22 @@ class Common: check_buy = False # 체크 1 - min_open_close_1 = min(stock_daily['open'].iloc[-2], stock_daily['close'].iloc[-2]) - min_open_close = min(stock_daily['open'].iloc[-1], stock_daily['close'].iloc[-1]) + min_open_close_1 = min(stock_daily['open'].iloc[1], stock_daily['close'].iloc[1]) + min_open_close = min(stock_daily['open'].iloc[0], stock_daily['close'].iloc[0]) - if (stock_daily['leadingSpan1'].iloc[-2] < min_open_close_1 <= stock_daily['leadingSpan2'].iloc[-2] and - stock_daily['leadingSpan1'].iloc[-1] < stock_daily['leadingSpan2'].iloc[-1] < min_open_close): + if (stock_daily['leadingSpan1'].iloc[1] < min_open_close_1 <= stock_daily['leadingSpan2'].iloc[1] and + stock_daily['leadingSpan1'].iloc[0] < stock_daily['leadingSpan2'].iloc[0] < min_open_close): check_buy = True # 체크 2 - for c in range(1, 3): - min_open_close_1 = stock_daily['close'].iloc[-(c+1)] - min_open_close = stock_daily['close'].iloc[-c] + for c in range(0, 3): + min_open_close_1 = stock_daily['close'].iloc[(c+1)] + min_open_close = stock_daily['close'].iloc[c] if ( # 선행1 (상승) < 종가 혹은 시가 < 선행2 (하락) 였는데, 오늘은 선행1 (상승) < 선행2 (하락) < 종가 혹은 시가 - (min_open_close_1 <= max(stock_daily['leadingSpan1'].iloc[-(c+1)], stock_daily['leadingSpan2'].iloc[-(c+1)])) and - (max(stock_daily['leadingSpan1'].iloc[-c], stock_daily['leadingSpan2'].iloc[-c]) < min_open_close) + (min_open_close_1 <= max(stock_daily['leadingSpan1'].iloc[(c+1)], stock_daily['leadingSpan2'].iloc[(c+1)])) and + (max(stock_daily['leadingSpan1'].iloc[c], stock_daily['leadingSpan2'].iloc[c]) < min_open_close) ): check_buy = True break