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

Merge pull request #226 from sunnycomes/master

Browse Source 
解决返回变量个数不匹配的问题
This commit is contained in:
vn.py 2017-02-17 09:27:38 +08:00 committed by GitHub
commit 796c529992
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vn.how/tick2trade/vn.trader_t2t/ctaAlgo/ctaBacktesting.py
View File

@ -120,7 +120,7 @@ class BacktestingEngine(object):
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def loadHistoryData(self): def loadHistoryData(self):
"""载入历史数据""" """载入历史数据"""
host, port = loadMongoSetting() host, port, logging = loadMongoSetting()
self.dbClient = pymongo.MongoClient(host, port) self.dbClient = pymongo.MongoClient(host, port)
collection = self.dbClient[self.dbName][self.symbol] collection = self.dbClient[self.dbName][self.symbol]

4
vn.how/tick2trade/vn.trader_t2t/ctaAlgo/ctaHistoryData.py
View File

@ -33,7 +33,7 @@ class HistoryDataEngine(object):
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def __init__(self): def __init__(self):
"""Constructor""" """Constructor"""
host, port = loadMongoSetting() host, port, logging = loadMongoSetting()
self.dbClient = pymongo.MongoClient(host, port) self.dbClient = pymongo.MongoClient(host, port)
self.datayesClient = DatayesClient() self.datayesClient = DatayesClient()
@ -322,7 +322,7 @@ def loadMcCsv(fileName, dbName, symbol):
print u'开始读取CSV文件%s中的数据插入到%s的%s中' %(fileName, dbName, symbol) print u'开始读取CSV文件%s中的数据插入到%s的%s中' %(fileName, dbName, symbol)
# 锁定集合，并创建索引 # 锁定集合，并创建索引
host, port = loadMongoSetting() host, port, logging = loadMongoSetting()
client = pymongo.MongoClient(host, port) client = pymongo.MongoClient(host, port)
collection = client[dbName][symbol] collection = client[dbName][symbol]

2
vn.how/tick2trade/vn.trader_t2t/ctaAlgo/tools/multiTimeFrame/ctaBacktestMultiTF.py
View File

@ -72,7 +72,7 @@ class BacktestEngineMultiTF(BacktestingEngine):
"""载入历史数据""" """载入历史数据"""
"""load historical data""" """load historical data"""
host, port = loadMongoSetting() host, port, logging = loadMongoSetting()
self.dbClient = pymongo.MongoClient(host, port) self.dbClient = pymongo.MongoClient(host, port)
collection = self.dbClient[self.dbName][self.symbol] collection = self.dbClient[self.dbName][self.symbol]