hikyuu 2.7.2__py3-none-win_amd64.whl → 2.7.5__py3-none-win_amd64.whl

hikyuu/include/hikyuu/Stock.h

@@ -58,8 +58,8 @@ private:
 public:
     Stock();
 
-    Stock(const Stock&);
-    Stock(Stock&&);
+    Stock(const Stock&) noexcept;
+    Stock(Stock&&) noexcept;
     Stock(const string& market, const string& code, const string& name);
 
     Stock(const string& market, const string& code, const string& name, uint32_t type, bool valid,
@@ -69,7 +69,7 @@ public:
           int precision, size_t minTradeNumber, size_t maxTradeNumber);
     virtual ~Stock();
     Stock& operator=(const Stock&);
-    Stock& operator=(Stock&&);
+    Stock& operator=(Stock&&) noexcept;
     bool operator==(const Stock&) const;
     bool operator!=(const Stock&) const;
 
@@ -77,52 +77,52 @@ public:
      * 获取内部id，一般用于作为map的键值使用，该id实际为m_data的内存地址
      * @note 非数据库中的stockid
      */
-    uint64_t id() const;
+    uint64_t id() const noexcept;
 
     /** 获取所属市场简称，市场简称是市场的唯一标识 */
-    const string& market() const;
+    const string& market() const noexcept;
 
     /** 获取证券代码 */
-    const string& code() const;
+    const string& code() const noexcept;
 
     /** 市场简称+证券代码，如: sh000001 */
-    const string& market_code() const;
+    const string& market_code() const noexcept;
 
     /** 获取证券名称 */
-    const string& name() const;
+    const string& name() const noexcept;
 
     /** 获取证券类型 */
-    uint32_t type() const;
+    uint32_t type() const noexcept;
 
     /** 该证券当前是否有效 */
-    bool valid() const;
+    bool valid() const noexcept;
 
     /** 获取证券起始日期 */
-    const Datetime& startDatetime() const;
+    const Datetime& startDatetime() const noexcept;
 
     /** 获取证券最后日期 */
-    const Datetime& lastDatetime() const;
+    const Datetime& lastDatetime() const noexcept;
 
     /** 获取最小跳动量 */
-    price_t tick() const;
+    price_t tick() const noexcept;
 
     /** 最小跳动量价值 */
-    price_t tickValue() const;
+    price_t tickValue() const noexcept;
 
     /** 每单位价值 = tickValue / tick */
-    price_t unit() const;
+    price_t unit() const noexcept;
 
     /** 获取价格精度 */
-    int precision() const;
+    int precision() const noexcept;
 
     /** 获取最小交易数量，同minTradeNumber */
-    double atom() const;
+    double atom() const noexcept;
 
     /** 获取最小交易数量 */
-    double minTradeNumber() const;
+    double minTradeNumber() const noexcept;
 
     /** 获取最大交易量 */
-    double maxTradeNumber() const;
+    double maxTradeNumber() const noexcept;
 
     void market(const string& market_);
     void code(const string& code_);
@@ -213,9 +213,6 @@ public:
      */
     DatetimeList getTradingCalendar(const KQuery& query) const;
 
-    /** 设置权息信息, 仅供初始化时调用 */
-    void setWeightList(const StockWeightList&);
-
     /**
      * 判断是否在交易时间段内，忽略日期仅判断时分秒
      * @param time 时间
@@ -238,12 +235,12 @@ public:
     void releaseKDataBuffer(KQuery::KType) const;
 
     /** 指定类型的K线数据是否被缓存 */
-    bool isBuffer(KQuery::KType) const;
+    bool isBuffer(KQuery::KType) const noexcept;
 
-    bool isPreload(KQuery::KType ktype) const;
+    bool isPreload(KQuery::KType ktype) const noexcept;
 
     /** 是否为Null */
-    bool isNull() const;
+    bool isNull() const noexcept;
 
     /** （临时函数）只用于更新缓存中的K线数据 **/
     void realtimeUpdate(KRecord, const KQuery::KType& ktype = KQuery::DAY);
@@ -265,10 +262,13 @@ private:
     bool _getIndexRangeByIndex(const KQuery&, size_t& out_start, size_t& out_end) const;
 
     // 以下函数属于基础操作添加了读锁
-    size_t _getCountFromBuffer(const KQuery::KType& ktype) const;
     const KRecord& _getKRecordFromBuffer(size_t pos, const KQuery::KType& ktype) const;
     KRecordList _getKRecordListFromBuffer(size_t start_ix, size_t end_ix,
                                           KQuery::KType ktype) const;
