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

Merge pull request #422 from lunxian/dev

Browse Source 
class_<std::vector<ibapi::shared_ptr<OrderCondition>>> 定义重复，删除一行
This commit is contained in:
vn.py 2017-07-28 10:08:23 +08:00 committed by GitHub
commit 857668d27a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vnpy/api/ib/vnib/vnib/vnib.cpp
View File

@ -1798,9 +1798,6 @@ BOOST_PYTHON_MODULE(vnib)
class_<std::vector<ibapi::shared_ptr<OrderCondition>>>("OrderConditionList") class_<std::vector<ibapi::shared_ptr<OrderCondition>>>("OrderConditionList")
.def(vector_indexing_suite<std::vector<ibapi::shared_ptr<OrderCondition>>, true>()); .def(vector_indexing_suite<std::vector<ibapi::shared_ptr<OrderCondition>>, true>());
class_<std::vector<ibapi::shared_ptr<OrderCondition>>>("OrderConditionList")
.def(vector_indexing_suite<std::vector<ibapi::shared_ptr<OrderCondition>>, true>());
class_<std::vector<std::string>>("StringList") class_<std::vector<std::string>>("StringList")
.def(vector_indexing_suite<std::vector<std::string>, true>()); .def(vector_indexing_suite<std::vector<std::string>, true>());

4
vnpy/trader/app/ctaStrategy/tools/ctaLineBar.py
View File

@ -228,7 +228,7 @@ class CtaLineBar(object):
self.__recountEma() self.__recountEma()
self.__recountDmi() self.__recountDmi()
self.__recountAtr() self.__recountAtr()
self.__recoundAvgVol() self.__recountAvgVol()
self.__recountRsi() self.__recountRsi()
self.__recountCmi() self.__recountCmi()
self.__recountBoll() self.__recountBoll()
@ -695,7 +695,7 @@ class CtaLineBar(object):
self.lineAtr3.append(self.barAtr3) self.lineAtr3.append(self.barAtr3)
#---------------------------------------------------------------------- #----------------------------------------------------------------------
def __recoundAvgVol(self): def __recountAvgVol(self):
"""计算平均成交量""" """计算平均成交量"""
# 1、lineBar满足长度才执行计算 # 1、lineBar满足长度才执行计算