hikyuu 2.6.2__py3-none-win_amd64.whl → 2.6.3__py3-none-win_amd64.whl

hikyuu/include/hikyuu/strategy/Strategy.h

@@ -128,6 +128,24 @@ public:
     KData getLastKData(const Stock& stk, size_t lastnum, const KQuery::KType& ktype,
                        KQuery::RecoverType recover_type = KQuery::NO_RECOVER) const;
 
+    /**
+     * @brief 按股下单，+正数买入，-负数卖出
+     * @param stk 交易标的
+     * @param num 交易数量
+     * @param remark 交易备注
+     * @return TradeRecord
+     */
+    virtual TradeRecord order(const Stock& stk, double num, const string& remark = "");
+
+    /**
+     * @brief 按价值下单，即买入指定资金数量的股票
+     * @param stk 交易标的
+     * @param value 价值
+     * @param remark 交易备注
+     * @return TradeRecord
+     */
+    virtual TradeRecord orderValue(const Stock& stk, price_t value, const string& remark = "");
+
     virtual KData getKData(const Stock& stk, const Datetime& start_date, const Datetime& end_date,
                            const KQuery::KType& ktype,
                            KQuery::RecoverType recover_type = KQuery::NO_RECOVER) const;
@@ -144,18 +162,13 @@ public:
     }
 
     virtual TradeRecord buy(const Stock& stk, price_t price, double num, double stoploss = 0.0,
-                            double goal_price = 0.0,
-                            SystemPart part_from = SystemPart::PART_SIGNAL) {
-        HKU_ASSERT(m_tm);
-        return m_tm->buy(Datetime::now(), stk, price, num, stoploss, goal_price, price, part_from);
-    }
+                            double goal_price = 0.0, SystemPart part_from = SystemPart::PART_SIGNAL,
+                            const string& remark = "");
 
     virtual TradeRecord sell(const Stock& stk, price_t price, double num, price_t stoploss = 0.0,
                              price_t goal_price = 0.0,
-                             SystemPart part_from = SystemPart::PART_SIGNAL) {
-        HKU_ASSERT(m_tm);
-        return m_tm->sell(Datetime::now(), stk, price, num, stoploss, goal_price, price, part_from);
-    }
+                             SystemPart part_from = SystemPart::PART_SIGNAL,
+                             const string& remark = "");
 
     virtual bool isBacktesting() const {
         return false;

hikyuu/include/hikyuu/trade_manage/OrderBrokerBase.h

@@ -71,9 +71,10 @@ public:
      * @param stoploss 预期的止损价
      * @param goalPrice 预期的目标价位
      * @param from 系统部件来源
+     * @param remark 备注信息
      */
     void buy(Datetime datetime, const string& market, const string& code, price_t price, double num,
-             price_t stoploss, price_t goalPrice, SystemPart from) noexcept;
+             price_t stoploss, price_t goalPrice, SystemPart from, const string& remark) noexcept;
 
     /**
      * 执行卖出操作
@@ -85,9 +86,11 @@ public:
      * @param stoploss 新的预期止损价
      * @param goalPrice 新的预期目标价位
      * @param from 系统部件来源
+     * @param remark 备注信息
      */
     void sell(Datetime datetime, const string& market, const string& code, price_t price,
-              double num, price_t stoploss, price_t goalPrice, SystemPart from) noexcept;
+              double num, price_t stoploss, price_t goalPrice, SystemPart from,
+              const string& remark) noexcept;
 
     /**
      * 获取当前资产信息
@@ -123,9 +126,11 @@ public:
      * @param stoploss 预期的止损价
      * @param goalPrice 预期的目标价位
      * @param from 系统部件来源
+     * @param remark 备注信息
      */
     virtual void _buy(Datetime datetime, const string& market, const string& code, price_t price,
-                      double num, price_t stoploss, price_t goalPrice, SystemPart from) = 0;
+                      double num, price_t stoploss, price_t goalPrice, SystemPart from,
+                      const string& remark) = 0;
 
     /**
      * 子类实现接口，执行实际卖出操作
@@ -137,9 +142,11 @@ public:
      * @param stoploss 新预期的止损价
      * @param goalPrice 新预期的目标价位
      * @param from 系统部件来源
+     * @param remark 备注信息
      */
     virtual void _sell(Datetime datetime, const string& market, const string& code, price_t price,
-                       double num, price_t stoploss, price_t goalPrice, SystemPart from) = 0;
+                       double num, price_t stoploss, price_t goalPrice, SystemPart from,
+                       const string& remark) = 0;
 
     virtual string _getAssetInfo() {
         return string();

hikyuu/include/hikyuu/trade_manage/TradeManager.h

@@ -229,7 +229,8 @@ public:
      */
     virtual TradeRecord buy(const Datetime& datetime, const Stock& stock, price_t realPrice,
                             double number, price_t stoploss = 0.0, price_t goalPrice = 0.0,
-                            price_t planPrice = 0.0, SystemPart from = PART_INVALID) override;
+                            price_t planPrice = 0.0, SystemPart from = PART_INVALID,
+                            const string& remark = "") override;
 
     /**
      * 卖出操作
@@ -246,7 +247,7 @@ public:
     virtual TradeRecord sell(const Datetime& datetime, const Stock& stock, price_t realPrice,
                              double number = MAX_DOUBLE, price_t stoploss = 0.0,
                              price_t goalPrice = 0.0, price_t planPrice = 0.0,
-                             SystemPart from = PART_INVALID) override;
+                             SystemPart from = PART_INVALID, const string& remark = "") override;
 
     /**
      * 卖空
@@ -262,7 +263,8 @@ public:
      */
     virtual TradeRecord sellShort(const Datetime& datetime, const Stock& stock, price_t realPrice,
                                   double number, price_t stoploss = 0.0, price_t goalPrice = 0.0,
-                                  price_t planPrice = 0.0, SystemPart from = PART_INVALID) override;
+                                  price_t planPrice = 0.0, SystemPart from = PART_INVALID,
+                                  const string& remark = "") override;
 
     /**
      * 卖空后回补
@@ -279,7 +281,8 @@ public:
     virtual TradeRecord buyShort(const Datetime& datetime, const Stock& stock, price_t realPrice,
                                  double number = MAX_DOUBLE, price_t stoploss = 0.0,
                                  price_t goalPrice = 0.0, price_t planPrice = 0.0,
-                                 SystemPart from = PART_INVALID) override;
+                                 SystemPart from = PART_INVALID,
+                                 const string& remark = "") override;
 
     /**
      * 借入资金，从其他来源借取的资金，如融资
@@ -400,7 +403,7 @@ private:
     TradeRecordList m_trade_list;  // 交易记录
 
     typedef map<uint64_t, PositionRecord> position_map_type;
-    position_map_type m_position;  // 当前持仓交易对象的持仓记录 ["sh000001"-> ]
+    position_map_type m_position;                 // 当前持仓交易对象的持仓记录 ["sh000001"-> ]
     PositionRecordList m_position_history;        // 持仓历史记录
     position_map_type m_short_position;           // 空头仓位记录
     PositionRecordList m_short_position_history;  // 空头仓位历史记录

hikyuu/include/hikyuu/trade_manage/TradeManagerBase.h

@@ -522,7 +522,8 @@ public:
      */
     virtual TradeRecord buy(const Datetime& datetime, const Stock& stock, price_t realPrice,
                             double number, price_t stoploss = 0.0, price_t goalPrice = 0.0,
-                            price_t planPrice = 0.0, SystemPart from = PART_INVALID) {
+                            price_t planPrice = 0.0, SystemPart from = PART_INVALID,
+                            const string& remark = "") {
         HKU_WARN("The subclass does not implement this method");
         return TradeRecord();
     }
