This commit is contained in:
dsyoon
2022-09-12 15:38:18 +09:00
parent 710660ea21
commit 352b0d02c8

View File

@@ -858,45 +858,51 @@ class AnalyzerSqlite:
items_reverse = reversed(items) items_reverse = reversed(items)
for item in items_reverse: for item in items_reverse:
stock['PRICE'].append( stock['PRICE'].append(
{"ymd": item[0], {
"close": item[1], "ymd": item[0],
"diff": item[2], "close": item[1],
"open": item[3], "diff": item[2],
"high": item[4], "open": item[3],
"low": item[5], "high": item[4],
"volume": item[6], "low": item[5],
"avg3": -1, "volume": item[6],
"avg4": -1, "avg3": -1,
"avg5": -1, "avg4": -1,
"avg6": -1, "avg5": -1,
"avg10": -1, "avg6": -1,
"avg12": -1, "avg10": -1,
"avg20": -1, "avg12": -1,
"avg36": -1, "avg20": -1,
"avg40": -1, "avg36": -1,
"avg48": -1, "avg40": -1,
"avg60": -1, "avg48": -1,
"avg120": -1, "avg60": -1,
"avg200": -1, "avg120": -1,
"avg240": -1, "avg200": -1,
"avg300": -1, "avg240": -1,
"disparity_avg5": -1, "avg300": -1,
"disparity_avg10": -1, "disparity_avg5": -1,
"disparity_avg20": -1, "disparity_avg10": -1,
"disparity_avg60": -1, "disparity_avg20": -1,
"disparity_avg120": -1, "disparity_avg60": -1,
"bolingerband_upper": -1, "disparity_avg120": -1,
"bolingerband_lower": -1, "bolingerband_upper": -1,
"bolingerband_middle": -1, "bolingerband_lower": -1,
"ichimokucloud_changeLine": -1, "bolingerband_middle": -1,
"ichimokucloud_baseLine": -1, "ichimokucloud_changeLine": -1,
"ichimokucloud_leadingSpan1": -1, "ichimokucloud_baseLine": -1,
"ichimokucloud_leadingSpan2": -1, "ichimokucloud_leadingSpan1": -1,
"stochastic_fast_k": -1, "ichimokucloud_leadingSpan2": -1,
"stochastic_slow_k": -1, "stochastic_fast_k": -1,
"stochastic_slow_d": -1, "stochastic_slow_k": -1,
"rsi": -1, "stochastic_slow_d": -1,
"rsis": -1}) "rsi": -1,
"rsis": -1,
"macd": -1,
"macds": -1,
"macdo": -1,
}
)
self.analyzeAdditionalInfo(stock, cursor) self.analyzeAdditionalInfo(stock, cursor)
@@ -927,45 +933,51 @@ class AnalyzerSqlite:
items_reverse = reversed(items) items_reverse = reversed(items)
for item in items_reverse: for item in items_reverse:
stock['PRICE'].append( stock['PRICE'].append(
{"ymd": item[0], {
"close": item[1], "ymd": item[0],
"diff": item[2], "close": item[1],
"open": item[3], "diff": item[2],
"high": item[4], "open": item[3],
"low": item[5], "high": item[4],
"volume": item[6], "low": item[5],
"avg3": -1, "volume": item[6],
"avg4": -1, "avg3": -1,
"avg5": -1, "avg4": -1,
"avg6": -1, "avg5": -1,
"avg10": -1, "avg6": -1,
"avg12": -1, "avg10": -1,
"avg20": -1, "avg12": -1,
"avg36": -1, "avg20": -1,
"avg40": -1, "avg36": -1,
"avg48": -1, "avg40": -1,
"avg60": -1, "avg48": -1,
"avg120": -1, "avg60": -1,
"avg200": -1, "avg120": -1,
"avg240": -1, "avg200": -1,
"avg300": -1, "avg240": -1,
"disparity_avg5": -1, "avg300": -1,
"disparity_avg10": -1, "disparity_avg5": -1,
"disparity_avg20": -1, "disparity_avg10": -1,
"disparity_avg60": -1, "disparity_avg20": -1,
"disparity_avg120": -1, "disparity_avg60": -1,
"bolingerband_upper": -1, "disparity_avg120": -1,
"bolingerband_lower": -1, "bolingerband_upper": -1,
"bolingerband_middle": -1, "bolingerband_lower": -1,
"ichimokucloud_changeLine": -1, "bolingerband_middle": -1,
"ichimokucloud_baseLine": -1, "ichimokucloud_changeLine": -1,
"ichimokucloud_leadingSpan1": -1, "ichimokucloud_baseLine": -1,
"ichimokucloud_leadingSpan2": -1, "ichimokucloud_leadingSpan1": -1,
"stochastic_fast_k": -1, "ichimokucloud_leadingSpan2": -1,
"stochastic_slow_k": -1, "stochastic_fast_k": -1,
"stochastic_slow_d": -1, "stochastic_slow_k": -1,
"rsi": -1, "stochastic_slow_d": -1,
"rsis": -1}) "rsi": -1,
"rsis": -1,
"macd": -1,
"macds": -1,
"macdo": -1
}
)
agg_dict = {'open': 'first', agg_dict = {'open': 'first',
'high': 'max', 'high': 'max',