init
This commit is contained in:
@@ -93,34 +93,24 @@ class IchimokuCloud:
|
||||
df = self.apply(df)
|
||||
|
||||
diff = len(df.changeLine) - len(stock['PRICE'])
|
||||
lastDay = stock['PRICE'][len(stock['PRICE']) - 1]['DATE']
|
||||
tmpLastDay = datetime.datetime.strptime(lastDay, "%Y-%m-%d")
|
||||
"""
|
||||
lastDay = stock['PRICE'][len(stock['PRICE']) - 1]['ymd']
|
||||
tmpLastDay = datetime.datetime.strptime(lastDay, "%Y.%m.%d")
|
||||
for i in range(diff):
|
||||
nextDay = tmpLastDay + datetime.timedelta(days=(i + 1))
|
||||
stock['PRICE'].append(
|
||||
{"DATE": nextDay.strftime("%Y-%m-%d"), "close": 0, "diff": 0, "open": 0, "high": 0, "low": 0, "volume": 0,
|
||||
{"ymd": nextDay.strftime("%Y-%m-%d"), "close": 0, "diff": 0, "open": 0, "high": 0, "low": 0, "volume": 0,
|
||||
"avg3": 0, "avg5": 0, "avg7": 0, "avg10": 0, "avg20": 0, "avg30": 0, "avg60": 0, "avg90": 0, "avg100": 0,
|
||||
"avg120": 0, "avg150": 0, "avg180": 0, "avg200": 0, "avg240": 0})
|
||||
"""
|
||||
|
||||
for i in range(len(df.changeLine)):
|
||||
stock['PRICE'][i]['ichimoku_buy'] = 0
|
||||
stock['PRICE'][i]['changeLine'] = df.changeLine.values[i]
|
||||
stock['PRICE'][i]['baseLine'] = df.baseLine.values[i]
|
||||
stock['PRICE'][i]['leadingSpan1'] = df.leadingSpan1.values[i]
|
||||
stock['PRICE'][i]['leadingSpan2'] = df.leadingSpan2.values[i]
|
||||
for i in range(len(df.changeLine)-diff):
|
||||
stock['PRICE'][i]['ichimokucloud_changeLine'] = df.changeLine.values[i]
|
||||
stock['PRICE'][i]['ichimokucloud_baseLine'] = df.baseLine.values[i]
|
||||
stock['PRICE'][i]['ichimokucloud_leadingSpan1'] = df.leadingSpan1.values[i]
|
||||
stock['PRICE'][i]['ichimokucloud_leadingSpan2'] = df.leadingSpan2.values[i]
|
||||
|
||||
for i in range(len(df.changeLine)):
|
||||
stock['PRICE'][i]['ichimoku_buy'] = self.common.getIchimokuCloudScore(stock['PRICE'], i)
|
||||
|
||||
results = []
|
||||
for day in stock['PRICE']:
|
||||
results.append({'DATE': day['DATE'],
|
||||
'changeLine': day['changeLine'],
|
||||
'baseLine': day['baseLine'],
|
||||
'leadingSpan1': day['leadingSpan1'],
|
||||
'leadingSpan2': day['leadingSpan2'],
|
||||
'ichimoku_buy': day['ichimoku_buy']})
|
||||
return results
|
||||
return
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user