+
+    bool _getIndexRangeFromBuffer(const KQuery& query, size_t& out_start, size_t& out_end) const;
+    bool _getIndexRangeByIndexFromBuffer(const KQuery& query, size_t& out_start,
+                                         size_t& out_end) const;
     bool _getIndexRangeByDateFromBuffer(const KQuery&, size_t&, size_t&) const;
 
     KRecordList _getKRecordList(const KQuery& query) const;
@@ -296,12 +296,12 @@ struct HKU_API Stock::Data {
     Datetime m_lastDate;   // 证券最后日期
 
     StockWeightList m_weightList;  // 权息信息列表
-    std::mutex m_weight_mutex;
+    std::shared_mutex m_weight_mutex;
 
     mutable vector<HistoryFinanceInfo>
       m_history_finance;  // 历史财务信息 [财务报告日期, 字段1, 字段2, ...]
     mutable std::atomic_bool m_history_finance_ready{false};
-    mutable std::mutex m_history_finance_mutex;
+    mutable std::shared_mutex m_history_finance_mutex;
 
     price_t m_tick;
     price_t m_tickValue;
@@ -347,7 +347,7 @@ inline bool operator<(const Stock& s1, const Stock& s2) {
     return s1.id() < s2.id();
 }
 
-inline uint64_t Stock::id() const {
+inline uint64_t Stock::id() const noexcept {
     return isNull() ? 0 : (int64_t)m_data.get();
 }
 
@@ -355,7 +355,7 @@ inline bool Stock::operator!=(const Stock& stock) const {
     return !(*this == stock);
 }
 
-inline bool Stock::isNull() const {
+inline bool Stock::isNull() const noexcept {
     return !m_data || !m_kdataDriver;
 }
 

hikyuu/include/hikyuu/StockManager.h

@@ -86,11 +86,11 @@ public:
     string datadir() const;
 
     /** 获取证券数量 */
-    size_t size() const;
+    size_t size() const noexcept;
 
     /** 是否所有数据准备完毕 */
     bool dataReady() const;
-
+    bool initializing() const;
     /**
      * 根据"市场简称证券代码"获取对应的证券实例
      * @param querystr 格式：“市场简称证券代码”，如"sh000001"
@@ -164,6 +164,13 @@ public:
      */
     BlockList getBlockList();
 
+    /**
+     * 获取指定指数的板块列表, 如果不存在返回空列表
+     * @param index_stk 指数
+     * @return 板块列表
+     */
+    BlockList getBlockListByIndexStock(const Stock& stk);
+
     /**
      * 获取指定证券所属的板块列表
      * @param stk 指定证券
@@ -245,7 +252,7 @@ public:
     /**
      * 获取当前执行线程id，主要用于判断 Strategy 是以独立进程还是线程方式运行
      */
-    std::thread::id thread_id() const {
+    std::thread::id thread_id() const noexcept {
         return m_thread_id;
     }
 
@@ -258,7 +265,7 @@ public:
     void setPluginPath(const std::string& path);
 
     /** 获取当前插件路径 */
-    const string& getPluginPath() const {
+    const string& getPluginPath() const noexcept {
         return m_plugin_manager.pluginPath();
     }
 
@@ -266,7 +273,7 @@ public:
     PluginInterfaceT* getPlugin(const std::string& pluginname) noexcept;
 
     /** 设置多语言支持路径（仅在初始化之前有效） */
-    void setLanguagePath(const std::string& path);
+    void setLanguagePath(const std::string& path) noexcept;
 
     /** 取消加载，退出时使用 */
     void cancelLoad() {
@@ -286,6 +293,10 @@ public:
         return m_stockDict.end();
     }
 
+    void clearPlugin() {
+        m_plugin_manager.clear();
+    }
+
 private:
     /* 加载全部数据 */
     void loadData();
@@ -322,7 +333,7 @@ private:
     static StockManager* m_sm;
     std::atomic_bool m_initializing{false};
     std::atomic_bool m_cancel_load{false};  // 取消加载, 用于退出指示
-    std::atomic_bool m_data_ready{false};   // 用于指示是否所有数据准备完毕
+    std::atomic_bool m_data_ready{true};    // 用于指示是否所有数据准备完毕, 如果未初始化则为 true
     std::thread::id m_thread_id;  // 记录线程id，用于判断Stratege是以独立进程方式还是线程方式运行
     string m_tmpdir;
     string m_datadir;
@@ -334,14 +345,11 @@ private:
 
     typedef unordered_map<string, MarketInfo> MarketInfoMap;
     mutable MarketInfoMap m_marketInfoDict;
-    std::shared_mutex* m_marketInfoDict_mutex;
 
     typedef unordered_map<uint32_t, StockTypeInfo> StockTypeInfoMap;
     mutable StockTypeInfoMap m_stockTypeInfo;
-    std::shared_mutex* m_stockTypeInfo_mutex;
 
     std::unordered_set<Datetime> m_holidays;  // 节假日
-    std::shared_mutex* m_holidays_mutex;
 
     ZhBond10List m_zh_bond10;  // 10年期中国国债收益率数据
 
@@ -361,12 +369,16 @@ private:
     std::string m_i18n_path;
 };
 
-inline size_t StockManager::size() const {
+inline size_t StockManager::size() const noexcept {
     return m_stockDict.size();
 }
 
 inline bool StockManager::dataReady() const {
-    return m_data_ready;
+    return m_data_ready.load(std::memory_order_acquire);
+}
+
+inline bool StockManager::initializing() const {
+    return m_initializing;
 }
 
 inline Stock StockManager::operator[](const string& query) const {
@@ -423,7 +435,7 @@ inline PluginInterfaceT* StockManager::getPlugin(const std::string& pluginname)
     return m_plugin_manager.getPlugin<PluginInterfaceT>(pluginname);
 }
 
-inline void StockManager::setLanguagePath(const std::string& path) {
+inline void StockManager::setLanguagePath(const std::string& path) noexcept {
     m_i18n_path = path;
 }
 

hikyuu/include/hikyuu/StockTypeInfo.h

@@ -41,46 +41,46 @@ public:
     StockTypeInfo(const StockTypeInfo&) = default;
     StockTypeInfo& operator=(const StockTypeInfo&) = default;
 
-    StockTypeInfo(StockTypeInfo&&);
+    StockTypeInfo(StockTypeInfo&&) noexcept;
     StockTypeInfo& operator=(StockTypeInfo&&) noexcept;
 
     /** 获取证券类型 */
-    uint32_t type() const {
+    uint32_t type() const noexcept {
         return m_type;
     }
 
     /** 获取证券类型描述信息 */
-    const string& description() const {
+    const string& description() const noexcept {
         return m_description;
     }
 
     /** 获取最小跳动量 */
-    price_t tick() const {
+    price_t tick() const noexcept {
         return m_tick;
     }
 
     /** 每tick价格 */
-    price_t tickValue() const {
+    price_t tickValue() const noexcept {
         return m_tickValue;
     }
 
     /** 每单位价格 = tickValue / tick */
-    price_t unit() const {
+    price_t unit() const noexcept {
         return m_unit;
     }
 
     /** 获取价格精度 */
-    int precision() const {
+    int precision() const noexcept {
         return m_precision;
     }
 
     /** 获取每笔最小交易数量 */
-    double minTradeNumber() const {
+    double minTradeNumber() const noexcept {
         return m_minTradeNumber;
     }
 
     /** 获取每笔最大交易数量 */
-    double maxTradeNumber() const {
+    double maxTradeNumber() const noexcept {
         return m_maxTradeNumber;
     }
 

hikyuu/include/hikyuu/StockWeight.h

@@ -29,47 +29,47 @@ public:
                 price_t freeCount, price_t suogu);
 
     /** 权息日期 */
-    Datetime datetime() const {
+    Datetime datetime() const noexcept {
         return m_datetime;
     }
 
     /** 每10股送X股 */
-    price_t countAsGift() const {
+    price_t countAsGift() const noexcept {
         return m_countAsGift;
     }
 
     /** 每10股配X股 */
-    price_t countForSell() const {
+    price_t countForSell() const noexcept {
         return m_countForSell;
     }
 
     /** 配股价 */
-    price_t priceForSell() const {
+    price_t priceForSell() const noexcept {
         return m_priceForSell;
     }
 
     /** 每10股红利 */
-    price_t bonus() const {
+    price_t bonus() const noexcept {
         return m_bonus;
     }
 
     /** 每10股转增X股 */
-    price_t increasement() const {
+    price_t increasement() const noexcept {
         return m_increasement;
     }
 
     /** 总股本（万股） */
-    price_t totalCount() const {
+    price_t totalCount() const noexcept {
         return m_totalCount;
     }
 
     /** 流通股（万股） */
-    price_t freeCount() const {
+    price_t freeCount() const noexcept {
         return m_freeCount;
     }
 
     /** 扩缩股比例 */
-    price_t suogu() const {
+    price_t suogu() const noexcept {
         return m_suogu;
     }
 

hikyuu/include/hikyuu/TimeLineRecord.h

@@ -26,7 +26,7 @@ public:
     TimeLineRecord();
     TimeLineRecord(const Datetime& datetime, price_t price, price_t vol);
 
-    bool isValid() const;
+    bool isValid() const noexcept;
 };
 
 /**

hikyuu/include/hikyuu/TransRecord.h

@@ -27,7 +27,7 @@ public:
     TransRecord();
     TransRecord(const Datetime& datetime, price_t price, price_t vol, int32_t direct);
 
-    bool isValid() const;
+    bool isValid() const noexcept;
 };
 
 /**

hikyuu/include/hikyuu/data_driver/BaseInfoDriver.h

@@ -219,7 +219,8 @@ public:
     /**
      * 获取所有历史财务信息, 用于列式存储时数据初始化使用
      */
-    virtual unordered_map<string, vector<HistoryFinanceInfo>> getAllHistoryFinance() {
+    virtual unordered_map<string, vector<HistoryFinanceInfo>> getAllHistoryFinance(
+      const std::atomic_bool& cancel_flag) {
         HKU_ERROR("Not support getAllHistoryFinance()!");
         return unordered_map<string, vector<HistoryFinanceInfo>>();
     }

hikyuu/include/hikyuu/data_driver/BlockInfoDriver.h

@@ -94,11 +94,17 @@ public:
      */
     virtual void remove(const string& category, const string& name) = 0;
 
+protected:
+    bool isPythonObject() const noexcept {
+        return m_is_python_object;
+    }
+
 private:
     bool checkType();
 
 protected:
     string m_name;
+    bool m_is_python_object{false};
 };
 
 typedef shared_ptr<BlockInfoDriver> BlockInfoDriverPtr;

hikyuu/include/hikyuu/data_driver/KDataDriver.h

@@ -129,21 +129,21 @@ public:
     }
 
     virtual std::unordered_map<std::string, KRecordList> getAllKRecordList(
-      const KQuery::KType& ktype, const Datetime& start_date,
-      const std::atomic<bool>& cancel_flag) {
+      const KQuery::KType& ktype, const Datetime& start_date, const std::atomic_bool& cancel_flag) {
         HKU_THROW("Not support getAllKRecordList");
     }
 
 protected:
-    virtual bool isPythonObject() const {
-        return false;
+    bool isPythonObject() const noexcept {
+        return m_is_python_object;
     }
 
 private:
     bool checkType();
 
-private:
+protected:
     string m_name;
+    bool m_is_python_object{false};
 };
 
 typedef shared_ptr<KDataDriver> KDataDriverPtr;
@@ -210,8 +210,7 @@ public:
     }
 
     std::unordered_map<std::string, KRecordList> getAllKRecordList(
-      const KQuery::KType& ktype, const Datetime& start_date,
-      const std::atomic<bool>& cancel_flag) {
+      const KQuery::KType& ktype, const Datetime& start_date, const std::atomic_bool& cancel_flag) {
         return m_driver->getAllKRecordList(ktype, start_date, cancel_flag);
     }
 

hikyuu/include/hikyuu/data_driver/kdata/mysql/MySQLKDataDriver.h

@@ -26,6 +26,9 @@ public:
     MySQLKDataDriver();
     virtual ~MySQLKDataDriver() override;
 
+    MySQLKDataDriver(const MySQLKDataDriver&) = delete;
+    MySQLKDataDriver& operator=(const MySQLKDataDriver&) = delete;
+
     virtual KDataDriverPtr _clone() override {
         return std::make_shared<MySQLKDataDriver>();
     }
@@ -56,7 +59,8 @@ public:
                                    const KQuery& query) override;
 
 private:
-    string _getTableName(const string& market, const string& code, const KQuery::KType& ktype);
+    static string _getTableName(const string& market, const string& code,
+                                const KQuery::KType& ktype);
     KRecordList _getKRecordList(const string& market, const string& code,
                                 const KQuery::KType& kType, size_t start_ix, size_t end_ix);
     KRecordList _getKRecordList(const string& market, const string& code,

hikyuu/include/hikyuu/data_driver/kdata/sqlite/SQLiteKDataDriver.h

@@ -43,7 +43,7 @@ public:
                                        const KQuery& query) override;
 
 private:
-    string _getTableName(const string& market, const string& code, KQuery::KType ktype);
+    static string _getTableName(const string& market, const string& code, KQuery::KType ktype);
     KRecordList _getKRecordList(const string& market, const string& code,
                                 const KQuery::KType& kType, size_t start_ix, size_t end_ix);
     KRecordList _getKRecordList(const string& market, const string& code,

hikyuu/include/hikyuu/global/sysinfo.h

@@ -39,7 +39,7 @@ std::string HKU_API getVersionWithGit();
 bool HKU_API CanUpgrade();
 
 struct HKU_API LatestVersionInfo {
-    int version;
+    int version{1003001};
     Datetime release_date;
     std::string remark;
     LatestVersionInfo() = default;

hikyuu/include/hikyuu/indicator/IndParam.h

@@ -26,7 +26,7 @@ public:
     explicit IndParam(const IndicatorImpPtr& ind);
     explicit IndParam(const Indicator& ind);
 
-    IndicatorImpPtr getImp() const {
+    IndicatorImpPtr getImp() const noexcept {
         return m_ind;
     }