From b99378a1e1157d8a664243191b762c5b8bdcaded Mon Sep 17 00:00:00 2001 From: dsyoon Date: Thu, 25 Jan 2024 11:37:32 +0900 Subject: [PATCH] init --- stock/analysis/AnalyzerSqlite.py | 6 +++--- stock/analysis/Common.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stock/analysis/AnalyzerSqlite.py b/stock/analysis/AnalyzerSqlite.py index 25f149a..948824d 100644 --- a/stock/analysis/AnalyzerSqlite.py +++ b/stock/analysis/AnalyzerSqlite.py @@ -953,9 +953,9 @@ if __name__ == "__main__": stockFileName = os.path.join(RESOURCE_PATH, 'stock.db') analyzer = AnalyzerSqlite(stockFileName) - analyzer.analyzeDaily() - analyzer.analyzeGrouping("weekly") - analyzer.analyzeGrouping("monthly") + #analyzer.analyzeDaily() + #analyzer.analyzeGrouping("weekly") + #analyzer.analyzeGrouping("monthly") # HTML 출력 outPath = os.path.join(PROJECT_HOME, "resources", "analysis") diff --git a/stock/analysis/Common.py b/stock/analysis/Common.py index 1bf20d0..e5b0152 100644 --- a/stock/analysis/Common.py +++ b/stock/analysis/Common.py @@ -577,7 +577,7 @@ class Common: rise_rate = param['bull'][0] / (param['bull'][0]+param['bear'][0]+param['bull'][0]) if ( - (stock['macd'][-2] < stock['macd'][-1] and stock['rsi'][-1]) < 80 or + (stock['macd'][-2] < stock['macd'][-1] and stock['rsi'][-1] < 80) or (stock['rsi'][-2] < stock['rsi'][-1] and np.min(stock['rsi'][-3:]) < 35) or (stock['rsi'][-1:] < 33) or 0.7 <= rise_rate