test/hikyuu2
1
0
Fork 0
mirror of https://gitee.com/fasiondog/hikyuu.git synced 2024-11-30 10:59:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
fasiondog 2019-03-24 20:25:43 +08:00
parent a46d824786
commit f85210a620
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hikyuu/interactive/kaufman.py
View File

@ -171,9 +171,9 @@ def draw2(block, query = Query(-130),
a.name = "POS(30)"
a.plot(axes=ax2, color='g', marker='.', legend_on=True)
total = len(kdata)
CVAL(0.8, total).plot(axes=ax2,color='r',linestyle='--')
CVAL(0.2, total).plot(axes=ax2,color='r',linestyle='--')
c = CLOSE(kdata)
CVAL(c, 0.8).plot(axes=ax2,color='r',linestyle='--')
CVAL(c, 0.2).plot(axes=ax2,color='r',linestyle='--')
#ax2.hlines(0.8,0,len(kdata),color='r',linestyle='--')
#ax2.hlines(0.2,0,len(kdata),color='r',linestyle='--')
@ -182,10 +182,10 @@ def draw2(block, query = Query(-130),
label = "ER(%s)" % cer[-1]
cer.plot(axes=ax3, color='b', marker='.', label=label,
legend_on=False, text_on=True)
CVAL(0.8, total).plot(axes=ax2,color='r',linestyle='--')
CVAL(-0.6, total).plot(axes=ax2,color='r',linestyle='--')
CVAL(-0.8, total).plot(axes=ax2,color='r',linestyle='--')
CVAL(0, total).plot(axes=ax2,color='k',linestyle='-')
CVAL(c, 0.8).plot(axes=ax2,color='r',linestyle='--')
CVAL(c, -0.6).plot(axes=ax2,color='r',linestyle='--')
CVAL(c, -0.8).plot(axes=ax2,color='r',linestyle='--')
CVAL(c, 0).plot(axes=ax2,color='k',linestyle='-')
#ax3.hlines(0.8,0,len(kdata),color='r',linestyle='--')
#ax3.hlines(-0.6,0,len(kdata),color='r',linestyle='--')
#ax3.hlines(-0.8,0,len(kdata),color='r',linestyle='--')

2
hikyuu_cpp/hikyuu/indicator/IndicatorImp.h
View File

@ -193,6 +193,7 @@ private:
ar & BOOST_SERIALIZATION_NVP(m_params);
ar & BOOST_SERIALIZATION_NVP(m_discard);
ar & BOOST_SERIALIZATION_NVP(m_result_num);
ar & BOOST_SERIALIZATION_NVP(m_need_calculate);
ar & BOOST_SERIALIZATION_NVP(m_optype);
ar & BOOST_SERIALIZATION_NVP(m_left);
ar & BOOST_SERIALIZATION_NVP(m_right);
@ -218,6 +219,7 @@ private:
ar & BOOST_SERIALIZATION_NVP(m_params);
ar & BOOST_SERIALIZATION_NVP(m_discard);
ar & BOOST_SERIALIZATION_NVP(m_result_num);
ar & BOOST_SERIALIZATION_NVP(m_need_calculate);
ar & BOOST_SERIALIZATION_NVP(m_optype);
ar & BOOST_SERIALIZATION_NVP(m_left);
ar & BOOST_SERIALIZATION_NVP(m_right);

2
hikyuu_cpp/hikyuu/indicator/imp/Weave.cpp
View File

@ -15,7 +15,7 @@ Indicator HKU_API WEAVE(const Indicator& ind1, const Indicator& ind2) {
return Indicator();
}
IndicatorImpPtr p = make_shared<IndicatorImp>();
p->add(IndicatorImp::TWO, ind1.getImp()->clone(), ind2.getImp()->clone());
p->add(IndicatorImp::TWO, ind1.getImp(), ind2.getImp());
return p->calculate();
}