diff --git a/stockpredictor/analysis/AnalyzerSqlite.py b/stockpredictor/analysis/AnalyzerSqlite.py index 553f11f..be0c47b 100644 --- a/stockpredictor/analysis/AnalyzerSqlite.py +++ b/stockpredictor/analysis/AnalyzerSqlite.py @@ -424,24 +424,23 @@ class AnalyzerSqlite: po.write_html(fig, file=fileName, auto_open=False) return - def checkVolume(self, p_volume, p_close, volume, close): - if p_close < close: - if 0 < p_volume <= 10000 and p_volume * 700 < volume: - return True - if 10000 < p_volume <= 50000 and p_volume * 40 < volume: - return True - if 50000 < p_volume <= 100000 and p_volume * 25 < volume: - return True - if 100000 < p_volume <= 200000 and p_volume * 15 < volume: - return True - if 200000 < p_volume <= 700000 and p_volume * 13 < volume: - return True - if 700000 < p_volume <= 1000000 and p_volume * 10 < volume: - return True - if 5000000 < p_volume <= 5000000 and p_volume * 5 < volume: - return True - if 5000000 < p_volume and p_volume * 4 < volume: - return True + def checkVolume(self, p_volume, volume): + if 0 < p_volume <= 10000 and p_volume * 700 < volume: + return True + if 10000 < p_volume <= 50000 and p_volume * 40 < volume: + return True + if 50000 < p_volume <= 100000 and p_volume * 25 < volume: + return True + if 100000 < p_volume <= 200000 and p_volume * 15 < volume: + return True + if 200000 < p_volume <= 700000 and p_volume * 13 < volume: + return True + if 700000 < p_volume <= 1000000 and p_volume * 10 < volume: + return True + if 5000000 < p_volume <= 5000000 and p_volume * 5 < volume: + return True + if 5000000 < p_volume and p_volume * 4 < volume: + return True return False # 후보 찾기 @@ -693,7 +692,8 @@ class AnalyzerSqlite: type = "-3_후행스팬_캔들_아래로_내려옴" self.writeFile(type, CODE, NAME, stock, state) - if len(close) > 2 and self.checkVolume(volume[1], close[1], volume[0], close[0]): + if (len(close) > 2 and close[1] < close[0] and open[0] < close[0] and + self.checkVolume(volume[1], volume[0])): type = "1_거래량_상승" self.writeFile(type, CODE, NAME, stock, state)