@@ -542,7 +543,7 @@ public:
     virtual TradeRecord sell(const Datetime& datetime, const Stock& stock, price_t realPrice,
                              double number = MAX_DOUBLE, price_t stoploss = 0.0,
                              price_t goalPrice = 0.0, price_t planPrice = 0.0,
-                             SystemPart from = PART_INVALID) {
+                             SystemPart from = PART_INVALID, const string& remark = "") {
         HKU_WARN("The subclass does not implement this method");
         return TradeRecord();
     }
@@ -561,7 +562,8 @@ public:
      */
     virtual TradeRecord sellShort(const Datetime& datetime, const Stock& stock, price_t realPrice,
                                   double number, price_t stoploss = 0.0, price_t goalPrice = 0.0,
-                                  price_t planPrice = 0.0, SystemPart from = PART_INVALID) {
+                                  price_t planPrice = 0.0, SystemPart from = PART_INVALID,
+                                  const string& remark = "") {
         HKU_WARN("The subclass does not implement this method");
         return TradeRecord();
     }
@@ -581,7 +583,7 @@ public:
     virtual TradeRecord buyShort(const Datetime& datetime, const Stock& stock, price_t realPrice,
                                  double number = MAX_DOUBLE, price_t stoploss = 0.0,
                                  price_t goalPrice = 0.0, price_t planPrice = 0.0,
-                                 SystemPart from = PART_INVALID) {
+                                 SystemPart from = PART_INVALID, const string& remark = "") {
         HKU_WARN("The subclass does not implement this method");
         return TradeRecord();
     }

