hikyuu 2.6.8.3__py3-none-manylinux2014_x86_64.whl → 2.6.9__py3-none-manylinux2014_x86_64.whl

hikyuu/include/hikyuu/trade_sys/portfolio/imp/SimplePortfolio.h

@@ -28,6 +28,13 @@ public:
     SimplePortfolio(const TradeManagerPtr& tm, const SelectorPtr& se, const AFPtr& af);
     virtual ~SimplePortfolio();
 
+    virtual void _runMomentOnOpen(const Datetime& date, const Datetime& nextCycle,
+                                  bool adjust) override;
+    virtual void _runMomentOnClose(const Datetime& date, const Datetime& nextCycle,
+                                   bool adjust) override;
+
+    virtual json lastSuggestion() const override;
+
 private:
     SystemList m_dlist_sys_list;               // 因证券退市，无法执行卖出的系统（资产全部损失）
     SystemWeightList m_delay_adjust_sys_list;  // 延迟调仓卖出的系统列表

hikyuu/include/hikyuu/trade_sys/portfolio/imp/WithoutAFPortfolio.h

@@ -25,6 +25,13 @@ public:
     WithoutAFPortfolio(const TradeManagerPtr& tm, const SelectorPtr& se);
     virtual ~WithoutAFPortfolio();
 
+    virtual void _runMomentOnOpen(const Datetime& date, const Datetime& nextCycle,
+                                  bool adjust) override;
+    virtual void _runMomentOnClose(const Datetime& date, const Datetime& nextCycle,
+                                   bool adjust) override;
+
+    virtual json lastSuggestion() const override;
+
 private:
     void initParam();
     void _runMomentWithoutAFNotForceSell(const Datetime& date, const Datetime& nextCycle,

hikyuu/include/hikyuu/trade_sys/selector/SelectorBase.h

@@ -13,10 +13,13 @@
 #include "../../KData.h"
 #include "../../utilities/Parameter.h"
 #include "hikyuu/trade_sys/allocatefunds/AllocateFundsBase.h"
+#include "hikyuu/trade_sys/multifactor/MultiFactorBase.h"
 #include "SystemWeight.h"
 
 namespace hku {
 
+class HKU_API Portfolio;
+
 /**
  * 交易对象选择模块
  * @ingroup Selector
@@ -44,6 +47,15 @@ public:
     /** 设置算法名称 */
     void name(const string& name);
 
+    using PFPtr = shared_ptr<Portfolio>;
+    PFPtr getPF() const {
+        return m_pf.lock();
+    }
+
+    void setPF(const PFPtr& pf) {
+        m_pf = pf;
+    }
+
     /**
      * 添加备选股票及其交易策略原型
      * @param stock 备选股票
@@ -132,6 +144,25 @@ public:
 
     virtual string str() const;
 
+public:
+    //------------------------------------------------------------------------
+    // 和 MF 相关的 Selector 才有用，放在这里主要为了 SEPtr 可以直接获取 MF 相关信息
+    // 非 MF 相关的 Selecter 无用
+    //------------------------------------------------------------------------
+    MFPtr getMF() const {
+        return m_mf;
+    }
+
+    ScoresFilterPtr getScoresFilter() const {
+        return m_sc_filter;
+    }
+
+    /** 设置截面评分记录过滤，仅用于 MF 相关的 Selector，从 MF 获取 Score 列表时进行过滤 */
+    void setScoresFilter(const ScoresFilterPtr& filter);
+
+    /** 在已有过滤基础上追加过滤，仅用于 MF 相关的 Selector，从 MF 获取 Score 列表时进行过滤 */
+    void addScoresFilter(const ScoresFilterPtr& filter);
+
 protected:
     virtual bool isPythonObject() const {
         return false;
@@ -140,6 +171,10 @@ protected:
 private:
     void initParam();
 
+protected:
+    ScoresFilterPtr m_sc_filter;
+    MFPtr m_mf;
+
 protected:
     string m_name;
     bool m_calculated{false};  // 是否已计算过
@@ -150,6 +185,8 @@ protected:
     SystemList m_pro_sys_list;   // 原型系统列表
     SystemList m_real_sys_list;  // PF组合中实际运行的系统，有PF执行时设定，顺序与原型列表一一对应
 
+    std::weak_ptr<Portfolio> m_pf;  // 仅存储不序列化，对 PF 的引用
+
 //============================================
 // 序列化支持
 //============================================
@@ -161,6 +198,8 @@ private:
         ar& BOOST_SERIALIZATION_NVP(m_name);
         ar& BOOST_SERIALIZATION_NVP(m_params);
         ar& BOOST_SERIALIZATION_NVP(m_pro_sys_list);
+        ar& BOOST_SERIALIZATION_NVP(m_sc_filter);
+        ar& BOOST_SERIALIZATION_NVP(m_mf);
     }
 
     template <class Archive>
@@ -168,6 +207,8 @@ private:
         ar& BOOST_SERIALIZATION_NVP(m_name);
         ar& BOOST_SERIALIZATION_NVP(m_params);
         ar& BOOST_SERIALIZATION_NVP(m_pro_sys_list);
+        ar& BOOST_SERIALIZATION_NVP(m_sc_filter);
+        ar& BOOST_SERIALIZATION_NVP(m_mf);
     }
 
     BOOST_SERIALIZATION_SPLIT_MEMBER()
@@ -238,6 +279,14 @@ inline const SystemList& SelectorBase::getProtoSystemList() const {
     return m_pro_sys_list;
 }
 
+inline void SelectorBase::setScoresFilter(const ScoresFilterPtr& filter) {
+    m_sc_filter = filter;
+}
+
+inline void SelectorBase::addScoresFilter(const ScoresFilterPtr& filter) {
+    m_sc_filter = m_sc_filter | filter;
+}
+
 } /* namespace hku */
 
 #if FMT_VERSION >= 90000

