diff --git a/stockpredictor/analysis/AnalyzerSqlite.py b/stockpredictor/analysis/AnalyzerSqlite.py index da63f69..c459cc7 100644 --- a/stockpredictor/analysis/AnalyzerSqlite.py +++ b/stockpredictor/analysis/AnalyzerSqlite.py @@ -117,9 +117,11 @@ class AnalyzerSqlite: volume = list(reversed(stock['volume'])) avg5 = list(reversed(stock['avg5'])) avg20 = list(reversed(stock['avg20'])) + avg40 = list(reversed(stock['avg40'])) avg60 = list(reversed(stock['avg60'])) avg120 = list(reversed(stock['avg120'])) avg240 = list(reversed(stock['avg240'])) + avg300 = list(reversed(stock['avg300'])) stochastic_slow_k = list(reversed(stock['stochastic_slow_k'])) stochastic_slow_d = list(reversed(stock['stochastic_slow_d'])) bolingerband_upper = list(reversed(stock['bolingerband_upper'])) @@ -131,15 +133,17 @@ class AnalyzerSqlite: candle_stick = go.Candlestick(x=ymd, open=open, high=high, low=low, close=close, increasing_line_color='red', decreasing_line_color='blue') avg5 = go.Scatter(x=ymd, y=avg5, name="avg5", line_color='#000000') avg20 = go.Scatter(x=ymd, y=avg20, name="avg20", line_color='#f84c43') + avg40 = go.Scatter(x=ymd, y=avg40, name="avg40", line_color='#8013ED') avg60 = go.Scatter(x=ymd, y=avg60, name="avg60", line_color='#f89543') avg120 = go.Scatter(x=ymd, y=avg120, name="avg120", line_color='#0ed604') - avg240 = go.Scatter(x=ymd, y=avg240, name="avg240", line_color='#00FF49') + avg240 = go.Scatter(x=ymd, y=avg240, name="avg240", line_color='#FF00F7') + avg300 = go.Scatter(x=ymd, y=avg300, name="avg300", line_color='#00FF49') bolinger_upper = go.Scatter(x=ymd, y=bolingerband_upper, name="upper", line_color='#8B4513') bolinger_lower = go.Scatter(x=ymd, y=bolingerband_lower, name="lower", line_color='#8B4513') changeLine = go.Scatter(x=ymd, y=ichimokucloud_changeLine, name="changeLine", line_color='#000000') baseLine = go.Scatter(x=ymd, y=ichimokucloud_baseLine, name="baseLine", line_color='#FF0000') - candle_data = [candle_stick, avg5, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, changeLine, baseLine] + candle_data = [candle_stick, avg5, avg20, avg40, avg60, avg120, avg240, avg300, bolinger_upper, bolinger_lower, changeLine, baseLine] #candle_data = [candle_stick, bolinger_upper, bolinger_lower, changeLine, baseLine] volume = go.Bar(x=ymd, y=volume, name="volume") @@ -472,7 +476,7 @@ class AnalyzerSqlite: price['stochastic_fast_k'], price['stochastic_slow_k'], price['stochastic_slow_d'],)) else: - sql = "UPDATE " + stockAnalysisTableName + " SET close=?, diff=?, open=?, high=?, low=?, volume=? " + sql = "UPDATE " + stockAnalysisTableName + " SET close=?, diff=?, open=?, high=?, low=?, volume=?, " sql += " avg5=?, avg10=?, avg20=?, avg40=?, avg60=?, avg120=?, avg200=?, avg240=?, avg300=?, " sql += " bolingerband_upper=?, bolingerband_lower=?, bolingerband_middle=?, " sql += " ichimokucloud_changeLine=?, ichimokucloud_baseLine=?, ichimokucloud_leadingSpan1=?, ichimokucloud_leadingSpan2=?, " @@ -632,9 +636,9 @@ if __name__ == "__main__": stockFileName = PROJECT_HOME + '/resources/stock.db' analyzer = AnalyzerSqlite(PROJECT_HOME, stockFileName) - analyzer.analyzeDaily() - analyzer.analyzeGrouping("weekly") - analyzer.analyzeGrouping("monthly") + #analyzer.analyzeDaily() + #analyzer.analyzeGrouping("weekly") + #analyzer.analyzeGrouping("monthly") day = datetime.today().strftime("%Y%m%d")