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

修改MainEngine的dbQuery直接返回列表

Browse Source
This commit is contained in:
chenxy123 2016-12-15 22:04:09 +08:00
parent 587aba744b
commit a0d4e79b49
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,15 +326,13 @@ class CtaEngine(object):
startDate = self.today - timedelta(days)
d = {'datetime':{'$gte':startDate}}
cursor = self.mainEngine.dbQuery(dbName, collectionName, d)
barData = self.mainEngine.dbQuery(dbName, collectionName, d)
l = []
if cursor:
for d in cursor:
bar = CtaBarData()
bar.__dict__ = d
l.append(bar)
for d in barData:
bar = CtaBarData()
bar.__dict__ = d
l.append(bar)
return l
#----------------------------------------------------------------------
@ -343,15 +341,13 @@ class CtaEngine(object):
startDate = self.today - timedelta(days)
d = {'datetime':{'$gte':startDate}}
cursor = self.mainEngine.dbQuery(dbName, collectionName, d)
tickData = self.mainEngine.dbQuery(dbName, collectionName, d)
l = []
if cursor:
for d in cursor:
tick = CtaTickData()
tick.__dict__ = d
l.append(tick)
for d in tickData:
tick = CtaTickData()
tick.__dict__ = d
l.append(tick)
return l
#----------------------------------------------------------------------
@ -561,11 +557,10 @@ class CtaEngine(object):
for strategy in self.strategyDict.values():
flt = {'name': strategy.name,
'vtSymbol': strategy.vtSymbol}
posData = self.mainEngine.dbQuery(POSITION_DB_NAME, strategy.className, flt)
cx = self.mainEngine.dbQuery(POSITION_DB_NAME, strategy.className, flt)
if cx:
for d in cx:
strategy.pos = d['pos']
for d in posData:
strategy.pos = d['pos']
########################################################################

4
vn.trader/vtEngine.py
View File

@ -264,9 +264,9 @@ class MainEngine(object):
db = self.dbClient[dbName]
collection = db[collectionName]
cursor = collection.find(d)
return cursor
return list(cursor)
else:
return None
return []
#----------------------------------------------------------------------
def dbUpdate(self, dbName, collectionName, d, flt, upsert=False):