hikyuu/include/hikyuu/trade_manage/TradeRecord.h

@@ -61,7 +61,12 @@ public:
     TradeRecord();
     TradeRecord(const Stock& stock, const Datetime& datetime, BUSINESS business, price_t planPrice,
                 price_t realPrice, price_t goalPrice, double number, const CostRecord& cost,
-                price_t stoploss, price_t cash, SystemPart from);
+                price_t stoploss, price_t cash, SystemPart from, const string& remark = "");
+    TradeRecord(const TradeRecord&) = default;
+    TradeRecord& operator=(const TradeRecord&) = default;
+
+    TradeRecord(TradeRecord&&);
+    TradeRecord& operator=(TradeRecord&&);
 
     /** 仅用于python的__str__ */
     string toString() const;
@@ -79,6 +84,7 @@ public:
     price_t stoploss;   ///< 止损价
     price_t cash;       ///< 现金余额
     SystemPart from;    ///< 辅助记录交易系统部件，区别是哪个部件发出的指示，Null<int>()表示无效
+    string remark;      ///< 备注
 
 #if HKU_SUPPORT_SERIALIZATION
 private:
@@ -98,6 +104,7 @@ private:
         ar& BOOST_SERIALIZATION_NVP(cost);
         ar& BOOST_SERIALIZATION_NVP(stoploss);
         ar& BOOST_SERIALIZATION_NVP(cash);
+        ar& BOOST_SERIALIZATION_NVP(remark);
         string part_name(getSystemPartName(from));
         ar& bs::make_nvp<string>("from", part_name);
     }
@@ -119,6 +126,7 @@ private:
         ar& BOOST_SERIALIZATION_NVP(cost);
         ar& BOOST_SERIALIZATION_NVP(stoploss);
         ar& BOOST_SERIALIZATION_NVP(cash);
+        ar& BOOST_SERIALIZATION_NVP(remark);
         string part_name;
         ar& bs::make_nvp<string>("from", part_name);
         from = getSystemPartEnum(part_name);

hikyuu/include/hikyuu/trade_sys/multifactor/MultiFactorBase.h

@@ -29,7 +29,8 @@ public:
     MultiFactorBase();
     explicit MultiFactorBase(const string& name);
     MultiFactorBase(const IndicatorList& inds, const StockList& stks, const KQuery& query,
-                    const Stock& ref_stk, const string& name, int ic_n, bool spearman);
+                    const Stock& ref_stk, const string& name, int ic_n, bool spearman, int mode,
+                    bool save_all_factors);
     MultiFactorBase(const MultiFactorBase&);
     virtual ~MultiFactorBase() = default;
 
