Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #49

Merged
merged 54 commits into from
Jul 18, 2016
Merged

update #49

merged 54 commits into from
Jul 18, 2016

Conversation

yoyobbs
Copy link
Contributor

@yoyobbs yoyobbs commented Jul 17, 2016

No description provided.

Oak Ken and others added 30 commits April 15, 2016 04:06
添加一个不带自动交易模式的引擎
* feature/重构clock_engine:
  - change : 注释掉无用的代码
  - add : 单元测试
  - change : 统一时间戳

Conflicts:
	easyquant/push_engine/clock_engine.py
…refactor_clock_engine

* commit '2b18903cd7d4097286268e26a52f47e915c03794':
  Adding without brocker model
  Adding select without user model
  Adding yh.json

Conflicts:
	easyquant/main_engine.py
* feature/refactor_clock_engine:
  Adding without brocker model
  Adding select without user model
  feat: merge
  Adding yh.json
 - fix : 增加时钟事件触发的条件:交易日
Allow share user session among threads
(cherry picked from commit de597eb6b789199aa66e05cdce6ffec46c44e3a6)
fix is_trade_date & its usage.
weichaoguo and others added 24 commits June 16, 2016 17:07
register_moment调用_register_moment时,需要用关键字参数传递markup,不能用位置参数
使用关键字参数传递markup
change typo "markup" in register_moment to "makeup"
fixed typo in register_moment
_init_clock_handler初始化
* commit 'af099f584704a64675d58c1064542f3bfc955b43':
Fix/直接使用 mock 重设单元测试中的时间戳
@shidenggui shidenggui merged commit 344a6ae into feature/refactor_clock_engine Jul 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants