hikyuu 2.3.1__py3-none-win_amd64.whl → 2.5.1__py3-none-win_amd64.whl

hikyuu/include/hikyuu/indicator/crt/WINNER.h

@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-01-25
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_CRT_WINNER_H_
+#define INDICATOR_CRT_WINNER_H_
+
+#include "CVAL.h"
+
+namespace hku {
+
+/**
+ * 获利盘比例
+ * @details
+ * <pre>
+ * 用法: WINNER(CLOSE)　表示以当前收市价卖出的获利盘比例。
+ * 例如: 返回0.1表示10%获利盘;WINNER(10.5)表示10.5元价格的获利盘比例
+ * 该函数仅对日线分析周期有效。
+ * </pre>
+ * @ingroup Indicator
+ */
+Indicator HKU_API WINNER();
+
+inline Indicator WINNER(const Indicator& ind) {
+    return WINNER()(ind);
+}
+
+inline Indicator WINNER(Indicator::value_t val) {
+    return WINNER(CVAL(val));
+}
+
+}  // namespace hku
+
+#endif /* INDICATOR_CRT_WINNER_H_ */

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

@@ -7,35 +7,20 @@
 
 #pragma once
 
-#include "../Indicator.h"
+#include "../Indicator2InImp.h"
 
 namespace hku {
 
-class ICorr : public IndicatorImp {
+class ICorr : public Indicator2InImp {
+    INDICATOR2IN_IMP(ICorr)
+    INDICATOR2IN_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
 public:
     ICorr();
     ICorr(const Indicator& ref_ind, int n, bool fill_null);
     virtual ~ICorr();
 
     virtual void _checkParam(const string& name) const override;
-    virtual void _calculate(const Indicator& data) override;
-    virtual IndicatorImpPtr _clone() override;
-
-private:
-    Indicator m_ref_ind;
-
-//============================================
-// 序列化支持
-//============================================
-#if HKU_SUPPORT_SERIALIZATION
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int version) {
-        ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp);
-        ar& BOOST_SERIALIZATION_NVP(m_ref_ind);
-    }
-#endif
 };
 
-}
+}  // namespace hku

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

@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-01-22
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_IMP_ICOST_H_
+#define INDICATOR_IMP_ICOST_H_
+
+#include "../Indicator.h"
+
+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;
+};
+
+} /* namespace hku */
+
+#endif /* INDICATOR_IMP_ICOST_H_ */

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

@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-02-10
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../Indicator.h"
+
+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;
+
+private:
+    void _initParams();
+};
+
+} /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/IDiscard.h

@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-01-31
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_IMP_IDISCARD_H_
+#define INDICATOR_IMP_IDISCARD_H_
+
+#include "../Indicator.h"
+
+namespace hku {
+
+/* 以指标公式的方式设置抛弃值 */
+class IDiscard : public IndicatorImp {
+    INDICATOR_IMP(IDiscard)
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    IDiscard();
+    virtual ~IDiscard();
+    virtual void _checkParam(const string& name) const override;
+};
+
+} /* namespace hku */
+#endif /* INDICATOR_IMP_IDISCARD_H_ */

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

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "../Indicator.h"
+#include "../Indicator2InImp.h"
 
 namespace hku {
 
@@ -17,31 +17,14 @@ namespace hku {
  * 算法：若Y=DMA(X,A) 则 Y=A*X+(1-A)*Y',其中Y'表示上一周期Y值。
  * 例如：DMA(CLOSE,VOL/CAPITAL)表示求以换手率作平滑因子的平均价
  */
-class IDma : public IndicatorImp {
+class IDma : public Indicator2InImp {
+    INDICATOR2IN_IMP(IDma)
+    INDICATOR2IN_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
 public:
     IDma();
     explicit IDma(const Indicator& ref_a, bool fill_null);
     virtual ~IDma();
-
-    virtual void _checkParam(const string& name) const override;
-    virtual void _calculate(const Indicator& data) override;
-    virtual IndicatorImpPtr _clone() override;
-
-private:
-    Indicator m_ref_ind;
-
-//============================================
-// 序列化支持
-//============================================
-#if HKU_SUPPORT_SERIALIZATION
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int version) {
-        ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp);
-        ar& BOOST_SERIALIZATION_NVP(m_ref_ind);
-    }
-#endif
 };
 
-}
+}  // namespace hku

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

@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-01-22
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_IMP_IHSL_H_
+#define INDICATOR_IMP_IHSL_H_
+
+#include "../Indicator.h"
+
+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();
+};
+
+} /* namespace hku */
+
+#endif /* INDICATOR_IMP_IHSL_H_ */

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