@@ -44,9 +45,7 @@ public:
     }
 
     /** 获取参考日期列表 */
-    const DatetimeList& getDatetimeList() const {
-        return m_ref_dates;
-    }
+    const DatetimeList& getDatetimeList();
 
     /** 获取查询范围 */
     const KQuery& getQuery() const {
@@ -153,7 +152,11 @@ private:
     void initParam();
 
 protected:
-    void _buildIndex();  // 计算完成后创建截面索引
+    void _buildIndex();      // 计算完成后创建截面索引
+    void _buildIndexDesc();  // 创建降序排列的索引
+    void _buildIndexAsc();   // 创建升序排列的索引
+    void _buildIndexNone();  // build index when no index
+
     IndicatorList _getAllReturns(int ndays) const;
     void _checkData();
 

hikyuu/include/hikyuu/trade_sys/multifactor/crt/MF_EqualWeight.h

@@ -18,11 +18,14 @@ namespace hku {
  * @param ref_stk 参考证券
  * @param ic_n 默认 IC 对应的 N 日收益率
  * @param spearman 默认使用 spearman 计算相关系数，否则为 pearson
+ * @param mode 获取截面数据时排序模式: 0-降序, 1-升序, 2-不排序
+ * @param save_all_factors 是否保留因子数据
  * @return MultiFactorPtr
  */
 MultiFactorPtr HKU_API MF_EqualWeight(const IndicatorList& inds, const StockList& stks,
                                       const KQuery& query, const Stock& ref_stk, int ic_n = 5,
-                                      bool spearman = true);
+                                      bool spearman = true, int mode = 0,
+                                      bool save_all_factors = false);
 
 MultiFactorPtr HKU_API MF_EqualWeight();
 

hikyuu/include/hikyuu/trade_sys/multifactor/crt/MF_ICIRWeight.h

@@ -20,11 +20,14 @@ namespace hku {
  * @param ic_n 默认 IC 对应的 N 日收益率
  * @param ic_rolling_n IC 滚动窗口
  * @param spearman 默认使用 spearman 计算相关系数，否则为 pearson
+ * @param mode 获取截面数据时排序模式: 0-降序, 1-升序, 2-不排序
+ * @param save_all_factors 是否保留因子数据
  * @return MultiFactorPtr
  */
 MultiFactorPtr HKU_API MF_ICIRWeight(const IndicatorList& inds, const StockList& stks,
                                      const KQuery& query, const Stock& ref_stk, int ic_n = 5,
-                                     int ic_rolling_n = 120, bool spearman = true);
+                                     int ic_rolling_n = 120, bool spearman = true, int mode = 0,
+                                     bool save_all_factors = false);
 
 MultiFactorPtr HKU_API MF_ICIRWeight();
 }  // namespace hku

hikyuu/include/hikyuu/trade_sys/multifactor/crt/MF_ICWeight.h

@@ -20,11 +20,14 @@ namespace hku {
  * @param ic_n 默认 IC 对应的 N 日收益率
  * @param ic_rolling_n IC 滚动窗口
  * @param spearman 默认使用 spearman 计算相关系数，否则为 pearson
+ * @param mode 获取截面数据时排序模式: 0-降序, 1-升序, 2-不排序
+ * @param save_all_factors 是否保留因子数据
  * @return MultiFactorPtr
  */
 MultiFactorPtr HKU_API MF_ICWeight(const IndicatorList& inds, const StockList& stks,
                                    const KQuery& query, const Stock& ref_stk, int ic_n = 5,
-                                   int ic_rolling_n = 120, bool spearman = true);
+                                   int ic_rolling_n = 120, bool spearman = true, int mode = 0,
+                                   bool save_all_factors = false);
 MultiFactorPtr HKU_API MF_ICWeight();
 
 }  // namespace hku

