vnpy/vn.trader/ctaStrategies.py

# encoding: UTF-8

'''
在本文件中引入所有希望在系统中使用的策略类
'''

<<<<<<< HEAD
strategyClassDict = {}
=======
from ctaStrategyTemplate import TestStrategy

strategyClassDict = {}
strategyClassDict[u'TestStrategy'] = TestStrategy
>>>>>>> refs/remotes/vnpy/master
demoStrategy 2015-10-19 08:42:17 +00:00			`# encoding: UTF-8`

			`'''`
			`在本文件中引入所有希望在系统中使用的策略类`
			`'''`

Merge remote-tracking branch 'refs/remotes/vnpy/master' Conflicts: .gitignore vn.trader/CTP_connect.json vn.trader/ContractData.vt vn.trader/LTS_connect.json vn.trader/ctaEngine.py vn.trader/ctaStrategies.py vn.trader/ctaStrategyTemplate.py vn.trader/ctpGateway.py vn.trader/ltsGateway.py vn.trader/uiBasicWidget.py vn.trader/uiCtaWidget.py vn.trader/uiMainWindow.py vn.trader/vtConstant.py vn.trader/vtEngine.py vn.trader/vtGateway.py 2015-10-19 09:05:00 +00:00			`<<<<<<< HEAD`
			`strategyClassDict = {}`
			`=======`
			`from ctaStrategyTemplate import TestStrategy`

			`strategyClassDict = {}`
			`strategyClassDict[u'TestStrategy'] = TestStrategy`
			`>>>>>>> refs/remotes/vnpy/master`