fixed OperatorSignal 多级组合

Author: fasiondog

hikyuu_cpp/hikyuu/trade_sys/signal/SignalBase.cpp

@@ -97,7 +97,8 @@ void SignalBase::reset() {
 void SignalBase::startCycle(const Datetime& start, const Datetime& close) {
     HKU_IF_RETURN(!m_ignore_cycle && !getParam<bool>("cycle"), void());
     HKU_INFO("m_cycle_start: {}, m_cycle_end: {}", m_cycle_start, m_cycle_end);
-    HKU_ASSERT(start != Null<Datetime>() && close != Null<Datetime>() && start < close);
+    HKU_CHECK(start != Null<Datetime>() && close != Null<Datetime>() && start < close, "{}",
+              m_name);
     HKU_CHECK(start >= m_cycle_end || m_cycle_end == Null<Datetime>(),
               "curretn start: {}, pre cycle end: {}", start, m_cycle_end);
     m_cycle_start = start;

hikyuu_cpp/hikyuu/trade_sys/signal/SignalBase.h

@@ -107,6 +107,9 @@ class HKU_API SignalBase : public enable_shared_from_this<SignalBase> {
     void startCycle(const Datetime& start, const Datetime& end);
     const Datetime& getCycleStart() const;
     const Datetime& getCycleEnd() const;
+    bool ignoreCycle() const {
+        return m_ignore_cycle;
+    }
 
     /** 复位操作 */
     void reset();

hikyuu_cpp/hikyuu/trade_sys/signal/imp/logic/OperatorSignal.cpp

@@ -47,7 +47,7 @@ void OperatorSignal::sub_sg_calculate(SignalPtr& sg, const KData& kdata) {
     bool cycle = sg->getParam<bool>("cycle");
     if (m_kdata == kdata && !cycle) {
         sg->_calculate(kdata);
-    } else if (m_kdata != kdata && cycle) {
+    } else if (m_kdata != Null<KData>() && m_kdata != kdata && cycle) {
         sg->startCycle(m_cycle_start, m_cycle_end);
         sg->_calculate(kdata);
     }

hikyuu_pywrap/indicator/_build_in.cpp

@@ -2129,4 +2129,20 @@ void export_Indicator_build_in(py::module& m) {
     :param Indicator ind: 指标
     :param bool ignore_discard: 忽略指标丢弃数据
     :rtype: Indicator)");
+
+    m.def("JUMPUP", py::overload_cast<>(JUMPUP));
+    m.def("JUMPUP", py::overload_cast<const Indicator&>(JUMPUP), R"(JUMPUP([ind])
+    
+    边缘跳变，从小于等于0.0，跳变到 > 0.0
+    
+    :param Indicator ind: 指标
+    :rtype: Indicator)");
+
+    m.def("JUMPDOWN", py::overload_cast<>(JUMPDOWN));
+    m.def("JUMPDOWN", py::overload_cast<const Indicator&>(JUMPDOWN), R"(JUMPDOWN([ind])
+    
+    边缘跳变，从大于0.0，跳变到 <= 0.0
+
+    :param Indicator ind: 指标
+    :rtype: Indicator)");
 }