hikyuu/include/hikyuu/trade_sys/selector/build_in.h

@@ -11,6 +11,7 @@
 
 #include "crt/SE_Fixed.h"
 #include "crt/SE_MultiFactor.h"
+#include "crt/SE_MultiFactor2.h"
 #include "crt/SE_Logic.h"
 #include "crt/SE_Optimal.h"
 #include "crt/SE_Signal.h"

hikyuu/include/hikyuu/trade_sys/selector/crt/SE_MultiFactor2.h

@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-03-30
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "hikyuu/trade_sys/multifactor/MultiFactorBase.h"
+#include "hikyuu/trade_sys/multifactor/buildin_scfilter.h"
+#include "../SelectorBase.h"
+
+namespace hku {
+
+/**
+ * 基于 MultiFactor 选股算法
+ * @return SelectorPtr
+ * @ingroup Selector
+ */
+SelectorPtr HKU_API SE_MultiFactor2(const MFPtr& mf,
+                                    const ScoresFilterPtr& filter = SCFilter_IgnoreNan());
+
+/**
+ * 基于 MultiFactor 选股算法
+ * @param src_inds 原始因子公式
+ * @param ic_n ic 对应的 ic_n 日收益率
+ * @param ic_rolling_n 计算滚动 IC （即 IC 的 n 日移动平均）周期
+ * @param ref_stk 参照对比证券，未指定时，默认使用 sh000300 沪深300指数
+ * @param spearman 默认使用 spearman 计算相关系数，否则为 pearson
+ * @param mode "MF_ICIRWeight" | "MF_ICWeight" | "MF_EqualWeight" 因子合成算法名称
+ * @return SelectorPtr
+ * @ingroup Selector
+ */
+SelectorPtr HKU_API SE_MultiFactor2(const IndicatorList& src_inds, int ic_n = 5,
+                                    int ic_rolling_n = 120, const Stock& ref_stk = Stock(),
+                                    bool spearman = true, const string& mode = "MF_ICIRWeight",
+                                    const ScoresFilterPtr& filter = SCFilter_IgnoreNan());
+
+}  // namespace hku

hikyuu/include/hikyuu/trade_sys/selector/imp/MultiFactorSelector.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "hikyuu/trade_sys/multifactor/MultiFactorBase.h"
 #include "../SelectorBase.h"
 
 namespace hku {
@@ -39,7 +38,6 @@ private:
 
 private:
     IndicatorList m_inds;
-    MFPtr m_mf;
     unordered_map<Stock, SYSPtr> m_stk_sys_dict;
 
     //============================================
@@ -51,7 +49,6 @@ private:
     void serialize(Archive& ar, const unsigned int version) {
         ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(SelectorBase);
         ar& BOOST_SERIALIZATION_NVP(m_inds);
-        ar& BOOST_SERIALIZATION_NVP(m_mf);
     }
 #endif
 };

hikyuu/include/hikyuu/trade_sys/selector/imp/MultiFactorSelector2.h

