From 9513c0e3027ec5076e81daa8006d93b9a75ce75a Mon Sep 17 00:00:00 2001 From: "lxxia@googing.com.cn" Date: Wed, 26 Jul 2017 18:40:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?class=5F>>("OrderConditionList").def(vector=5Findexing=5Fs?= =?UTF-8?q?uite>,=20true>(?= =?UTF-8?q?));=20=E9=87=8D=E5=A4=8D=E5=AE=9A=E4=B9=89=E4=BA=86=E3=80=82=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=80=E8=A1=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vnpy/api/ib/vnib/vnib/vnib.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/vnpy/api/ib/vnib/vnib/vnib.cpp b/vnpy/api/ib/vnib/vnib/vnib.cpp index 261aeba0..2fc4d66c 100644 --- a/vnpy/api/ib/vnib/vnib/vnib.cpp +++ b/vnpy/api/ib/vnib/vnib/vnib.cpp @@ -1798,9 +1798,6 @@ BOOST_PYTHON_MODULE(vnib) class_>>("OrderConditionList") .def(vector_indexing_suite>, true>()); - class_>>("OrderConditionList") - .def(vector_indexing_suite>, true>()); - class_>("StringList") .def(vector_indexing_suite, true>()); From 579748708149e05741d4c60a721fc0edc2fa7924 Mon Sep 17 00:00:00 2001 From: "lxxia@googing.com.cn" Date: Thu, 27 Jul 2017 15:41:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=20=5F?= =?UTF-8?q?=5FrecoundAvgVol=20->=20=5F=5FrecountAvgVol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vnpy/trader/app/ctaStrategy/tools/ctaLineBar.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vnpy/trader/app/ctaStrategy/tools/ctaLineBar.py b/vnpy/trader/app/ctaStrategy/tools/ctaLineBar.py index a741c362..8d72331a 100644 --- a/vnpy/trader/app/ctaStrategy/tools/ctaLineBar.py +++ b/vnpy/trader/app/ctaStrategy/tools/ctaLineBar.py @@ -228,7 +228,7 @@ class CtaLineBar(object): self.__recountEma() self.__recountDmi() self.__recountAtr() - self.__recoundAvgVol() + self.__recountAvgVol() self.__recountRsi() self.__recountCmi() self.__recountBoll() @@ -695,7 +695,7 @@ class CtaLineBar(object): self.lineAtr3.append(self.barAtr3) #---------------------------------------------------------------------- - def __recoundAvgVol(self): + def __recountAvgVol(self): """计算平均成交量""" # 1、lineBar满足长度才执行计算