hikyuu/include/hikyuu/trade_sys/multifactor/crt/MF_Weight.h

@@ -19,11 +19,14 @@ namespace hku {
  * @param ref_stk 参考证券
  * @param ic_n 默认 IC 对应的 N 日收益率
  * @param spearman 默认使用 spearman 计算相关系数，否则为 pearson
+ * @param mode 获取截面数据时排序模式: 0-降序, 1-升序, 2-不排序
+ * @param save_all_factors 是否保留因子数据
  * @return MultiFactorPtr
  */
 MultiFactorPtr HKU_API MF_Weight(const IndicatorList& inds, const PriceList& weights,
                                  const StockList& stks, const KQuery& query, const Stock& ref_stk,
-                                 int ic_n = 5, bool spearman = true);
+                                 int ic_n = 5, bool spearman = true, int mode = 0,
+                                 bool save_all_factors = false);
 
 MultiFactorPtr HKU_API MF_Weight();
 

hikyuu/include/hikyuu/trade_sys/multifactor/imp/EqualWeightMultiFactor.h

@@ -18,7 +18,8 @@ class EqualWeightMultiFactor : public MultiFactorBase {
 public:
     EqualWeightMultiFactor();
     EqualWeightMultiFactor(const vector<Indicator>& inds, const StockList& stks,
-                           const KQuery& query, const Stock& ref_stk, int ic_n, bool spearman);
+                           const KQuery& query, const Stock& ref_stk, int ic_n, bool spearman,
+                           int mode, bool save_all_factors);
     virtual ~EqualWeightMultiFactor() = default;
 };
 

hikyuu/include/hikyuu/trade_sys/multifactor/imp/ICIRMultiFactor.h

@@ -18,7 +18,8 @@ class ICIRMultiFactor : public MultiFactorBase {
 public:
     ICIRMultiFactor();
     ICIRMultiFactor(const IndicatorList& inds, const StockList& stks, const KQuery& query,
-                    const Stock& ref_stk, int ic_n, int ic_rolling_n, bool spearman);
+                    const Stock& ref_stk, int ic_n, int ic_rolling_n, bool spearman, int mode,
+                    bool save_all_factors);
     virtual ~ICIRMultiFactor() = default;
 
     virtual void _checkParam(const string& name) const override;

hikyuu/include/hikyuu/trade_sys/multifactor/imp/ICMultiFactor.h

@@ -18,7 +18,8 @@ class ICMultiFactor : public MultiFactorBase {
 public:
     ICMultiFactor();
     ICMultiFactor(const IndicatorList& inds, const StockList& stks, const KQuery& query,
-                  const Stock& ref_stk, int ic_n, int ic_rolling_n, bool spearman);
+                  const Stock& ref_stk, int ic_n, int ic_rolling_n, bool spearman, int mode,
+                  bool save_all_factors);
     virtual ~ICMultiFactor() = default;
 
     virtual void _checkParam(const string& name) const override;

hikyuu/include/hikyuu/trade_sys/multifactor/imp/WeightMultiFactor.h

@@ -21,7 +21,7 @@ public:
     WeightMultiFactor();
     WeightMultiFactor(const vector<Indicator>& inds, const PriceList& weights,
                       const StockList& stks, const KQuery& query, const Stock& ref_stk, int ic_n,
-                      bool spearman);
+                      bool spearman, int mode, bool save_all_factors);
     virtual ~WeightMultiFactor() = default;
 
 private:

hikyuu/include/hikyuu/trade_sys/system/TradeRequest.h

@@ -28,11 +28,12 @@ public:
     Datetime datetime;
     price_t stoploss{0.0};
     price_t goal{0.0};
-    double number{0.0};  // 计划的买入/卖出数量，使用发出请求时刻的收盘价，
-                         // 用于避免实际买入时需用重新计算数量时，人工执行速度较慢
-                         // 可通过系统参数进行设置，是否使用
+    double number{0.0};             // 计划的买入/卖出数量，使用发出请求时刻的收盘价，
+                                    // 用于避免实际买入时需用重新计算数量时，人工执行速度较慢
+                                    // 可通过系统参数进行设置，是否使用
     SystemPart from{PART_INVALID};  // 记录SystemBase::Part