@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-xx-xx
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SelectorBase.h"
+
+namespace hku {
+
+class MultiFactorSelector2 : public SelectorBase {
+public:
+    MultiFactorSelector2();
+    MultiFactorSelector2(const MFPtr& mf);
+    virtual ~MultiFactorSelector2();
+
+    virtual void _checkParam(const string& name) const override;
+    virtual void _reset() override;
+    virtual SelectorPtr _clone() override;
+    virtual SystemWeightList _getSelected(Datetime date) override;
+    virtual bool isMatchAF(const AFPtr& af) override;
+    virtual void _calculate() override;
+
+    void setIndicators(const IndicatorList& inds) {
+        HKU_ASSERT(!inds.empty());
+        m_inds = inds;
+    }
+
+private:
+    IndicatorList m_inds;
+    unordered_map<Stock, SYSPtr> m_stk_sys_dict;
+
+    //============================================
+    // 序列化支持
+    //============================================
+#if HKU_SUPPORT_SERIALIZATION
+    friend class boost::serialization::access;
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int version) {
+        ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(SelectorBase);
+        ar& BOOST_SERIALIZATION_NVP(m_inds);
+    }
+#endif
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/trade_sys/selector/imp/logic/OperatorSelector.h

@@ -85,7 +85,7 @@ public:                                                            \
     classname() : OperatorSelector(name) {}                        \
     classname(const SelectorPtr& se1, const SelectorPtr& se2)      \
     : OperatorSelector(name, se1, se2) {}                          \
-    virtual ~classname() {}                                        \
+    virtual ~classname() override {}                               \
                                                                    \
     virtual SystemWeightList _getSelected(Datetime date) override; \
                                                                    \

hikyuu/include/hikyuu/trade_sys/selector/imp/logic/OperatorValueSelector.h

@@ -66,7 +66,7 @@ private:
 public:                                                                                        \
     classname() : OperatorValueSelector(name) {}                                               \
     classname(const SelectorPtr& se, double value) : OperatorValueSelector(name, se, value) {} \
-    virtual ~classname() {}                                                                    \
+    virtual ~classname() override {}                                                           \
                                                                                                \
     virtual SystemWeightList _getSelected(Datetime date) override;                             \
                                                                                                \

hikyuu/include/hikyuu/trade_sys/signal/imp/BandSignal2.h

@@ -6,8 +6,6 @@
  */
 
 #pragma once
-#ifndef TRADE_SYS_SIGNAL_IMP_BANDSIGNAL_H_
-#define TRADE_SYS_SIGNAL_IMP_BANDSIGNAL_H_
 
 #include "../../../indicator/Indicator.h"
 #include "../SignalBase.h"
@@ -43,5 +41,3 @@ private:
 #endif
 };
 }  // namespace hku
-
-#endif

hikyuu/include/hikyuu/trade_sys/signal/imp/logic/AddValueSignal.h

