diff --git a/stockpredictor/analysis/AnalyzerSqlite.py b/stockpredictor/analysis/AnalyzerSqlite.py index c00beb3..7963a88 100644 --- a/stockpredictor/analysis/AnalyzerSqlite.py +++ b/stockpredictor/analysis/AnalyzerSqlite.py @@ -409,9 +409,6 @@ class AnalyzerSqlite: self.makeDir("참고_1_200일선 돌파") self.makeDir("참고_1_20일선 돌파") self.makeDir("참고_1_60일선 돌파") - self.makeDir("참고_1_거래량 10배 이상") - self.makeDir("참고_1_bolingerband 하단 돌파 상승") - self.makeDir("참고_1_정배열") self.makeDir("참고_1_GoldenCross") self.makeDir("참고_1_모든 라인 돌파") @@ -424,6 +421,9 @@ class AnalyzerSqlite: self.makeDir("1_거래량_상승") self.makeDir("1_코로나_근접") + self.makeDir("5_거래량 10배 이상") + self.makeDir("6_bolingerband 하단 돌파 상승") + self.makeDir("7_정배열") self.makeDir("8_저점_매수관심") self.makeDir("9_저점_매수") @@ -670,23 +670,6 @@ class AnalyzerSqlite: type = "참고_1_GoldenCross" self.writeFile(type, CODE, NAME, top, stock, state) - # 1_거래량 5배 이상 - if len(volume)>2 and volume[0] > volume[1]*10: - type = "참고_1_거래량 10배 이상" - self.writeFile(type, CODE, NAME, top, stock, state) - - # 1_bolingerband 하단 돌파 상승 - if (len(close) > 60 and (bolingerband_lower[0] is not None and bolingerband_lower[1] is not None) and - close[0] > bolingerband_lower[0] and close[1] < bolingerband_lower[1]): - type = "참고_1_bolingerband 하단 돌파 상승" - self.writeFile(type, CODE, NAME, top, stock, state) - - # 1_정배열 - right_arrange = self.common.check_RightArrange(stock) - if right_arrange != "": - type = "참고_1_정배열" - self.writeFile(type, CODE, NAME, top, stock, state) - # 1_모든 라인 돌파 if (len(close) > 50 and close[0] > max(open[0], avg5[0], avg20[0], avg60[0], avg120[0], avg240[0], bolingerband_upper[0], ichimokucloud_changeLine[0], ichimokucloud_baseLine[0]) and @@ -733,6 +716,21 @@ class AnalyzerSqlite: type = "1_코로나_근접" self.writeFile(type, CODE, NAME, top, stock, state) + + if len(volume)>2 and volume[0] > volume[1]*10: + type = "5_거래량 10배 이상" + self.writeFile(type, CODE, NAME, top, stock, state) + + if (len(close) > 60 and (bolingerband_lower[0] is not None and bolingerband_lower[1] is not None) and + close[0] > bolingerband_lower[0] and close[1] < bolingerband_lower[1]): + type = "6_bolingerband 하단 돌파 상승" + self.writeFile(type, CODE, NAME, top, stock, state) + + right_arrange = self.common.check_RightArrange(stock) + if right_arrange != "": + type = "7_정배열" + self.writeFile(type, CODE, NAME, top, stock, state) + if len(close) > 50: if avg5[0]