@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-01-26
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_IMP_IINBLOCK_H_
+#define INDICATOR_IMP_IINBLOCK_H_
+
+#include "../Indicator.h"
+
+namespace hku {
+
+/* 已指标形式返回是否在指定板块中 */
+class IInBlock : public IndicatorImp {
+    INDICATOR_IMP(IInBlock)
+    INDICATOR_NEED_CONTEXT
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    IInBlock();
+    explicit IInBlock(const KData& kdata, const string& category, const string& name);
+    virtual ~IInBlock();
+};
+
+} /* namespace hku */
+
+#endif /* INDICATOR_IMP_IINBLOCK_H_ */

hikyuu/include/hikyuu/indicator/imp/IIndex.h

@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-09-09
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../Indicator.h"
+
+namespace hku {
+
+class IIndex : public IndicatorImp {
+    INDICATOR_IMP(IIndex)
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    IIndex();
+    IIndex(const string& kpart, bool fill_null);
+    virtual ~IIndex();
+
+    virtual void _checkParam(const string& name) const override;
+};
+
+}  // namespace hku

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

@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-02-10
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../Indicator.h"
+
+namespace hku {
+
+/* 边缘跳变，从大于0.0，跳变到 <= 0.0 */
+class IJumpDown : public IndicatorImp {
+    INDICATOR_IMP(IJumpDown)
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    IJumpDown();
+    virtual ~IJumpDown();
+};
+
+} /* namespace hku */

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

@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-02-10
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../Indicator.h"
+
+namespace hku {
+
+/* 边缘跳变，从小于等于0.0，跳变到 > 0.0 */
+class IJumpUp : public IndicatorImp {
+    INDICATOR_IMP(IJumpUp)
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    IJumpUp();
+    virtual ~IJumpUp();
+};
+
+} /* namespace hku */

hikyuu/include/hikyuu/indicator/imp/ILastValue.h

@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-02-04
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_IMP_ILASTVALUE_H_
+#define INDICATOR_IMP_ILASTVALUE_H_
+
+#include "../Indicator.h"
+
+namespace hku {
+
+class ILastValue : public IndicatorImp {
+    INDICATOR_IMP(ILastValue)
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    ILastValue();
+    virtual ~ILastValue();
+};
+
+} /* namespace hku */
+#endif /* INDICATOR_IMP_ILASTVALUE_H_ */

hikyuu/include/hikyuu/indicator/imp/ISpearman.h

@@ -7,35 +7,20 @@
 
 #pragma once
 