-    int count{0};                   // 因操作失败，连续延迟的次数
+    string remark;
+    int count{0};  // 因操作失败，连续延迟的次数
     KRecord krecord;
 
 //============================================
@@ -54,6 +55,7 @@ private:
         ar& BOOST_SERIALIZATION_NVP(number);
         string from_name(getSystemPartName(from));
         ar& bs::make_nvp<string>("from", from_name);
+        ar& BOOST_SERIALIZATION_NVP(remark);
         ar& BOOST_SERIALIZATION_NVP(count);
         ar& BOOST_SERIALIZATION_NVP(krecord);
     }
@@ -74,6 +76,7 @@ private:
         string from_name;
         ar& bs::make_nvp<string>("from", from_name);
         from = getSystemPartEnum(from_name);
+        ar& BOOST_SERIALIZATION_NVP(remark);
         ar& BOOST_SERIALIZATION_NVP(count);
         ar& BOOST_SERIALIZATION_NVP(krecord);
     }

hikyuu/include/hikyuu/trade_sys/system/imp/WalkForwardTradeManager.h

@@ -262,9 +262,10 @@ public:
      */
     virtual TradeRecord buy(const Datetime& datetime, const Stock& stock, price_t realPrice,
                             double number, price_t stoploss = 0.0, price_t goalPrice = 0.0,
-                            price_t planPrice = 0.0, SystemPart from = PART_INVALID) override {
+                            price_t planPrice = 0.0, SystemPart from = PART_INVALID,
+                            const string& remark = "") override {
         return (datetime >= m_run_start) ? m_tm->buy(datetime, stock, realPrice, number, stoploss,
-                                                     goalPrice, planPrice, from)
+                                                     goalPrice, planPrice, from, remark)
                                          : TradeRecord();
     }
 
@@ -283,9 +284,9 @@ public:
     virtual TradeRecord sell(const Datetime& datetime, const Stock& stock, price_t realPrice,
                              double number = MAX_DOUBLE, price_t stoploss = 0.0,
                              price_t goalPrice = 0.0, price_t planPrice = 0.0,
-                             SystemPart from = PART_INVALID) override {
+                             SystemPart from = PART_INVALID, const string& remark = "") override {
         return (datetime >= m_run_start) ? m_tm->sell(datetime, stock, realPrice, number, stoploss,
-                                                      goalPrice, planPrice, from)
+                                                      goalPrice, planPrice, from, remark)
                                          : TradeRecord();
     }
 
@@ -303,11 +304,12 @@ public:
      */
     virtual TradeRecord sellShort(const Datetime& datetime, const Stock& stock, price_t realPrice,
                                   double number, price_t stoploss = 0.0, price_t goalPrice = 0.0,
-                                  price_t planPrice = 0.0,
-                                  SystemPart from = PART_INVALID) override {
-        return (datetime >= m_run_start) ? m_tm->sellShort(datetime, stock, realPrice, number,
-                                                           stoploss, goalPrice, planPrice, from)
-                                         : TradeRecord();
+                                  price_t planPrice = 0.0, SystemPart from = PART_INVALID,
+                                  const string& remark = "") override {
+        return (datetime >= m_run_start)
+                 ? m_tm->sellShort(datetime, stock, realPrice, number, stoploss, goalPrice,
+                                   planPrice, from, remark)
+                 : TradeRecord();
     }
 
     /**
@@ -325,10 +327,12 @@ public:
     virtual TradeRecord buyShort(const Datetime& datetime, const Stock& stock, price_t realPrice,
                                  double number = MAX_DOUBLE, price_t stoploss = 0.0,
                                  price_t goalPrice = 0.0, price_t planPrice = 0.0,
-                                 SystemPart from = PART_INVALID) override {
-        return (datetime >= m_run_start) ? m_tm->buyShort(datetime, stock, realPrice, number,
-                                                          stoploss, goalPrice, planPrice, from)
-                                         : TradeRecord();
+                                 SystemPart from = PART_INVALID,
+                                 const string& remark = "") override {
+        return (datetime >= m_run_start)
+                 ? m_tm->buyShort(datetime, stock, realPrice, number, stoploss, goalPrice,
+                                  planPrice, from, remark)
+                 : TradeRecord();
     }
 
     /**

hikyuu/include/hikyuu/utilities/thread/{MQStealThreadPool.h → GlobalMQStealThreadPool.h}

@@ -1,5 +1,5 @@
 /*
- * StealMQStealThreadPool.h
+ * StealGlobalMQStealThreadPool.h
  *
  *  Copyright (c) 2019 hikyuu.org
  *
@@ -30,25 +30,25 @@ namespace hku {
 
 /**
  * @brief 无集中队列多队列偷取任务池
- * @ingroup MQStealThreadPool
+ * @ingroup GlobalMQStealThreadPool
  */
 #ifdef _MSC_VER
