Commit Graph

18 Commits

Author SHA1 Message Date
msincenselee
fe13e89ca9 update 2017-05-10 19:30:36 +08:00
msincenselee
2ff5c070cb 修复noUIMain加载gateway失败的bug 2017-05-03 18:03:17 +08:00
msincenselee
47fd8f263e 合并1.6.1版本 2017-04-28 22:10:07 +08:00
msincenselee
4cb8baaf5b 新增能源所 2017-04-23 20:37:44 +08:00
msincenselee
c7f6e1e9a5 增加:
1、自动根据持仓合约,订阅tick消息。
2、风控增加亏损比例监控(暂时还没有确定的强制平仓处理)
2016-11-30 14:28:30 +08:00
msincenselee
41fd656386 增加Log本地日志 2016-07-04 00:59:48 +08:00
msincenselee
9c43f0097f 合并版本前初始化vnpy 2016-07-02 11:12:56 +08:00
msincenselee
6e31097276 Merge remote-tracking branch 'remotes/origin/master' into vnpy/master
Conflicts:
	.gitignore
2016-07-02 11:00:05 +08:00
msincenselee
b845966b2a recent update 2016-02-14 13:03:41 +08:00
msincenselee
2e6d994a5d 实盘修改 2015-12-09 23:42:17 +08:00
msincenselee
64f772e650 Merge remote-tracking branch 'refs/remotes/vnpy/master'
Conflicts:
	vn.trader/ContractData.vt
	vn.trader/ctaEngine.py
	vn.trader/ctaStrategies.py
	vn.trader/ltsGateway.py
	vn.trader/uiBasicWidget.py
	vn.trader/uiMainWindow.py
	vn.trader/vtConstant.py
	vn.trader/vtEngine.py
2015-11-20 15:50:57 +08:00
WOLF
241808b45b 修复之前版本里的一些bug,并完成CTA用数据记录工具(tick和分钟线) 2015-11-20 14:11:29 +08:00
msincenselee
01d9f9e876 merge 2015-11-09 21:25:32 +08:00
msincenselee
83e50ac220 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-24 08:40:05 +08:00
msincenselee
676c4c6d40 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 17:05:00 +08:00
msincenselee
8b5d27f46c demoStrategy 2015-10-19 16:42:17 +08:00
WOLF
d5b16a6a87 初步完成IB接口,支持股票和期货交易,期权等回头有需求再做,欢迎报bug 2015-10-19 15:04:03 +08:00
WOLF
c3cf86c452 初步完成了vn.trader,包含CTP、LTS、WIND的接口,以及CTA策略模块,策略模块的测试尚未全部完成 2015-10-16 16:50:44 +08:00