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

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,13 +273,17 @@ public:
     PluginInterfaceT* getPlugin(const std::string& pluginname) noexcept;
 
     /** 设置多语言支持路径（仅在初始化之前有效） */
-    void setLanguagePath(const std::string& path);
+    void setLanguagePath(const std::string& path) noexcept;
 
     /** 取消加载，退出时使用 */
     void cancelLoad() {
         m_cancel_load = true;
     }
 
+    bool hasCancelLoad() const {
+        return m_cancel_load;
+    }
+
 public:
     typedef StockMapIterator const_iterator;
     const_iterator begin() const {
@@ -282,6 +293,10 @@ public:
         return m_stockDict.end();
     }
 
+    void clearPlugin() {
+        m_plugin_manager.clear();
+    }
+
 private:
     /* 加载全部数据 */
     void loadData();
@@ -318,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;
@@ -330,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年期中国国债收益率数据
 
@@ -357,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 {
@@ -419,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/StrategyContext.h

@@ -38,7 +38,7 @@ public:
      * @param preloadNum 指定的预加载数量，如：{{"min_max", 100}, {"day_max", 200}}
      */
     StrategyContext(const vector<string>& stockCodeList, const vector<KQuery::KType>& ktypeList,
-                    const unordered_map<string, int>& preloadNum = {});
+                    const unordered_map<string, int64_t>& preloadNum = {});
 
     // 自定义移动构造与赋值会引起 python 中无法正常退出
     // StrategyContext(const StrategyContext&) = default;
@@ -77,9 +77,9 @@ public:
         return m_ktypeList;
     }
 
-    void setPreloadNum(const unordered_map<string, int>& preloadNum);
+    void setPreloadNum(const unordered_map<string, int64_t>& preloadNum);
 
-    const unordered_map<string, int>& getPreloadNum() const noexcept {
+    const unordered_map<string, int64_t>& getPreloadNum() const noexcept {
         return m_preloadNum;
     }
 
@@ -108,7 +108,7 @@ private:
     vector<string> m_mustLoad{"sh000001", "sh000300"};  // 默认必须加载的 stock
     vector<string> m_stockCodeList;
     vector<KQuery::KType> m_ktypeList;
-    unordered_map<string, int> m_preloadNum;
+    unordered_map<string, int64_t> m_preloadNum;
 };
 
 HKU_API std::ostream& operator<<(std::ostream& os, const StrategyContext& context);

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

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <string>
+#include "hikyuu/utilities/datetime/Datetime.h"
 
 #ifndef HKU_API
 #define HKU_API
@@ -15,6 +16,9 @@
 
 namespace hku {
 
+void sysinfo_init();
+void sysinfo_clean();
+
 /**
  * 获取Hikyuu当前版本号
  * @return 版本号
@@ -34,11 +38,26 @@ std::string HKU_API getVersionWithGit();
  */
 bool HKU_API CanUpgrade();
 
-/**
- * 获取当前最新的版本号，用于判断是否升级
- * @return std::string
- */
-std::string HKU_API getLatestVersion();
+struct HKU_API LatestVersionInfo {
+    int version{1003001};
+    Datetime release_date;
+    std::string remark;
+    LatestVersionInfo() = default;
+    LatestVersionInfo(const LatestVersionInfo&) = default;
+    LatestVersionInfo(LatestVersionInfo&& rhs)
+    : version(rhs.version), release_date(rhs.release_date), remark(std::move(rhs.remark)) {}
+    LatestVersionInfo& operator=(LatestVersionInfo&& rhs) {
+        if (this == &rhs) {
+            return *this;
+        }
+        version = rhs.version;
+        release_date = rhs.release_date;
+        remark = std::move(rhs.remark);
+        return *this;
+    }
+};
+
+LatestVersionInfo HKU_API getLatestVersionInfo();
 
 /** 发送反馈信息 */
 void HKU_API sendFeedback();

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

hikyuu/include/hikyuu/indicator/Indicator.h

@@ -45,13 +45,13 @@ public:
 
 public:
     Indicator() : m_imp(make_shared<IndicatorImp>()) {}
-    Indicator(const IndicatorImpPtr& imp);
-    Indicator(const Indicator& ind);
+    Indicator(const IndicatorImpPtr& imp) noexcept;
+    Indicator(const Indicator& ind) noexcept;
     Indicator(Indicator&& ind) noexcept;
     virtual ~Indicator();
 
-    Indicator& operator=(const Indicator&);
-    Indicator& operator=(Indicator&&);
+    Indicator& operator=(const Indicator&) noexcept;
+    Indicator& operator=(Indicator&&) noexcept;
 
     /** 使用已有参数计算新值，返回全新的Indicator */
     Indicator operator()(const Indicator& ind);
@@ -63,8 +63,10 @@ public:
     Indicator operator()();
 
     /** 指标名称 */
-    string name() const;
-    void name(const string& name);
+    string name() const noexcept;
+    void name(const string& name) noexcept;
+
+    IndicatorImp::OPType getOPType() const noexcept;
 
     /** 返回形如：Name(param1_val,param2_val,...) */
     string long_name() const;
@@ -79,23 +81,29 @@ public:
     /** 获取上下文 */
     KData getContext() const;
 
+    /** 在有上下文时，自动将上下文扩展至当前最新数据并计算 */
+    void extend();
+
     /** 显示指标公式 */
     string formula() const;
 
     /** 结果中需抛弃的个数 */
-    size_t discard() const;
+    size_t discard() const noexcept;
 
     /** 设置抛弃的个数，如果小于原有的discard则无效 */
-    void setDiscard(size_t discard);
+    void setDiscard(size_t discard) noexcept;
+
+    /** 根据自身数值，更新抛弃的个数, force=true则强制更新, 否则从当前自身的 discard() 开始更新 */
+    void updateDiscard(bool force = false) noexcept;
 
     /** 返回有几个结果集输出 */
-    size_t getResultNumber() const;
+    size_t getResultNumber() const noexcept;
 
     /** 判断是否为空 **/
-    bool empty() const;
+    bool empty() const noexcept;
 
     /** 获取大小 **/
-    size_t size() const;
+    size_t size() const noexcept;
 
     /** 只获取第一个结果集中相应位置输出，等同于get(pos, 0) */
     value_t operator[](size_t pos) const;
@@ -130,7 +138,8 @@ public:
     size_t getPos(Datetime) const;
 
     /**
-     * 以指标的方式获取指定的结果集
+     * 以指标的方式获取指定的结果集,不保留其公式。
+     * 对于不在需要进行运算的指标，可以通过该方法清除已占用的内存。
      * @param num 指定的结果集
      */
     Indicator getResult(size_t num) const;
@@ -171,22 +180,21 @@ public:
         return m_imp->getParam<ValueType>(name);
     }
 