-class MQStealThreadPool {
+class GlobalMQStealThreadPool {
 #else
-class HKU_UTILS_API MQStealThreadPool {
+class HKU_UTILS_API GlobalMQStealThreadPool {
 #endif
 public:
     /**
      * 默认构造函数，创建和当前系统CPU数一致的线程数
      */
-    MQStealThreadPool() : MQStealThreadPool(std::thread::hardware_concurrency()) {}
+    GlobalMQStealThreadPool() : GlobalMQStealThreadPool(std::thread::hardware_concurrency()) {}
 
     /**
      * 构造函数，创建指定数量的线程
      * @param n 指定的线程数
      * @param until_empty 任务队列为空时，自动停止运行
      */
-    explicit MQStealThreadPool(size_t n, bool until_empty = true)
+    explicit GlobalMQStealThreadPool(size_t n, bool until_empty = true)
     : m_done(false), m_worker_num(n), m_runnging_until_empty(until_empty) {
         try {
             m_interrupt_flags.resize(m_worker_num, nullptr);
@@ -58,7 +58,7 @@ public:
             }
             // 初始完毕所有线程资源后再启动线程
             for (int i = 0; i < m_worker_num; i++) {
-                m_threads.emplace_back(&MQStealThreadPool::worker_thread, this, i);
+                m_threads.emplace_back(&GlobalMQStealThreadPool::worker_thread, this, i);
             }
         } catch (...) {
             m_done = true;
@@ -69,7 +69,7 @@ public:
     /**
      * 析构函数，等待并阻塞至线程池内所有任务完成
      */
-    ~MQStealThreadPool() {
+    ~GlobalMQStealThreadPool() {
         if (!m_done) {
             join();
         }
@@ -106,7 +106,8 @@ public:
     template <typename FunctionType>
     auto submit(FunctionType f) {
         if (m_thread_need_stop.isSet() || m_done) {
-            throw std::logic_error("You can't submit a task to the stopped MQStealThreadPool!");
+            throw std::logic_error(
+              "You can't submit a task to the stopped GlobalMQStealThreadPool!");
         }
 
         typedef typename std::invoke_result<FunctionType>::type result_type;
@@ -256,13 +257,12 @@ private:
     void worker_thread(int index) {
         m_index = index;
         m_interrupt_flags[index] = &m_thread_need_stop;
-        m_local_work_queue = m_queues[m_index].get();
+        m_local_work_queue = m_queues[index].get();
         while (!m_thread_need_stop.isSet() && !m_done) {
             run_pending_task();
         }
-        m_interrupt_flags[m_index] = nullptr;
+        m_interrupt_flags[index] = nullptr;
         m_local_work_queue = nullptr;
-        // printf("%zu thread (%lld) finished!\n", m_index, std::this_thread::get_id());
     }
 
     void run_pending_task() {