hikyuu 2.7.0__py3-none-manylinux2014_aarch64.whl → 2.7.5__py3-none-manylinux2014_aarch64.whl

hikyuu/include/hikyuu/KData.h

@@ -22,33 +22,34 @@ class HKU_API Indicator;
 class HKU_API KData {
 public:
     KData();
-    KData(const KData&);
+    KData(const KData&) noexcept;
     KData(const Stock& stock, const KQuery& query);
+    explicit KData(KDataImpPtr imp);
     virtual ~KData() {}
 
-    KData& operator=(const KData&);
+    KData& operator=(const KData&) noexcept;
 
     // 移动语义对 KData 没有实际用处，而且会导致 KData 可能存在空 imp 的情况
     // 主要是 boost::any_cast 需要，予以保留，但使用时不要到 KData 执行 std::move
     KData(KData&&);
     KData& operator=(KData&&);
 
-    size_t size() const;
-    bool empty() const;
+    size_t size() const noexcept;
+    bool empty() const noexcept;
 
-    bool operator==(const KData&) const;
-    bool operator!=(const KData&) const;
+    bool operator==(const KData&) const noexcept;
+    bool operator!=(const KData&) const noexcept;
 
     DatetimeList getDatetimeList() const;
 
     /** 获取指定位置的KRecord，未作越界检查 */
-    const KRecord& getKRecord(size_t pos) const;
+    const KRecord& getKRecord(size_t pos) const noexcept;
 
     /** 按日期查询KRecord */
-    const KRecord& getKRecord(Datetime datetime) const;
+    const KRecord& getKRecord(Datetime datetime) const noexcept;
 
     /** 同getKRecord @see getKRecord */
-    const KRecord& operator[](size_t pos) const {
+    const KRecord& operator[](size_t pos) const noexcept {
         return getKRecord(pos);
     }
 
@@ -68,6 +69,8 @@ public:
      */
     KData getKData(const Datetime& start, const Datetime& end) const;
 
+    KData getKData(const KQuery& query) const;
+
     /**
      * 获取相同时间范围内的其他类型K线数据，如日线下对应的分钟线数据
      * @param ktype
@@ -81,10 +84,25 @@ public:
      * @param end 结束索引
      * @return KData
      */
-    KData getKData(int64_t start, int64_t end = Null<int64_t>()) const;
+    KData getSubKData(int64_t start, int64_t end = Null<int64_t>()) const;
+
+    /**
+     * 特殊用途！谨慎！按当前K线范围，获取指定日期范围的其他类型的按日期查询的 Query 条件
+     * @note
+     *  1. 指定日期范围必须在当前K线数据范围内，否则截断在 K 线范围内
+     *  2. start_datetime/end_datetime 的精度应和当前 KData 一致
+     *  3. 如果原截止条件为 Null<Datetime>()且未指定end_datetime, 则返回的查询条件为
+     * Null<Datetime>()
+     * @param start_datetime
+     * @param end_datetime
+     * @param ktype
+     * @return KData
+     */
+    KQuery getOtherQueryByDate(const Datetime& start_datetime, const Datetime& end_datetime,
+                               const KQuery::KType& ktype) const;
 
     /** 按日期查询对应的索引位置，注：是 KData 中的位置，不是在 Stock 中原始K记录的位置 */
-    size_t getPos(const Datetime& datetime) const;
+    size_t getPos(const Datetime& datetime) const noexcept;
 
     /** 按日期获取在原始 K 线记录中的位置 */
     size_t getPosInStock(Datetime datetime) const;
@@ -128,8 +146,10 @@ public:
     Indicator amo() const;
 
 public:
-    const KRecord* data() const;
-    KRecord* data();  // 谨慎使用（用于强制调整数据）
+    const KRecord* data() const noexcept;
+    KRecord* data() noexcept;  // 谨慎使用（用于强制调整数据）
+
+    KDataImpPtr getImp() const noexcept;
 
     // 常量迭代器定义
     class const_iterator {
@@ -192,7 +212,8 @@ public:
 
 private:
     std::shared_ptr<KDataImp>& get_null_kdata_imp() {
-        static std::shared_ptr<KDataImp> instance = std::make_shared<KDataImp>();  // 第一次调用时初始化
+        static std::shared_ptr<KDataImp> instance =
+          std::make_shared<KDataImp>();  // 第一次调用时初始化
         return instance;
     }
 
@@ -249,22 +270,20 @@ KData HKU_API getKData(const string& market_code, int64_t start = 0, int64_t end
                        const KQuery::KType& ktype = KQuery::DAY,
                        KQuery::RecoverType recoverType = KQuery::NO_RECOVER);
 
-inline KData::KData(const KData& x) : m_imp(x.m_imp) {}
+inline KData::KData(const KData& x) noexcept : m_imp(x.m_imp) {}
 
 inline KData::KData(KData&& x) : m_imp(std::move(x.m_imp)) {
     x.m_imp = get_null_kdata_imp();
 }
 
-inline KData& KData::operator=(const KData& x) {
-    if (this == &x)
-        return *this;
+inline KData& KData::operator=(const KData& x) noexcept {
+    HKU_IF_RETURN(this == &x, *this);
     m_imp = x.m_imp;
     return *this;
 }
 
 inline KData& KData::operator=(KData&& x) {
-    if (this == &x)
-        return *this;
+    HKU_IF_RETURN(this == &x, *this);
     m_imp = std::move(x.m_imp);
     x.m_imp = get_null_kdata_imp();
     return *this;
@@ -274,24 +293,24 @@ inline DatetimeList KData::getDatetimeList() const {
     return m_imp->getDatetimeList();
 }
 
-inline const KRecord& KData::getKRecord(size_t pos) const {
+inline const KRecord& KData::getKRecord(size_t pos) const noexcept {
     return m_imp->getKRecord(pos);  // 不会抛出异常
 }
 
-inline const KRecord& KData::getKRecord(Datetime datetime) const {
+inline const KRecord& KData::getKRecord(Datetime datetime) const noexcept {
     size_t pos = getPos(datetime);
     return pos != Null<size_t>() ? getKRecord(pos) : KRecord::NullKRecord;
 }
 
-inline size_t KData::getPos(const Datetime& datetime) const {
+inline size_t KData::getPos(const Datetime& datetime) const noexcept {
     return m_imp->getPos(datetime);
 }
 
-inline size_t KData::size() const {
+inline size_t KData::size() const noexcept {
     return m_imp->size();
 }
 
-inline bool KData::empty() const {
+inline bool KData::empty() const noexcept {
     return m_imp->empty();
 }
 
@@ -323,18 +342,22 @@ inline size_t KData::lastPos() const {
     return m_imp->lastPos();
 }
 
-inline bool KData::operator!=(const KData& other) const {
+inline bool KData::operator!=(const KData& other) const noexcept {
     return !(*this == other);
 }
 
-inline const KRecord* KData::data() const {
+inline const KRecord* KData::data() const noexcept {
     return m_imp->data();
 }
 
-inline KRecord* KData::data() {
+inline KRecord* KData::data() noexcept {
     return m_imp->data();
 }
 
+inline KDataImpPtr KData::getImp() const noexcept {
+    return m_imp;
+}
+
 } /* namespace hku */
 
 #if FMT_VERSION >= 90000

hikyuu/include/hikyuu/KDataImp.h

@@ -11,7 +11,7 @@
 
 namespace hku {
 
-class HKU_API KDataImp {
+class HKU_API KDataImp : public enable_shared_from_this<KDataImp> {
 public:
     KDataImp() = default;
     KDataImp(const Stock& stock, const KQuery& query);
@@ -25,11 +25,11 @@ public:
         return m_stock;
     }
 
-    virtual bool empty() const {
+    virtual bool empty() const noexcept {
         return true;
     }
 
-    virtual size_t size() const {
+    virtual size_t size() const noexcept {
         return 0;
     }
 
@@ -45,11 +45,11 @@ public:
         return 0;
     }
 
-    virtual size_t getPos(const Datetime& datetime) const {
+    virtual size_t getPos(const Datetime& datetime) const noexcept {
         return Null<size_t>();
     }
 
-    virtual const KRecord& getKRecord(size_t pos) const {
+    virtual const KRecord& getKRecord(size_t pos) const noexcept {
         return KRecord::NullKRecord;
     }
 
@@ -61,11 +61,11 @@ public:
         return KRecord::NullKRecord;
     }
 
-    virtual const KRecord* data() const {
+    virtual const KRecord* data() const noexcept {
         return nullptr;
     }
 
-    virtual KRecord* data() {
+    virtual KRecord* data() noexcept {
         return nullptr;
     }
 
@@ -73,6 +73,11 @@ public:
         return DatetimeList();
     }
 
+    typedef shared_ptr<KDataImp> KDataImpPtr;
+    virtual KDataImpPtr getOtherFromSelf(const KQuery& query) const {
+        return std::make_shared<KDataImp>(m_stock, query);
+    }
+
 protected:
     KQuery m_query;
     Stock m_stock;

hikyuu/include/hikyuu/KDataPrivatedBufferImp.h

@@ -17,11 +17,11 @@ public:
     KDataPrivatedBufferImp(const Stock& stock, const KQuery& query);
     virtual ~KDataPrivatedBufferImp() override;
 
-    virtual bool empty() const override {
+    virtual bool empty() const noexcept override {
         return m_buffer.empty();
     }
 
-    virtual size_t size() const override {
+    virtual size_t size() const noexcept override {
         return m_buffer.size();
     }
 
@@ -29,9 +29,9 @@ public:
     virtual size_t endPos() const override;
     virtual size_t lastPos() const override;
 
-    virtual size_t getPos(const Datetime& datetime) const override;
+    virtual size_t getPos(const Datetime& datetime) const noexcept override;
 
-    virtual const KRecord& getKRecord(size_t pos) const override {
+    virtual const KRecord& getKRecord(size_t pos) const noexcept override {
         return m_buffer[pos];
     }
 
@@ -43,24 +43,30 @@ public:
         return m_buffer.back();
     }
 
-    virtual const KRecord* data() const override {
+    virtual const KRecord* data() const noexcept override {
         return m_buffer.data();
     }
 
-    virtual KRecord* data() override {
+    virtual KRecord* data() noexcept override {
         return m_buffer.data();
     }
 
     virtual DatetimeList getDatetimeList() const override;
 
+    virtual KDataImpPtr getOtherFromSelf(const KQuery& query) const override;
+
 private:
     void _getPosInStock() const;
+    void _recover();
     void _recoverForward();
     void _recoverBackward();
     void _recoverEqualForward();
     void _recoverEqualBackward();
     void _recoverForUpDay();
 
+    KDataImpPtr _getOtherFromSelfByIndex(const KQuery& query) const;
+    KDataImpPtr _getOtherFromSelfByDate(const KQuery& query) const;
+
 private:
     KRecordList m_buffer;
     mutable size_t m_start{0};
@@ -68,6 +74,6 @@ private:
     mutable bool m_have_pos_in_stock{false};
 };
 
-typedef shared_ptr<KDataPrivatedBufferImp> KDataPrivatedBufferImpPtr;
+// typedef shared_ptr<KDataPrivatedBufferImp> KDataPrivatedBufferImpPtr;
 
 } /* namespace hku */

hikyuu/include/hikyuu/KDataSharedBufferImp.h

@@ -17,11 +17,11 @@ public:
     KDataSharedBufferImp(const Stock& stock, const KQuery& query);
     virtual ~KDataSharedBufferImp() override;
 
-    virtual bool empty() const override {
+    virtual bool empty() const noexcept override {
         return m_size == 0;
     }
 
-    virtual size_t size() const override {
+    virtual size_t size() const noexcept override {
         return m_size;
     }
 
@@ -37,9 +37,9 @@ public:
         return m_end == 0 ? 0 : m_end - 1;
     }
 
-    virtual size_t getPos(const Datetime& datetime) const override;
+    virtual size_t getPos(const Datetime& datetime) const noexcept override;
 
-    virtual const KRecord& getKRecord(size_t pos) const override;
+    virtual const KRecord& getKRecord(size_t pos) const noexcept override;
 
     virtual const KRecord& front() const override {
         return m_data[0];
@@ -49,16 +49,18 @@ public:
         return m_data[m_size - 1];
     }
 
-    virtual const KRecord* data() const override {
+    virtual const KRecord* data() const noexcept override {
         return m_data;
     }
 
-    virtual KRecord* data() override {
+    virtual KRecord* data() noexcept override {
         return m_data;
     }
 
     virtual DatetimeList getDatetimeList() const override;
 
+    virtual KDataImpPtr getOtherFromSelf(const KQuery& query) const override;
+
 private:
     size_t m_start{0};
     size_t m_end{0};

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