-    bool supportIndParam() const;
     bool haveIndParam(const string& name) const;
     void setIndParam(const string& name, const Indicator& ind);
     void setIndParam(const string& name, const IndParam& ind);
     IndParam getIndParam(const string& name) const;
     const IndicatorImpPtr getIndParamImp(const string& name) const;
 
-    IndicatorImpPtr getImp() const {
+    IndicatorImpPtr getImp() const noexcept {
         return m_imp;
     }
 
-    value_t* data(size_t result_idx = 0) {
+    value_t* data(size_t result_idx = 0) noexcept {
         return m_imp ? m_imp->data(result_idx) : nullptr;
     }
 
-    value_t const* data(size_t result_idx = 0) const {
+    value_t const* data(size_t result_idx = 0) const noexcept {
         return m_imp ? m_imp->data(result_idx) : nullptr;
     }
 
@@ -194,10 +202,10 @@ public:
      * 判断两个ind的值是否相等
      * @note operator==重载生成新的新的Indicator，此函数用于对两个ind进行值比较
      */
-    bool equal(const Indicator& other) const;
+    bool equal(const Indicator& other) const noexcept;
 
     /** 判断是否是同一个实例 */
-    bool isSame(const Indicator& other) const {
+    bool isSame(const Indicator& other) const noexcept {
         return !m_imp && m_imp == other.m_imp;
     }
 
@@ -208,6 +216,8 @@ public:
 
     string str() const;
 
+    bool isPythonObject() const noexcept;
+
 public:
     class Iterator {
     private:
@@ -245,6 +255,15 @@ public:
 
     typedef Iterator iterator;
 
+public:
+    static void enableIncrementCalculate(bool flag) {
+        IndicatorImp::enableIncrementCalculate(flag);
+    }
+
+    static bool enableIncrementCalculate() {
+        return IndicatorImp::enableIncrementCalculate();
+    }
+
 protected:
     IndicatorImpPtr m_imp;
 
@@ -261,39 +280,49 @@ private:
 /** @ingroup Indicator */
 typedef vector<Indicator> IndicatorList;
 
-inline string Indicator::name() const {
+inline string Indicator::name() const noexcept {
     return m_imp ? m_imp->name() : "IndicatorImp";
 }
 
-inline void Indicator::name(const string& name) {
+inline void Indicator::name(const string& name) noexcept {
     if (m_imp) {
         m_imp->name(name);
     }
 }
 
+inline IndicatorImp::OPType Indicator::getOPType() const noexcept {
+    return m_imp ? m_imp->getOPType() : IndicatorImp::INVALID;
+}
+
 inline string Indicator::long_name() const {
     return m_imp ? m_imp->long_name() : "IndicatorImp()";
 }
 
-inline size_t Indicator::discard() const {
+inline size_t Indicator::discard() const noexcept {
     return m_imp ? m_imp->discard() : 0;
 }
 
-inline void Indicator::setDiscard(size_t discard) {
+inline void Indicator::setDiscard(size_t discard) noexcept {
     if (m_imp) {
         m_imp->setDiscard(discard);
     }
 }
 
-inline size_t Indicator::getResultNumber() const {
+inline void Indicator::updateDiscard(bool force) noexcept {
+    if (m_imp) {
+        m_imp->updateDiscard(force);
+    }
+}
+
+inline size_t Indicator::getResultNumber() const noexcept {
     return m_imp ? m_imp->getResultNumber() : 0;
 }
 
-inline bool Indicator::empty() const {
+inline bool Indicator::empty() const noexcept {
     return (!m_imp || m_imp->size() == 0) ? true : false;
 }
 
-inline size_t Indicator::size() const {
+inline size_t Indicator::size() const noexcept {
     return m_imp ? m_imp->size() : 0;
 }
 
@@ -369,8 +398,8 @@ inline const IndicatorImpPtr Indicator::getIndParamImp(const string& name) const
     return m_imp ? m_imp->getIndParamImp(name) : IndicatorImpPtr();
 }
 
-inline bool Indicator::supportIndParam() const {
-    return m_imp ? m_imp->supportIndParam() : false;
+inline bool Indicator::isPythonObject() const noexcept {
+    return m_imp ? m_imp->isPythonObject() : false;
 }
 
 //--------------------------------------------------------------

hikyuu/include/hikyuu/indicator/Indicator2InImp.h

@@ -22,10 +22,6 @@ public:
 
     virtual IndicatorImpPtr _clone() override;
 
-    virtual bool needSelfAlikeCompare() const noexcept override {
-        return true;
-    }
-
     virtual bool selfAlike(const IndicatorImp& other) const noexcept override;
 
     virtual void getSelfInnerNodesWithInputConext(vector<IndicatorImpPtr>& nodes) const override;