-#include "../Indicator.h"
+#include "../Indicator2InImp.h"
 
 namespace hku {
 
-class ISpearman : public IndicatorImp {
+class ISpearman : public Indicator2InImp {
+    INDICATOR2IN_IMP(ISpearman)
+    INDICATOR2IN_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
 public:
     ISpearman();
     ISpearman(const Indicator& ref_ind, int n, bool fill_null);
     virtual ~ISpearman();
 
     virtual void _checkParam(const string& name) const override;
-    virtual void _calculate(const Indicator& data) override;
-    virtual IndicatorImpPtr _clone() override;
-
-private:
-    Indicator m_ref_ind;
-
-//============================================
-// 序列化支持
-//============================================
-#if HKU_SUPPORT_SERIALIZATION
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int version) {
-        ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp);
-        ar& BOOST_SERIALIZATION_NVP(m_ref_ind);
-    }
-#endif
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/imp/IWinner.h

@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-01-25
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_IMP_IWINNER_H_
+#define INDICATOR_IMP_IWINNER_H_
+
+#include "../Indicator.h"
+
+namespace hku {
+
+class IWinner : public IndicatorImp {
+    INDICATOR_IMP(IWinner)
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    IWinner();
+    virtual ~IWinner();
+};
+
+} /* namespace hku */
+#endif /* INDICATOR_IMP_IWINNER_H_ */

hikyuu/include/hikyuu/indicator_talib/imp/TaMavp.h

@@ -8,34 +8,20 @@
 #pragma once
 
 #include "hikyuu/indicator/Indicator.h"
+#include "hikyuu/indicator/Indicator2InImp.h"
 
 namespace hku {
 
-class TaMavp : public IndicatorImp {
+class TaMavp : public Indicator2InImp {
+    INDICATOR2IN_IMP(TaMavp)
+    INDICATOR2IN_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
 public:
     TaMavp();
     TaMavp(const Indicator& ref_ind, int min_n, int max_n, int matype, bool fill_null);
     virtual ~TaMavp();
 
     virtual void _checkParam(const string& name) const override;
-    virtual void _calculate(const Indicator& data) override;
-    virtual IndicatorImpPtr _clone() override;
-
-private:
-    Indicator m_ref_ind;
-
-//============================================
-// 序列化支持
-//============================================
-#if HKU_SUPPORT_SERIALIZATION
-private:
-    friend class boost::serialization::access;
-    template <class Archive>
-    void serialize(Archive& ar, const unsigned int version) {
-        ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp);
-        ar& BOOST_SERIALIZATION_NVP(m_ref_ind);
-    }
-#endif
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator_talib/imp/ta_defines.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "hikyuu/indicator/Indicator.h"
+#include "hikyuu/indicator/Indicator2InImp.h"
 
 #define TA_IN1_OUT_DEF(func)                          \
     class Cls_##func : public IndicatorImp {          \
@@ -30,79 +31,27 @@
         virtual void _checkParam(const string& name) const override; \
     };
 
-#if HKU_SUPPORT_SERIALIZATION
-#define TA_IN2_OUT_DEF(func)                                       \
-    class Cls_##func : public IndicatorImp {                       \
-    public:                                                        \
-        Cls_##func();                                              \
-        Cls_##func(const Indicator& ref_ind, bool fill_null);      \
-        virtual ~Cls_##func();                                     \
-        virtual void _calculate(const Indicator& data) override;   \
-        virtual IndicatorImpPtr _clone() override;                 \
-                                                                   \
-    private:                                                       \
-        Indicator m_ref_ind;                                       \
-                                                                   \
-    private:                                                       \
-        friend class boost::serialization::access;                 \
-        template <class Archive>                                   \
-        void serialize(Archive& ar, const unsigned int version) {  \
-            ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp); \
-            ar& BOOST_SERIALIZATION_NVP(m_ref_ind);                \
-        }                                                          \
+#define TA_IN2_OUT_DEF(func)                                  \
+    class Cls_##func : public Indicator2InImp {               \
+        INDICATOR2IN_IMP(Cls_##func)                          \
+        INDICATOR2IN_IMP_NO_PRIVATE_MEMBER_SERIALIZATION      \
+    public:                                                   \
+        Cls_##func();                                         \
+        Cls_##func(const Indicator& ref_ind, bool fill_null); \
+        virtual ~Cls_##func();                                \
     };
 
 #define TA_IN2_OUT_N_DEF(func)                                       \
-    class Cls_##func : public IndicatorImp {                         \
+    class Cls_##func : public Indicator2InImp {                      \
+        INDICATOR2IN_IMP(Cls_##func)                                 \
+        INDICATOR2IN_IMP_NO_PRIVATE_MEMBER_SERIALIZATION             \
     public:                                                          \
         Cls_##func();                                                \
         explicit Cls_##func(int n, bool fill_null);                  \
         Cls_##func(const Indicator& ref_ind, int n, bool fill_null); \
         virtual ~Cls_##func();                                       \
         virtual void _checkParam(const string& name) const override; \
-        virtual void _calculate(const Indicator& data) override;     \
-        virtual IndicatorImpPtr _clone() override;                   \
-                                                                     \
-    private:                                                         \
-        Indicator m_ref_ind;                                         \
-                                                                     \
-    private:                                                         \
-        friend class boost::serialization::access;                   \
-        template <class Archive>                                     \
-        void serialize(Archive& ar, const unsigned int version) {    \
-            ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp);   \
-            ar& BOOST_SERIALIZATION_NVP(m_ref_ind);                  \
-        }                                                            \
-    };
-#else
-#define TA_IN2_OUT_DEF(func)                                     \
-    class Cls_##func : public IndicatorImp {                     \
-    public:                                                      \
-        Cls_##func();                                            \
-        Cls_##func(const Indicator& ref_ind);                    \
-        virtual ~Cls_##func();                                   \
-        virtual void _calculate(const Indicator& data) override; \
-        virtual IndicatorImpPtr _clone() override;               \
-                                                                 \
-    private:                                                     \
-        Indicator m_ref_ind;                                     \
-    };
-
-#define TA_IN2_OUT_N_DEF(func)                                       \
-    class Cls_##func : public IndicatorImp {                         \
-    public:                                                          \
-        Cls_##func();                                                \
-        explicit Cls_##func(int n);                                  \
-        Cls_##func(const Indicator& ref_ind, int n);                 \
-        virtual ~Cls_##func();                                       \
-        virtual void _checkParam(const string& name) const override; \
-        virtual void _calculate(const Indicator& data) override;     \
-        virtual IndicatorImpPtr _clone() override;                   \
-                                                                     \
-    private:                                                         \
-        Indicator m_ref_ind;                                         \
     };
-#endif
 
 #define TA_K_OUT_DEF(func)                            \
     class Cls_##func : public IndicatorImp {          \