diff --git a/AnalyzerSqlite.py b/AnalyzerSqlite.py index e314fe3..43573bd 100644 --- a/AnalyzerSqlite.py +++ b/AnalyzerSqlite.py @@ -474,8 +474,8 @@ class AnalyzerSqlite: self.makeDir("daily_이전에_없던_거래량") self.makeDir("daily_final_candidate") self.makeDir("daily_bol_candidate") + self.makeDir('daily_3_5') self.makeDir('daily_5_20') - self.makeDir('daily_20_60') return @@ -594,10 +594,10 @@ class AnalyzerSqlite: self.writeFile(dir_name, CODE, NAME, top, stock_daily, log) result.append({'ticker_code': CODE, 'ticker_name': NAME,'close': stock_daily['close'][0], 'type': '5~20'}) - check = self.common.buy_stock_daily_20_60(stock_daily) + check = self.common.buy_stock_daily_3_5(stock_daily) if check: count += 1 - dir_name = "daily_20_60" + dir_name = "daily_3_5" log = str(count) + "_" + dir_name + "_" self.writeFile(dir_name, CODE, NAME, top, stock_daily, log) result.append({'ticker_code': CODE, 'ticker_name': NAME,'close': stock_daily['close'][0], 'type': '20~60'}) diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index 692f4ce..6646760 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -718,9 +718,9 @@ class Common: return False - def buy_stock_daily_20_60(self, stock_daily): + def buy_stock_daily_3_5(self, stock_daily): - if stock_daily['avg20'][1] < stock_daily['avg60'][1] and stock_daily['avg60'][0] < stock_daily['avg20'][0]: + if stock_daily['avg3'][1] < stock_daily['avg5'][1] and stock_daily['avg5'][0] < stock_daily['avg3'][0]: return True return False