Commit Graph

74 Commits

Author SHA1 Message Date
msincenselee
09646b6158 Merge remote-tracking branch 'refs/remotes/vnpy/master' 2015-11-05 00:32:47 +08:00
msincenselee
f28351a242 20151105 2015-11-05 00:28:41 +08:00
msincenselee
43f96b1e05 201501105 2015-11-05 00:28:12 +08:00
vn.py
7d147515d6 Merge pull request #14 from bigtan/patch-1
Update eventEngine.py
2015-11-01 09:45:17 +08:00
msincenselee
20e18eefa3 fix amount bug 2015-10-28 10:15:41 +08:00
msincenselee
a6066b05f4 history days 2015-10-25 21:26:37 +08:00
msincenselee
cbf320dc39 data issue 2015-10-25 00:56:43 +08:00
Bigtan
61e089f27c Update eventEngine.py
fix a minor bug
2015-10-24 23:33: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
389fa9b4f8 comment 2015-10-24 08:37:39 +08:00
msincenselee
decec65092 daily 2015-10-24 08:01:02 +08:00
msincenselee
ab4ef8ff1f path 2015-10-24 07:25:53 +08:00
msincenselee
3a77d39b9b ignore pickle file 2015-10-24 06:59:08 +08:00
msincenselee
1324e5ab2d local cache 2015-10-24 01:12:08 +08:00
msincenselee
e48ba99820 daily update 2015-10-22 10:40:59 +08:00
msincenselee
e5158b096b save demostrategy data in backtesting 2015-10-20 22:54:57 +08:00
msincenselee
94399f2250 save demostrategy data in backtesting 2015-10-20 22:50:56 +08:00
msincenselee
7b550fd788 delete 2015-10-19 17:15:36 +08:00
msincenselee
203ea2a803 delete 2015-10-19 17:14:40 +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
msincenselee
9dd2d7f120 bug fixing 2015-10-19 15:06:50 +08:00
WOLF
d5b16a6a87 初步完成IB接口,支持股票和期货交易,期权等回头有需求再做,欢迎报bug 2015-10-19 15:04:03 +08:00
msincenselee
5f3e781996 bug fixing 2015-10-18 00:23:24 +08:00
WOLF
29e518d07e Merge branch 'master' of https://github.com/vnpy/vnpy
Conflicts:
	.gitignore
2015-10-16 16:52:26 +08:00
WOLF
c3cf86c452 初步完成了vn.trader,包含CTP、LTS、WIND的接口,以及CTA策略模块,策略模块的测试尚未全部完成 2015-10-16 16:50:44 +08:00
msincenselee
9347691f44 tune backtestEngine 2015-10-15 00:41:45 +08:00
vn.py
65aac25731 Merge pull request #12 from golden1232004/req
Req
2015-10-13 17:15:10 +08:00
golden
5cc755184d update .gitignore 2015-10-13 16:41:55 +08:00
golden
5dd8aafe0d add CMakeLists.txt to config environment for compiling api and readme 2015-10-13 16:41:45 +08:00
msincenselee
019dc69bf2 tune backtestEngine 2015-10-10 17:08:13 +08:00
root
ec429b62f6 makefiles 2015-10-10 03:16:45 +00:00
root
3e7557c69e linux 2015-10-09 06:07:15 +00:00
msincenselee
0ed9656b13 Merge remote-tracking branch 'vnpy/master' 2015-10-08 00:27:38 +08:00
msincenselee
0d07fb460f mssql 2015-10-08 00:27:29 +08:00
msincenselee
aa489ea31b mysql 2015-10-08 00:27:06 +08:00
msincenselee
e5de7cba31 mongodb=>mysqldb 2015-09-28 15:34:32 +08:00
msincenselee
0d1c787389 mongodb=>mysqldb 2015-09-28 15:29:48 +08:00
WOLF
13fbf771b7 添加新的20150914认证版的LTS API封装(华宝计划在年底前全部切换),现在老版在实盘交易柜台上依旧可以使用,移到了vn.lts_old下 2015-09-28 11:42:35 +08:00
msincenselee
ccde440dd1 add comment 2015-09-16 15:34:00 +08:00
msincenselee
4ed22c2c33 Merge remote-tracking branch 'vnpy/master' 2015-09-10 17:00:02 +08:00
WOLF
88b9e5247d 添加部分忽略 2015-09-09 09:24:43 +08:00
WOLF
a16ecab33e Merge branch 'master' of https://github.com/vnpy/vnpy 2015-09-09 09:22:11 +08:00
WOLF
629d19c073 完成部分ctpTdGateway的封装 2015-09-09 09:20:02 +08:00
msincenselee
a4c2d3b4dd Merge remote-tracking branch 'vnpy/master' 2015-08-31 20:47:05 +08:00
vn.py
ddd14a4c75 Merge pull request #11 from zedyang/master
更新了说明文件。
2015-08-17 11:31:06 +08:00
zedyang
7e847e73f5 update docs 2015-08-17 11:25:54 +08:00
vn.py
d4fb389a27 Merge pull request #10 from zedyang/master
通联历史数据模块。
2015-08-14 16:27:50 +08:00
zedyang
444269a50c 通联历史数据模块。 2015-08-14 16:26:41 +08:00
WOLF
1e793c15f9 创建通联数据历史数据模块,等待zed的代码。
vn.trader模块开发进行中。
2015-08-14 16:11:53 +08:00