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

Merge pull request #1312 from vnpy/dev

Browse Source 
v1.9.2 release dev->beta
This commit is contained in:
vn.py 2018-12-29 09:45:24 +08:00 committed by GitHub
commit 67f626e152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/TurtleStrategy/turtleEngine.py
View File

@ -1,5 +1,7 @@
# encoding: UTF-8 # encoding: UTF-8
from __future__ import print_function
from csv import DictReader from csv import DictReader
from datetime import datetime from datetime import datetime
from collections import OrderedDict, defaultdict from collections import OrderedDict, defaultdict
@ -306,7 +308,7 @@ class BacktestingEngine(object):
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def output(self, content): def output(self, content):
"""输出信息""" """输出信息"""
print content print(content)
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def getTradeData(self, vtSymbol=''): def getTradeData(self, vtSymbol=''):
@ -432,4 +434,4 @@ class DailyResult(object):
def formatNumber(n): def formatNumber(n):
"""格式化数字到字符串""" """格式化数字到字符串"""
rn = round(n, 2) # 保留两位小数 rn = round(n, 2) # 保留两位小数
return format(rn, ',') # 加上千分符 return format(rn, ',') # 加上千分符

4
vnpy/api/websocket/WebsocketClient.py
View File

@ -263,11 +263,11 @@ class WebsocketClient(object):
""" """
用于Debug： 记录最后一次发送出去的text 用于Debug： 记录最后一次发送出去的text
""" """
self._lastSentText = text[:500] self._lastSentText = text[:1000]
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def _recordLastReceivedText(self, text): def _recordLastReceivedText(self, text):
""" """
用于Debug： 记录最后一次发送出去的text 用于Debug： 记录最后一次发送出去的text
""" """
self._lastReceivedText = text[:500] self._lastReceivedText = text[:1000]