senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

夜市的交易日期修改，改成当前日期。

Browse Source
This commit is contained in:
msincenselee 2016-10-27 16:16:22 +08:00
parent ebfca451aa
commit 35e8e51862
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vn.trader/ctaAlgo/ctaEngine.py
View File

@ -314,23 +314,15 @@ class CtaEngine(object):
if key != 'datetime': if key != 'datetime':
d[key] = tick.__getattribute__(key) d[key] = tick.__getattribute__(key)
# 5.添加datetime字段
ctaTick.datetime = datetime.strptime(' '.join([tick.date, tick.time]), '%Y%m%d %H:%M:%S.%f') ctaTick.datetime = datetime.strptime(' '.join([tick.date, tick.time]), '%Y%m%d %H:%M:%S.%f')
# 修正，交易日期不一定是OpenDate # 5.添加datetime字段
dt = datetime.now() if ctaTick.datetime.hour >= 20:
if ctaTick.datetime > dt and (ctaTick.datetime - dt).seconds > 100: dt = datetime.now()
today = dt.strftime('%Y%m%d') today = dt.strftime('%Y%m%d')
if today != ctaTick.date: ctaTick.datetime = datetime.strptime(' '.join([today, tick.time]), '%Y%m%d %H:%M:%S.%f')
# 当前日期不等于交易日,ctaTick.date修正为当日，保留ctaTick.tradingDay ctaTick.date = today
self.writeCtaLog(u'fix tick{0},{1}'.format(ctaTick.datetime.strftime(' %Y%m%d %H:%M:%S.%f'), dt.strftime('%Y%m%d %H:%M:%S.%f')))
ctaTick.date = today
# 重新计算时间
ctaTick.datetime = datetime.strptime(' '.join([ctaTick.date, ctaTick.time]), '%Y%m%d %H:%M:%S.%f')
else:
# 修正出现偏差的时间
ctaTick.datetime = dt
self.writeCtaLog(u'fix 修正出现偏差的时间')
# 逐个推送到策略实例中 # 逐个推送到策略实例中
l = self.tickStrategyDict[tick.vtSymbol] l = self.tickStrategyDict[tick.vtSymbol]