@@ -12,8 +12,8 @@
 namespace hku {
 
 class AddValueSignal : public OperatorValueSignal {
-    OPERATOR_SIGNAL_IMP(AddValueSignal, "SG_AddValue")
-    OPERATOR_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
+    OPERATOR_VALUE_SIGNAL_IMP(AddValueSignal, "SG_AddValue")
+    OPERATOR_VALUE_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/trade_sys/signal/imp/logic/DivValueSignal.h

@@ -12,8 +12,8 @@
 namespace hku {
 
 class DivValueSignal : public OperatorValueSignal {
-    OPERATOR_SIGNAL_IMP(DivValueSignal, "SG_DivValue")
-    OPERATOR_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
+    OPERATOR_VALUE_SIGNAL_IMP(DivValueSignal, "SG_DivValue")
+    OPERATOR_VALUE_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     DivValueSignal(double value, const SignalPtr& sg);

hikyuu/include/hikyuu/trade_sys/signal/imp/logic/MulValueSignal.h

@@ -12,8 +12,8 @@
 namespace hku {
 
 class MulValueSignal : public OperatorValueSignal {
-    OPERATOR_SIGNAL_IMP(MulValueSignal, "SG_MulValue")
-    OPERATOR_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
+    OPERATOR_VALUE_SIGNAL_IMP(MulValueSignal, "SG_MulValue")
+    OPERATOR_VALUE_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
 };
 
 } /* namespace hku */

hikyuu/include/hikyuu/trade_sys/signal/imp/logic/OperatorSignal.h

@@ -48,7 +48,7 @@ protected:
 public:                                                                                       \
     classname() : OperatorSignal(name) {}                                                     \
     classname(const SignalPtr& sg1, const SignalPtr& sg2) : OperatorSignal(name, sg1, sg2) {} \
-    virtual ~classname() {}                                                                   \
+    virtual ~classname() override {}                                                          \
     virtual SignalPtr _clone() override {                                                     \
         return make_shared<classname>(m_sg1, m_sg2);                                          \
     }                                                                                         \

hikyuu/include/hikyuu/trade_sys/signal/imp/logic/OperatorValueSignal.h

@@ -42,18 +42,18 @@ protected:
 #endif
 };
 
-#define OPERATOR_SIGNAL_IMP(classname, name)                                               \
+#define OPERATOR_VALUE_SIGNAL_IMP(classname, name)                                         \
 public:                                                                                    \
     classname() : OperatorValueSignal(name) {}                                             \
     classname(const SignalPtr& sg, double value) : OperatorValueSignal(name, sg, value) {} \
-    virtual ~classname() {}                                                                \
+    virtual ~classname() override {}                                                       \
     virtual SignalPtr _clone() override {                                                  \
         return make_shared<classname>(m_sg, m_value);                                      \
     }                                                                                      \
     virtual void _calculate(const KData&) override;
 
 #if HKU_SUPPORT_SERIALIZATION
-#define OPERATOR_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION               \
+#define OPERATOR_VALUE_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION         \
 private:                                                              \
     friend class boost::serialization::access;                        \
     template <class Archive>                                          \
@@ -62,7 +62,7 @@ private:                                                              \
         ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(OperatorValueSignal); \
     }
 #else
-#define OPERATOR_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
+#define OPERATOR_VALUE_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
 #endif
 
 } /* namespace hku */

hikyuu/include/hikyuu/trade_sys/signal/imp/logic/SubValueSignal.h

@@ -12,8 +12,8 @@
 namespace hku {
 
 class SubValueSignal : public OperatorValueSignal {
-    OPERATOR_SIGNAL_IMP(SubValueSignal, "SG_AddValue")
-    OPERATOR_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
+    OPERATOR_VALUE_SIGNAL_IMP(SubValueSignal, "SG_AddValue")
+    OPERATOR_VALUE_SIGNAL_NO_PRIVATE_MEMBER_SERIALIZATION
 
 public:
     SubValueSignal(double value, const SignalPtr& sg);

hikyuu/include/hikyuu/trade_sys/system/System.h

@@ -9,6 +9,7 @@
 #ifndef SYSTEMBASE_H_
 #define SYSTEMBASE_H_
 
+#include <nlohmann/json.hpp>
 // #include "../../KData.h"
 // #include "../../utilities/Parameter.h"
 // #include "../../trade_manage/TradeManager.h"
@@ -25,6 +26,8 @@
 
 namespace hku {
 
+using json = nlohmann::json;
+
 class HKU_API Portfolio;
 class HKU_API AllocateFundsBase;
 class HKU_API WalkForwardSystem;
@@ -180,6 +183,11 @@ public:
      */
     void setTO(const KData& kdata);
 
+    /**
+     * 回测完成后，返回最后一天交易记录，以及需要延迟的买入和卖出延迟请求
+     */
+    json lastSuggestion() const;
+
     /**
      * @brief 不指定stock的方式下run，需要事先通过setStock设定stock
      * @param query 查询条件
@@ -212,6 +220,9 @@ public:
      */
     virtual TradeRecord runMoment(const Datetime& datetime);
 
+    virtual TradeRecord runMomentOnOpen(const Datetime& datetime);
+    virtual TradeRecord runMomentOnClose(const Datetime& datetime);
+
     // 运行前准备工作, 失败将抛出异常
     virtual void readyForRun();
 
@@ -318,7 +329,9 @@ private:
 
     TradeRecord _processRequest(const KRecord& today, const KRecord& src_today);
 
-    TradeRecord _runMoment(const KRecord& record, const KRecord& src_record);
+    TradeRecord _runMoment(const KRecord& today, const KRecord& src_today);
+    TradeRecord _runMomentOnOpen(const KRecord& today, const KRecord& src_today);
+    TradeRecord _runMomentOnClose(const KRecord& today, const KRecord& src_today);
 
     // Portfolio | AllocateFunds 指示立即进行强制卖出，以便对 buy_delay 的系统进行资金调整
     TradeRecord _sellForce(const Datetime& date, double num, Part from, bool on_open);

hikyuu/include/hikyuu/utilities/SpendTimer.h

@@ -34,6 +34,15 @@
 #include <TargetConditionals.h>
 #endif
 
+#ifdef _WIN32
+#include <shlwapi.h>
+#pragma comment(lib, "shlwapi.lib")  // Windows 链接时需要的库
+#define GET_FILENAME(path) PathFindFileNameA(path)
+#else
+#include <libgen.h>
+#define GET_FILENAME(path) basename((char *)path)
+#endif
+
 #ifndef HKU_CLOSE_SPEND_TIME
 #define HKU_CLOSE_SPEND_TIME 1
 #endif
@@ -81,7 +90,7 @@ namespace hku {
  * 代码执行耗时计时器
  * @param id 自定义耗时计时器id
  */
-#define SPEND_TIME(id) hku::SpendTimer test_spend_timer_##id(#id, __FILE__, __LINE__);
+#define SPEND_TIME(id) hku::SpendTimer test_spend_timer_##id(#id, GET_FILENAME(__FILE__), __LINE__);
 
 /**
  * 代码执行耗时计时器，附带输出信息
@@ -90,7 +99,7 @@ namespace hku {
  */
 #define SPEND_TIME_MSG(id, ...)                     \
     std::string msg_##id(fmt::format(__VA_ARGS__)); \
-    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), __FILE__, __LINE__);
+    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), GET_FILENAME(__FILE__), __LINE__);
 
 /** 秒表计时 */
 #define SPEND_TIME_KEEP(id, ...) test_spend_timer_##id.keep(fmt::format(__VA_ARGS__));
@@ -117,8 +126,8 @@ namespace hku {
  * @param id 自定义耗时计时器id
  * @param cycle  循环运行的次数（仅用于统计打印耗时输出）
  */
-#define BENCHMARK_TIME(id, cycle)                                   \
-    hku::SpendTimer test_spend_timer_##id(#id, __FILE__, __LINE__); \
+#define BENCHMARK_TIME(id, cycle)                                                 \
+    hku::SpendTimer test_spend_timer_##id(#id, GET_FILENAME(__FILE__), __LINE__); \
     test_spend_timer_##id.setCycle(cycle);
 
 /**
@@ -127,9 +136,10 @@ namespace hku {
  * @param cycle  循环运行的次数（仅用于统计打印耗时输出）
  * @param ... 输出信息
  */
-#define BENCHMARK_TIME_MSG(id, cycle, ...)                                            \
-    std::string msg_##id(fmt::format(__VA_ARGS__));                                   \
-    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), __FILE__, __LINE__); \
+#define BENCHMARK_TIME_MSG(id, cycle, ...)                                               \
+    std::string msg_##id(fmt::format(__VA_ARGS__));                                      \
+    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), GET_FILENAME(__FILE__), \
+                                          __LINE__);                                     \
     test_spend_timer_##id.setCycle(cycle);
 
 #endif /* HKU_CLOSE_SPEND_TIME */

