hikyuu 2.7.3__py3-none-win_amd64.whl → 2.7.6__py3-none-win_amd64.whl

hikyuu/include/hikyuu/indicator/crt/IC.h

@@ -18,32 +18,37 @@ namespace hku {
         天的收益”（比如过去 5 天的收益），并称之为 “当前 IC”。(否则当前值都会是缺失NA)
         如需严格“t 时刻因子值→t+1 时刻收益“计算，请设置 strict=True (注意此模式下, 后n位为 NA)
  * @param stks 证券组合
- * @param query 查询条件
- * @param ref_stk 参照证券，默认 sh000300 沪深300
  * @param n 时间窗口 (对应 n 日收益率)
  * @param spearman 使用 spearman 相关系数，否则为 pearson
  * @param strict 严格模式， 遵循IC定义“t 时刻因子值→t+1 时刻收益”
  * @return Indicator
  * @ingroup Indicator
  */
-Indicator HKU_API IC(const StockList& stks, const KQuery& query,
-                     const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true,
-                     bool strict = false);
+Indicator HKU_API IC(const StockList& stks, int n = 1, bool spearman = true, bool strict = false);
 
-Indicator HKU_API IC(const Block& blk, const KQuery& query,
-                     const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true,
-                     bool strict = false);
+Indicator HKU_API IC(const Block& blk, int n = 1, bool spearman = true, bool strict = false);
 
-inline Indicator IC(const Indicator& ind, const StockList& stks, const KQuery& query,
-                    const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true,
+inline Indicator IC(const Indicator& ind, const StockList& stks, int n = 1, bool spearman = true,
                     bool strict = false) {
-    return IC(stks, query, ref_stk, n, spearman, strict)(ind);
+    return IC(stks, n, spearman, strict)(ind);
 }
 
-inline Indicator IC(const Indicator& ind, const Block& blk, const KQuery& query,
-                    const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true,
+inline Indicator IC(const Indicator& ind, const Block& blk, int n = 1, bool spearman = true,
                     bool strict = false) {
-    return IC(blk, query, ref_stk, n, spearman, strict)(ind);
+    return IC(blk, n, spearman, strict)(ind);
 }
 
+/**
+ * @brief 计算指定的因子列表相对于指定的收益列表的
+ * IC，其中，inds和returns均为已经计算好并按日期对齐后的结果。inds不需要按n右移。
+ * @note 仅为数值计算，返回结果无对齐日期
+ * @param inds 因子列表，inds不需要按n右移。
+ * @param returns 收益列表
+ * @param n 时间窗口 (对应 n 日收益率)
+ * @param use_spearman 使用 spearman 相关系数，否则为 pearson
+ * @param strict 严格模式， 遵循IC定义“t 时刻因子值→t+1 时刻收益”
+ */
+Indicator HKU_API IC(IndicatorList inds, IndicatorList returns, int n = 1, bool use_spearman = true,
+                     bool strict = false);
+
 }  // namespace hku

hikyuu/include/hikyuu/indicator/crt/ICIR.h

@@ -22,7 +22,6 @@ namespace hku {
  * @param ind 因子公式
  * @param stks 证券组合
  * @param query 查询条件
- * @param ref_stk 参照证券，默认 sh000300 沪深300
  * @param n IC对应的N日收益率
  * @param rolling_n 滚动时间窗口
  * @param spearman 使用 spearman 相关系数，否则为 pearson
@@ -30,10 +29,9 @@ namespace hku {
  * @return Indicator
  * @ingroup Indicator
  */
-inline Indicator ICIR(const Indicator& ind, const StockList& stks, const KQuery& query,
-                      const Stock& ref_stk = getStock("sh000300"), int n = 1, int rolling_n = 120,
+inline Indicator ICIR(const Indicator& ind, const StockList& stks, int n = 1, int rolling_n = 120,
                       bool spearman = true, bool strict = false) {
-    Indicator ic = IC(ind, stks, query, ref_stk, n, spearman, strict);
+    Indicator ic = IC(ind, stks, n, spearman, strict);
     Indicator x = MA(ic, rolling_n) / STDEV(ic, rolling_n);
     x.name("ICIR");
     x.setParam<int>("n", n);
@@ -41,10 +39,9 @@ inline Indicator ICIR(const Indicator& ind, const StockList& stks, const KQuery&
     return x;
 }
 
-inline Indicator ICIR(const Indicator& ind, const Block& blk, const KQuery& query,
-                      const Stock& ref_stk = getStock("sh000300"), int n = 1, int rolling_n = 120,
+inline Indicator ICIR(const Indicator& ind, const Block& blk, int n = 1, int rolling_n = 120,
                       bool spearman = true, bool strict = false) {
-    Indicator ic = IC(ind, blk, query, ref_stk, n, spearman, strict);
+    Indicator ic = IC(ind, blk, n, spearman, strict);
     Indicator x = MA(ic, rolling_n) / STDEV(ic, rolling_n);
     x.name("ICIR");
     x.setParam<int>("n", n);

hikyuu/include/hikyuu/indicator/imp/IAbs.h

@@ -15,6 +15,7 @@ namespace hku {
 
 class IAbs : public IndicatorImp {
     INDICATOR_IMP(IAbs)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IAcos.h

@@ -17,6 +17,7 @@ namespace hku {
 
 class IAcos : public IndicatorImp {
     INDICATOR_IMP(IAcos)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IAd.h

@@ -17,12 +17,10 @@ namespace hku {
 
 class IAd : public IndicatorImp {
     INDICATOR_IMP(IAd)
-    INDICATOR_NEED_CONTEXT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IAd();
-    explicit IAd(const KData&);
     virtual ~IAd();
 };
 

hikyuu/include/hikyuu/indicator/imp/IAdvance.h

@@ -23,6 +23,9 @@ public:
     IAdvance();
     virtual ~IAdvance();
     virtual void _checkParam(const string& name) const override;
+
+    virtual bool supportIncrementCalculate() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IAma.h

@@ -21,6 +21,7 @@ namespace hku {
  */
 class IAma : public IndicatorImp {
     INDICATOR_IMP(IAma)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
@@ -30,6 +31,8 @@ public:
     virtual void _checkParam(const string& name) const override;
     virtual void _dyn_calculate(const Indicator&) override;
 
+    virtual size_t min_increment_start() const override;
+
 private:
     void _dyn_one_circle(const Indicator& ind, size_t curPos, int n, int fast_n, int slow_n);
 };

hikyuu/include/hikyuu/indicator/imp/IAsin.h

@@ -17,6 +17,7 @@ namespace hku {
 
 class IAsin : public IndicatorImp {
     INDICATOR_IMP(IAsin)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IAtan.h

@@ -17,6 +17,7 @@ namespace hku {
 
 class IAtan : public IndicatorImp {
     INDICATOR_IMP(IAtan)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IAtr.h

@@ -15,16 +15,15 @@ namespace hku {
 
 class IAtr : public IndicatorImp {
     INDICATOR_IMP(IAtr)
-    INDICATOR_NEED_CONTEXT
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IAtr();
-    explicit IAtr(const KData&, int n);
     virtual ~IAtr();
     virtual void _checkParam(const string& name) const override;
 };
 
 } /* namespace hku */
 
-#endif /* INDICATOR_IMP_ATR_H_ */
+#endif /* INDICATOR_IMP_ATR_H_ */

hikyuu/include/hikyuu/indicator/imp/IBackset.h

@@ -16,7 +16,8 @@
 namespace hku {
 
 class IBackset : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IBackset)
+    INDICATOR_IMP(IBackset)
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
@@ -24,9 +25,6 @@ public:
     virtual ~IBackset();
 
     virtual void _checkParam(const string& name) const override;
-    virtual bool isSerial() const override {
-        return true;
-    }
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IBlockSetNum.h

@@ -21,6 +21,9 @@ public:
     IBlockSetNum();
     virtual ~IBlockSetNum();
     virtual void _checkParam(const string& name) const override;
+
+    virtual bool supportIncrementCalculate() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/imp/ICeil.h

@@ -20,6 +20,7 @@ namespace hku {
  */
 class ICeil : public IndicatorImp {
     INDICATOR_IMP(ICeil)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IContext.h

@@ -21,9 +21,6 @@ public:
     virtual string formula() const override;
     virtual void _calculate(const Indicator& data) override;
     virtual IndicatorImpPtr _clone() override;
-    virtual bool needSelfAlikeCompare() const noexcept override {
-        return true;
-    }
 
     virtual bool selfAlike(const IndicatorImp& other) const noexcept override;
 

hikyuu/include/hikyuu/indicator/imp/ICorr.h

@@ -21,6 +21,9 @@ public:
     virtual ~ICorr();
 
     virtual void _checkParam(const string& name) const override;
+    virtual bool supportIncrementCalculate() const override;
+    virtual size_t min_increment_start() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/imp/ICos.h

@@ -17,6 +17,7 @@ namespace hku {
 
 class ICos : public IndicatorImp {
     INDICATOR_IMP(ICos)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/ICost.h

@@ -16,12 +16,10 @@ namespace hku {
 /* COST(k, X) 表示X%获利盘的价格是多少 */
 class ICost : public IndicatorImp {
     INDICATOR_IMP(ICost)
-    INDICATOR_NEED_CONTEXT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     ICost();
-    ICost(const KData&, double percent);
     virtual ~ICost();
     virtual void _checkParam(const string& name) const override;
 };

hikyuu/include/hikyuu/indicator/imp/ICount.h

@@ -19,7 +19,8 @@ namespace hku {
  * COUNT(CLOSE>OPEN,20)表示统计20周期内收阳的周期数
  */
 class ICount : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(ICount)
+    INDICATOR_IMP(ICount)
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/ICval.h

@@ -15,6 +15,7 @@ namespace hku {
 
 class ICval : public IndicatorImp {
     INDICATOR_IMP(ICval)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
@@ -23,10 +24,6 @@ public:
     virtual ~ICval();
     virtual void _checkParam(const string& name) const override;
 
-    virtual bool needSelfAlikeCompare() const noexcept override {
-        return true;
-    }
-
     virtual bool selfAlike(const IndicatorImp& other) const noexcept override;
 };
 

hikyuu/include/hikyuu/indicator/imp/ICycle.h

@@ -14,12 +14,10 @@ namespace hku {
 /* 获取换手率，等于 VOL(k) / CAPITAL(k) */
 class ICycle : public IndicatorImp {
     INDICATOR_IMP(ICycle)
-    INDICATOR_NEED_CONTEXT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     ICycle();
-    explicit ICycle(const KData&);
     virtual ~ICycle();
     virtual void _checkParam(const string& name) const override;
 

hikyuu/include/hikyuu/indicator/imp/IDecline.h

@@ -23,6 +23,9 @@ public:
     IDecline();
     virtual ~IDecline();
     virtual void _checkParam(const string& name) const override;
+
+    virtual bool supportIncrementCalculate() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IDevsq.h

@@ -16,13 +16,16 @@
 namespace hku {
 
 class IDevsq : public hku::IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IDevsq)
+    INDICATOR_IMP(IDevsq)
+    INDICATOR_IMP_SUPPORT_INCREMENT
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IDevsq();
     virtual ~IDevsq();
     virtual void _checkParam(const string& name) const override;
+    virtual size_t min_increment_start() const override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IDiff.h

@@ -18,6 +18,7 @@ namespace hku {
  */
 class IDiff : public hku::IndicatorImp {
     INDICATOR_IMP(IDiff)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IDma.h

@@ -19,12 +19,14 @@ namespace hku {
  */
 class IDma : public Indicator2InImp {
     INDICATOR2IN_IMP(IDma)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR2IN_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IDma();
     explicit IDma(const Indicator& ref_a, bool fill_null);
     virtual ~IDma();
+    virtual size_t min_increment_start() const override;
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/imp/IDropna.h

@@ -23,10 +23,6 @@ public:
     IDropna();
     virtual ~IDropna();
 
-    virtual bool needSelfAlikeCompare() const noexcept override {
-        return true;
-    }
-
     // 禁止子节点合并, 上级默认已为 false
     // virtual bool selfAlike(const IndicatorImp& other) const noexcept override {
     //     return false;

hikyuu/include/hikyuu/indicator/imp/IEma.h

@@ -17,7 +17,9 @@ namespace hku {
  * 抛弃数 = 0
  */
 class IEma : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IEma)
+    INDICATOR_IMP(IEma)
+    INDICATOR_IMP_SUPPORT_INCREMENT
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IEvery.h

@@ -19,13 +19,17 @@ namespace hku {
  * 一直存在, EVERY (X,N) 表示条件X在N周期一直存在
  */
 class IEvery : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IEvery)
+    INDICATOR_IMP(IEvery)
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IEvery();
     virtual ~IEvery();
     virtual void _checkParam(const string& name) const override;
+    virtual bool supportIncrementCalculate() const override;
+    virtual size_t min_increment_start() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IExist.h

@@ -19,13 +19,17 @@ namespace hku {
  * 存在, EXIST(X,N) 表示条件X在N周期有存在
  */
 class IExist : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IExist)
+    INDICATOR_IMP(IExist)
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IExist();
     virtual ~IExist();
     virtual void _checkParam(const string& name) const override;
+    virtual bool supportIncrementCalculate() const override;
+    virtual size_t min_increment_start() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IExp.h

@@ -17,6 +17,7 @@ namespace hku {
 
 class IExp : public IndicatorImp {
     INDICATOR_IMP(IExp)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IFilter.h

@@ -16,7 +16,8 @@
 namespace hku {
 
 class IFilter : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IFilter)
+    INDICATOR_IMP(IFilter)
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
@@ -24,10 +25,8 @@ public:
     virtual ~IFilter();
 
     virtual void _checkParam(const string& name) const override;
-
-    virtual bool isSerial() const override {
-        return true;
-    }
+    virtual bool supportIncrementCalculate() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IFinance.h

@@ -13,12 +13,11 @@ namespace hku {
 
 class IFinance : public IndicatorImp {
     INDICATOR_IMP(IFinance)
-    INDICATOR_NEED_CONTEXT
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IFinance();
-    explicit IFinance(const KData&);
     virtual ~IFinance() = default;
 };
 

hikyuu/include/hikyuu/indicator/imp/IFloor.h

@@ -20,6 +20,7 @@ namespace hku {
  */
 class IFloor : public IndicatorImp {
     INDICATOR_IMP(IFloor)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IHhvbars.h

@@ -16,13 +16,17 @@
 namespace hku {
 
 class IHhvbars : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IHhvbars)
+    INDICATOR_IMP(IHhvbars)
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IHhvbars();
     virtual ~IHhvbars();
     virtual void _checkParam(const string& name) const override;
+    virtual bool supportIncrementCalculate() const override;
+    virtual size_t min_increment_start() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IHighLine.h

@@ -20,13 +20,17 @@ namespace hku {
  * 参数： n: N日时间窗口
  */
 class IHighLine : public IndicatorImp {
-    INDICATOR_IMP_SUPPORT_DYNAMIC_STEP(IHighLine)
+    INDICATOR_IMP(IHighLine)
+    INDICATOR_IMP_SUPPORT_DYNAMIC_CYCLE
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IHighLine();
     virtual ~IHighLine();
     virtual void _checkParam(const string& name) const override;
+    virtual bool supportIncrementCalculate() const override;
+    virtual size_t min_increment_start() const override;
+    virtual void _increment_calculate(const Indicator& ind, size_t start_pos) override;
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IHsl.h

@@ -16,12 +16,10 @@ namespace hku {
 /* 获取换手率，等于 VOL(k) / CAPITAL(k) */
 class IHsl : public IndicatorImp {
     INDICATOR_IMP(IHsl)
-    INDICATOR_NEED_CONTEXT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IHsl();
-    explicit IHsl(const KData&);
     virtual ~IHsl();
 };
 

hikyuu/include/hikyuu/indicator/imp/IIc.h

@@ -14,17 +14,16 @@ namespace hku {
 class IIc : public IndicatorImp {
 public:
     IIc();
-    IIc(const StockList& stks, const KQuery& query, int n, const Stock& ref_stk, bool spearman,
-        bool strict);
+    IIc(const StockList& stks, int n, bool spearman, bool strict);
     virtual ~IIc();
 
     virtual void _checkParam(const string& name) const override;
     virtual void _calculate(const Indicator& data) override;
     virtual IndicatorImpPtr _clone() override;
 
+    virtual bool selfAlike(const IndicatorImp& other) const noexcept override;
+
 private:
-    KQuery m_query;
-    Stock m_ref_stk;
     StockList m_stks;
 
 //============================================
@@ -36,8 +35,6 @@ private:
     template <class Archive>
     void serialize(Archive& ar, const unsigned int version) {
         ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp);
-        ar& BOOST_SERIALIZATION_NVP(m_query);
-        ar& BOOST_SERIALIZATION_NVP(m_ref_stk);
         ar& BOOST_SERIALIZATION_NVP(m_stks);
     }
 #endif

hikyuu/include/hikyuu/indicator/imp/IInBlock.h

@@ -16,12 +16,11 @@ namespace hku {
 /* 已指标形式返回是否在指定板块中 */
 class IInBlock : public IndicatorImp {
     INDICATOR_IMP(IInBlock)
-    INDICATOR_NEED_CONTEXT
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     IInBlock();
-    explicit IInBlock(const KData& kdata, const string& category, const string& name);
     virtual ~IInBlock();
 };
 

hikyuu/include/hikyuu/indicator/imp/IIntpart.h

@@ -20,6 +20,7 @@ namespace hku {
  */
 class IIntpart : public IndicatorImp {
     INDICATOR_IMP(IIntpart)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IIsInf.h

@@ -15,6 +15,7 @@ namespace hku {
 
 class IIsInf : public IndicatorImp {
     INDICATOR_IMP(IIsInf)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IIsInfa.h

@@ -15,6 +15,7 @@ namespace hku {
 
 class IIsInfa : public IndicatorImp {
     INDICATOR_IMP(IIsInfa)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IIsLastBar.h

@@ -19,7 +19,6 @@ class IIsLastBar : public IndicatorImp {
 
 public:
     IIsLastBar();
-    explicit IIsLastBar(const KData&);
     virtual ~IIsLastBar();
 };
 

hikyuu/include/hikyuu/indicator/imp/IIsNa.h

@@ -15,6 +15,7 @@ namespace hku {
 
 class IIsNa : public IndicatorImp {
     INDICATOR_IMP(IIsNa)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IJumpDown.h

@@ -14,6 +14,7 @@ namespace hku {
 /* 边缘跳变，从大于0.0，跳变到 <= 0.0 */
 class IJumpDown : public IndicatorImp {
     INDICATOR_IMP(IJumpDown)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:

hikyuu/include/hikyuu/indicator/imp/IJumpUp.h

@@ -14,6 +14,7 @@ namespace hku {
 /* 边缘跳变，从小于等于0.0，跳变到 > 0.0 */
 class IJumpUp : public IndicatorImp {
     INDICATOR_IMP(IJumpUp)
+    INDICATOR_IMP_SUPPORT_INCREMENT
     INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public: