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

Merge pull request #1119 from nanoric/extract_outputOptimizeResult

Browse Source 
[Add] 将ctaBacktesting.outputOptimizeResult分离了出来
This commit is contained in:
vn.py 2018-09-19 11:01:36 +08:00 committed by GitHub
commit 0e28c30b31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/CtaBacktesting/runOptimization.py
View File

@ -48,6 +48,7 @@ if __name__ == '__main__':
#engine.runOptimization(AtrRsiStrategy, setting)
# 多进程优化，耗时：89秒
engine.runParallelOptimization(AtrRsiStrategy, setting)
result = engine.runParallelOptimization(AtrRsiStrategy, setting)
engine.outputOptimizeResult(result)
print(u'耗时：%s' %(time.time()-start))

12
vnpy/trader/app/ctaStrategy/ctaBacktesting.py
View File

@ -921,11 +921,7 @@ class BacktestingEngine(object):
# 显示结果
resultList.sort(reverse=True, key=lambda result:result[1])
self.output('-' * 30)
self.output(u'优化结果：')
for result in resultList:
self.output(u'参数：%s，目标：%s' %(result[0], result[1]))
return resultList
return self.outputOptimizeResult(resultList)
#----------------------------------------------------------------------
def runParallelOptimization(self, strategyClass, optimizationSetting):
@ -954,11 +950,13 @@ class BacktestingEngine(object):
# 显示结果
resultList = [res.get() for res in l]
resultList.sort(reverse=True, key=lambda result:result[1])
return resultList
def outputOptimizeResult(self, resultList):
self.output('-' * 30)
self.output(u'优化结果：')
for result in resultList:
self.output(u'参数：%s，目标：%s' %(result[0], result[1]))
self.output(u'参数：%s，目标：%s' % (result[0], result[1]))
return resultList
#----------------------------------------------------------------------