hikyuu/include/hikyuu/utilities/arithmetic.h

@@ -120,6 +120,11 @@ ValueT roundEx(ValueT number, int ndigits = 0) {
         return static_cast<ValueT>(std::ceil(number * factor - 0.5 - epsilon) / factor);
 }
 
+extern template double HKU_UTILS_API roundEx(double number, int ndigits);
+
+template <>
+float HKU_UTILS_API roundEx(float number, int ndigits);
+
 /**
  * 向上截取，如10.1截取后为11
  * @param number  待处理数据
@@ -194,6 +199,11 @@ ValueT roundDown(ValueT number, int ndigits = 0) {
     return number;
 }
 
+extern template double HKU_UTILS_API roundUp(double number, int ndigits);
+extern template float HKU_UTILS_API roundUp(float number, int ndigits);
+extern template double HKU_UTILS_API roundDown(double number, int ndigits);
+extern template float HKU_UTILS_API roundDown(float number, int ndigits);
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
@@ -405,6 +415,51 @@ inline std::string byteToHexStrForPrint(const std::string &bytes) {
     return byteToHexStrForPrint(bytes.c_str(), bytes.size());
 }
 
+/** 判断 double 是否为整数 */
+bool HKU_UTILS_API isInteger(double num);
+
+/** 判断 float 是否为整数 */
+bool HKU_UTILS_API isInteger(float num);
+
+/**
+ * @brief 获取已排序的向量中指定分位数的值
+ * @param vec 已排序的数组
+ * @param quantile
+ * @return Indicator::value_t
+ */
+template <typename T>
+T get_quantile(const std::vector<T> &vec, double quantile) {
+    if (vec.empty()) {
+        return std::numeric_limits<T>::quiet_NaN();
+    }
+
+    if (quantile <= 0.0) {
+        return vec.front();
+    } else if (quantile >= 1.0) {
+        return vec.back();
+    }
+
+    T ret;
+    double qpos = vec.size() * quantile;
+    if (qpos <= 1.0) {
+        ret = vec[0];
+    } else if (isInteger(qpos)) {
+        size_t pos = static_cast<size_t>(qpos);
+        ret = (vec[pos - 1] + vec[pos]) / 2;
+    } else {
+        size_t pos = static_cast<size_t>(qpos);
+        T x = qpos - pos;
+        ret = vec[pos - 1] + x * (vec[pos] - vec[pos - 1]);
+    }
+    return ret;
+}
+
+extern template double HKU_UTILS_API get_quantile(const std::vector<double> &vec, double quantile);
+extern template float HKU_UTILS_API get_quantile(const std::vector<float> &vec, double quantile);
+
+HKU_UTILS_API std::ostream &operator<<(std::ostream &os, const std::vector<double> &p);
+HKU_UTILS_API std::ostream &operator<<(std::ostream &os, const std::vector<float> &p);
+
 /** @} */
 } /* namespace hku */
 

