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

hikyuu/include/hikyuu/KQuery.h

@@ -58,20 +58,20 @@ public:
     static bool isValidKType(const string& ktype);
 
     /** 判断是否为有效 ktype */
-    static bool isBaseKType(const string& ktype);
+    static bool isBaseKType(const string& ktype) noexcept;
 
     /** 判断是否为扩展 ktype */
     static bool isExtraKType(const string& ktype);
 
     /** 获取所有的 KType */
-    static vector<KType> getBaseKTypeList();
+    static vector<KType> getBaseKTypeList() noexcept;
 
     /** 获取所有扩展 KType */
     static vector<KType> getExtraKTypeList();
 
     static int32_t getKTypeInMin(const KType& ktype);
 
-    static int32_t getBaseKTypeInMin(const KType& ktype);
+    static int32_t getBaseKTypeInMin(const KType& ktype) noexcept;
 
     static int64_t getKTypeInSeconds(const KType& ktype);
 
@@ -129,14 +129,14 @@ public:
     /**
      * 按索引方式查询时，返回指定的起始索引，否则返回Null<int64_t>()
      */
-    int64_t start() const {
+    int64_t start() const noexcept {
         return m_queryType != INDEX ? Null<int64_t>() : m_start;
     }
 
     /**
      * 按索引方式查询时，返回指定的结束索引，否则返回Null<int64_t>()
      */
-    int64_t end() const {
+    int64_t end() const noexcept {
         return m_queryType != INDEX ? Null<int64_t>() : m_end;
     }
 
@@ -151,23 +151,23 @@ public:
     Datetime endDatetime() const;
 
     /** 获取查询条件类型 */
-    QueryType queryType() const {
+    QueryType queryType() const noexcept {
         return m_queryType;
     }
 
     /** 获取K线数据类型 */
     // KType kType() const { return m_dataType; }
-    const string& kType() const {
+    const string& kType() const noexcept {
         return m_dataType;
     }
 
     /** 获取复权类型 */
-    RecoverType recoverType() const {
+    RecoverType recoverType() const noexcept {
         return m_recoverType;
     }
 
     /** 设置复权类型 */
-    void recoverType(RecoverType recoverType) {
+    void recoverType(RecoverType recoverType) noexcept {
         m_recoverType = recoverType;
     }
 
@@ -261,8 +261,8 @@ HKU_API std::ostream& operator<<(std::ostream& os, const KQuery& query);
 // 关系比较函数, 不直接在类中定义是为了支持 Null<>() == d，Null可以放在左边
 //
 ///////////////////////////////////////////////////////////////////////////////
-bool HKU_API operator==(const KQuery&, const KQuery&);
-bool HKU_API operator!=(const KQuery&, const KQuery&);
+bool HKU_API operator==(const KQuery&, const KQuery&) noexcept;
+bool HKU_API operator!=(const KQuery&, const KQuery&) noexcept;
 
 /**
  * 提供KQuery的Null值

hikyuu/include/hikyuu/KRecord.h

@@ -55,7 +55,7 @@ public:
       transAmount(transAmount),
       transCount(transCount) {}
 
-    bool isValid() const {
+    bool isValid() const noexcept {
         return datetime == Null<Datetime>() ? false : true;
     }
 

hikyuu/include/hikyuu/MarketInfo.h

@@ -40,51 +40,51 @@ public:
     MarketInfo(const MarketInfo&) = default;
     MarketInfo& operator=(const MarketInfo&) = default;
 
-    MarketInfo(MarketInfo&&);
+    MarketInfo(MarketInfo&&) noexcept;
     MarketInfo& operator=(MarketInfo&&) noexcept;
 
     /** 获取市场简称 */
-    const string& market() const {
+    const string& market() const noexcept {
         return m_market;
     }
 
     /** 获取市场名称 */
-    const string& name() const {
+    const string& name() const noexcept {
         return m_name;
     }
 
     /** 获取市场描述 */
-    const string& description() const {
+    const string& description() const noexcept {
         return m_description;
     }
 
     /** 获取该市场对应的指数代码 */
-    const string& code() const {
+    const string& code() const noexcept {
         return m_code;
     }
 
     /** 获取市场数据的最后更新日期 */
-    Datetime lastDate() const {
+    Datetime lastDate() const noexcept {
         return m_lastDate;
     }
 
     /** 开市时间1 */
-    TimeDelta openTime1() const {
+    TimeDelta openTime1() const noexcept {
         return m_openTime1;
     }
 
     /** 闭市时间1 */
-    TimeDelta closeTime1() const {
+    TimeDelta closeTime1() const noexcept {
         return m_closeTime1;
     }
 
     /** 开市时间2 */
-    TimeDelta openTime2() const {
+    TimeDelta openTime2() const noexcept {
         return m_openTime2;
     }
 
     /** 闭市时间2 */
-    TimeDelta closeTime2() const {
+    TimeDelta closeTime2() const noexcept {
         return m_closeTime2;
     }
 

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,7 +86,7 @@ public:
     string datadir() const;
 
     /** 获取证券数量 */
-    size_t size() const;
+    size_t size() const noexcept;
 
     /** 是否所有数据准备完毕 */
     bool dataReady() const;
@@ -252,7 +252,7 @@ public:
     /**
      * 获取当前执行线程id，主要用于判断 Strategy 是以独立进程还是线程方式运行
      */
-    std::thread::id thread_id() const {
+    std::thread::id thread_id() const noexcept {
         return m_thread_id;
     }
 
@@ -265,7 +265,7 @@ public:
     void setPluginPath(const std::string& path);
 
     /** 获取当前插件路径 */
-    const string& getPluginPath() const {
+    const string& getPluginPath() const noexcept {
         return m_plugin_manager.pluginPath();
     }
 
@@ -273,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() {
@@ -293,6 +293,10 @@ public:
         return m_stockDict.end();
     }
 
+    void clearPlugin() {
+        m_plugin_manager.clear();
+    }
+
 private:
     /* 加载全部数据 */
     void loadData();
@@ -341,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年期中国国债收益率数据
 
@@ -368,12 +369,12 @@ 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 {
@@ -434,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/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

@@ -134,15 +134,16 @@ public:
     }
 
 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;

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;
     }