hikyuu/include/hikyuu/utilities/db_connect/mysql/MySQLConnect.h

@@ -25,7 +25,7 @@ namespace hku {
 class HKU_UTILS_API MySQLConnect : public DBConnectBase {
 public:
     explicit MySQLConnect(const Parameter &param);
-    virtual ~MySQLConnect();
+    virtual ~MySQLConnect() override;
 
     MySQLConnect(const MySQLConnect &) = delete;
     MySQLConnect &operator=(const MySQLConnect &) = delete;

hikyuu/include/hikyuu/utilities/db_connect/mysql/MySQLStatement.h

@@ -36,7 +36,7 @@ class HKU_UTILS_API MySQLStatement : public SQLStatementBase {
 public:
     MySQLStatement() = delete;
     MySQLStatement(DBConnectBase *driver, const std::string &sql_statement);
-    virtual ~MySQLStatement();
+    virtual ~MySQLStatement() override;
 
     virtual void sub_exec() override;
     virtual bool sub_moveNext() override;

hikyuu/include/hikyuu/utilities/db_connect/sqlite/SQLiteConnect.h

@@ -40,7 +40,7 @@ public:
     explicit SQLiteConnect(const Parameter &param);
 
     /** 析构函数 */
-    virtual ~SQLiteConnect();
+    virtual ~SQLiteConnect() override;
 
     /** 如果 sqlite 文件无效，返回false */
     virtual bool ping() override;

hikyuu/include/hikyuu/utilities/db_connect/sqlite/SQLiteStatement.h

@@ -31,7 +31,7 @@ public:
     SQLiteStatement(DBConnectBase *driver, const std::string &sql_statement);
 
     /** 析构函数 */
-    virtual ~SQLiteStatement();
+    virtual ~SQLiteStatement() override;
 
     virtual void sub_exec() override;
     virtual bool sub_moveNext() override;

hikyuu/include/hikyuu/utilities/plugin/PluginLoader.h

@@ -51,10 +51,13 @@ public:
 
 #if HKU_OS_WINDOWS
         m_handle = LoadLibrary(HKU_PATH(filename).c_str());
+        HKU_WARN_IF_RETURN(!m_handle, false, "load plugin({}) failed! errcode: {}", filename,
+                           GetLastError());
+
 #else
         m_handle = dlopen(filename.c_str(), RTLD_LAZY);
+        HKU_WARN_IF_RETURN(!m_handle, false, "load plugin({}) failed! {}", filename, dlerror());
 #endif
-        HKU_WARN_IF_RETURN(!m_handle, false, "load plugin({}) failed!", filename);
 
         typedef PluginBase* (*CreateFunction)();
         CreateFunction createFunction =

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.6.8"
+#define HKU_VERSION "2.6.9"
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 6
-#define HKU_VERSION_ALTER 8
-#define HKU_VERSION_BUILD 202509080027
+#define HKU_VERSION_ALTER 9
+#define HKU_VERSION_BUILD 202510192244
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.8 master.be797426 (RELEASE)"
+#define HKU_VERSION_GIT "2.6.9 release.ee4977f1 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */