hikyuu 2.6.8.4__py3-none-manylinux2014_x86_64.whl → 2.7.0__py3-none-manylinux2014_x86_64.whl

hikyuu/gui/data/SchedImportThread.py

@@ -6,14 +6,14 @@ import logging
 import time
 import datetime
 from math import ceil
-from PyQt5.QtCore import QThread, QWaitCondition, QMutex, pyqtSignal
+from PySide6.QtCore import QThread, QWaitCondition, QMutex, Signal
 
 from hikyuu.util import *
 from hikyuu import Datetime, TimeDelta
 
 
 class SchedImportThread(QThread):
-    message = pyqtSignal()
+    message = Signal()
 
     def __init__(self, config):
         super(self.__class__, self).__init__()

hikyuu/gui/data/UsePytdxImportToH5Thread.py

@@ -28,7 +28,7 @@ import datetime
 import mysql.connector
 import queue
 from multiprocessing import Queue, Process
-from PyQt5.QtCore import QThread, pyqtSignal
+from PySide6.QtCore import QThread, Signal
 from hikyuu.gui.data.ImportWeightToSqliteTask import ImportWeightToSqliteTask
 from hikyuu.gui.data.ImportPytdxToH5Task import ImportPytdxToH5
 from hikyuu.gui.data.ImportPytdxTransToH5Task import ImportPytdxTransToH5
@@ -58,7 +58,7 @@ from hikyuu.util.mylog import class_logger
 
 
 class UsePytdxImportToH5Thread(QThread):
-    message = pyqtSignal(list)
+    message = Signal(list)
 
     def __init__(self, parent, config):
         super(UsePytdxImportToH5Thread, self).__init__()
@@ -98,7 +98,7 @@ class UsePytdxImportToH5Thread(QThread):
 
         if self.config.getboolean('block', 'enable', fallback=True):
             self.tasks.append(ImportBlockInfoTask(self.log_queue, self.queue,
-                                                  self.config, ('行业板块', '指数板块')))  # '概念板块', '地域板块',
+                                                  self.config))  # '概念板块', '地域板块',
 
         self.tasks.append(ImportZhBond10Task(self.log_queue, self.queue, self.config))
 

hikyuu/gui/data/UseQmtImportToH5Thread.py

@@ -28,7 +28,7 @@ import datetime
 import mysql.connector
 import queue
 from multiprocessing import Queue, Process
-from PyQt5.QtCore import QThread, pyqtSignal
+from PySide6.QtCore import QThread, Signal
 from hikyuu.gui.data.ImportQmtToH5Task import ImportQmtToH5Task
 from hikyuu.gui.data.ImportWeightToSqliteTask import ImportWeightToSqliteTask
 from hikyuu.gui.data.ImportQmtToH5Task import ImportQmtToH5Task
@@ -51,7 +51,7 @@ from hikyuu.util.mylog import class_logger
 
 
 class UseQmtImportToH5Thread(QThread):
-    message = pyqtSignal(list)
+    message = Signal(list)
 
     def __init__(self, parent, config):
         super(UseQmtImportToH5Thread, self).__init__()

hikyuu/gui/data/UseTdxImportToH5Thread.py

@@ -28,7 +28,7 @@ import datetime
 import mysql.connector
 import queue
 from multiprocessing import Queue, Process
-from PyQt5.QtCore import QThread, pyqtSignal
+from PySide6.QtCore import QThread, Signal
 from hikyuu.gui.data.ImportTdxToH5Task import ImportTdxToH5Task
 from hikyuu.gui.data.ImportWeightToSqliteTask import ImportWeightToSqliteTask
 from hikyuu.gui.data.ImportTdxToH5Task import ImportTdxToH5Task
@@ -55,7 +55,7 @@ from hikyuu.util.mylog import class_logger
 
 
 class UseTdxImportToH5Thread(QThread):
-    message = pyqtSignal(list)
+    message = Signal(list)
 
     def __init__(self, parent, config):
         super(UseTdxImportToH5Thread, self).__init__()
@@ -95,7 +95,7 @@ class UseTdxImportToH5Thread(QThread):
                 ImportHistoryFinanceTask(self.log_queue, self.queue, self.config, dest_dir))
 
         self.tasks.append(ImportBlockInfoTask(self.log_queue, self.queue,
-                          self.config, ('行业板块', '指数板块')))  # '概念板块', '地域板块'
+                          self.config))  # '概念板块', '地域板块'
         self.tasks.append(ImportZhBond10Task(self.log_queue, self.queue, self.config))
 
         task_count = 0

hikyuu/gui/data/tool.py

@@ -6,38 +6,45 @@
      
 '''
 
-import os 
-import os.path 
+import os
+import os.path
 
-# UI文件所在的路径 
-dir = './'  
+# UI文件所在的路径
+dir = './'
 
 # 列出目录下的所有ui文件
-def listUiFile(): 
-	list = []
-	files = os.listdir(dir)  
-	for filename in files:  
-		#print( dir + os.sep + f  )
-		#print(filename)
-		if os.path.splitext(filename)[1] == '.ui':
-			list.append(filename)
-	
-	return list
-
-# 把后缀为ui的文件改成后缀为py的文件名	
-def transPyFile(filename): 
-	return os.path.splitext(filename)[0] + '.py' 
+
+
+def listUiFile():
+    list = []
+    files = os.listdir(dir)
+    for filename in files:
+        # print( dir + os.sep + f  )
+        # print(filename)
+        if os.path.splitext(filename)[1] == '.ui':
+            list.append(filename)
+
+    return list
+
+# 把后缀为ui的文件改成后缀为py的文件名
+
+
+def transPyFile(filename):
+    return os.path.splitext(filename)[0] + '.py'
 
 # 调用系统命令把ui转换成py
+
+
 def runMain():
     list = listUiFile()
-    for uifile in list :
+    for uifile in list:
         pyfile = transPyFile(uifile)
-        cmd = 'pyuic5 -o {pyfile} {uifile}'.format(pyfile=pyfile,uifile=uifile)
-        #cmd = 'pyside2-uic -o {pyfile} {uifile}'.format(pyfile=pyfile, uifile=uifile)
-		#print(cmd)
+        cmd = 'pyside6-uic -o {pyfile} {uifile}'.format(pyfile=pyfile, uifile=uifile)
+        # cmd = 'pyside2-uic -o {pyfile} {uifile}'.format(pyfile=pyfile, uifile=uifile)
+        # print(cmd)
         os.system(cmd)
 
-###### 程序的主入口		
-if __name__ == "__main__":  	
-	runMain()
+
+# 程序的主入口
+if __name__ == "__main__":
+    runMain()

hikyuu/gui/dataserver.py

@@ -11,13 +11,15 @@ import click
 
 
 @click.command()
-@click.option('--addr', '-addr', default="tcp://127.0.0.1:9201", help='行情接收处理服务地址')
+@click.option('--addr', '-addr', default="tcp://0.0.0.0:9201", help='自身对外提供的服务地址, 如需外部机器访问，请使用 tcp://0.0.0.0:port')
 @click.option('--work_num', '-n', default=2, type=int, help='行情接收处理线程数')
 @click.option('--save', '-save', default=False, type=bool, help='保存行情数据(仅支持clickhouse)')
 @click.option('--buf', '-buf', default=False, type=bool, help='缓存行情数据')
-def main(addr, work_num, save, buf):
+@click.option('--parquet_path', '-parquet_path', default="", help='Parquet 文件存储路径, 空字符串表示不保存')
+def main(addr, work_num, save, buf, parquet_path):
+    # 如需其他机器访问，addr 参数需为 tcp://0.0.0.0:port
     try:
-        start_data_server(addr, work_num, save_tick=save, buf_tick=buf)
+        start_data_server(addr, work_num, save_tick=save, buf_tick=buf, parquet_path=parquet_path)
 
         while True:
             try:

hikyuu/hub.pyi

@@ -28,11 +28,11 @@ import sys as sys
 import typing
 __all__: list = ['add_remote_hub', 'add_local_hub', 'update_hub', 'remove_hub', 'build_hub', 'help_part', 'get_part', 'get_part_list', 'get_hub_path', 'get_part_info', 'get_part_module', 'print_part_info', 'get_hub_name_list', 'get_part_name_list', 'get_current_hub', 'search_part']
 class ConfigModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x7ae9cc260280; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x7314456bfa00; ConfigModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_config', MetaData(), Column('id', Integer(), table=<hub_config>, primary_key=True, nullable=False, default=Sequence('config_id_seq', metadata=MetaData())), Column('key', String(), table=<hub_config>), Column('value', String(), table=<hub_config>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('key', String(), table=<hub_config>)))
     __tablename__: typing.ClassVar[str] = 'hub_config'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 7ae9cc24e040>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 7314456da3e0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -109,11 +109,11 @@ class HubManager:
     def print_part_info(self, name):
         ...
 class HubModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x7ae9cc260dc0; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x731445704310; HubModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_repo', MetaData(), Column('id', Integer(), table=<hub_repo>, primary_key=True, nullable=False, default=Sequence('remote_id_seq', metadata=MetaData())), Column('name', String(), table=<hub_repo>), Column('hub_type', String(), table=<hub_repo>), Column('local_base', String(), table=<hub_repo>), Column('local', String(), table=<hub_repo>), Column('url', String(), table=<hub_repo>), Column('branch', String(), table=<hub_repo>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_repo>)))
     __tablename__: typing.ClassVar[str] = 'hub_repo'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 7aea58bc1e50>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 7314456fef20>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.
@@ -146,11 +146,11 @@ class ModuleConflictError(Exception):
     def __str__(self):
         ...
 class PartModel(sqlalchemy.orm.decl_api.Base):
-    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x7aea58bd2520; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x731445704eb0; PartModel>
     __table__: typing.ClassVar[sqlalchemy.sql.schema.Table]  # value = Table('hub_part', MetaData(), Column('id', Integer(), table=<hub_part>, primary_key=True, nullable=False, default=Sequence('part_id_seq', metadata=MetaData())), Column('hub_name', String(), table=<hub_part>), Column('part', String(), table=<hub_part>), Column('name', String(), table=<hub_part>), Column('author', String(), table=<hub_part>), Column('version', String(), table=<hub_part>), Column('doc', String(), table=<hub_part>), Column('module_name', String(), table=<hub_part>), Column('label', String(), table=<hub_part>), schema=None)
     __table_args__: typing.ClassVar[tuple]  # value = (UniqueConstraint(Column('name', String(), table=<hub_part>)))
     __tablename__: typing.ClassVar[str] = 'hub_part'
-    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 7aea58bcc860>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 7314456ffec0>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

hikyuu/include/hikyuu/DataType.h

@@ -42,6 +42,10 @@
 #include "utilities/config.h"
 #include "lang.h"
 
+#if HKU_OS_OSX
+#include <MacTypes.h>
+#endif
+
 #if HKU_SUPPORT_SERIALIZATION
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/split_free.hpp>
@@ -156,22 +160,6 @@ inline bool iszero(price_t num) {
 
 using fmt::format;
 
-inline std::ostream &operator<<(std::ostream &os, const PriceList &p) {
-    size_t len = p.size();
-    const size_t print = 3;
-    os << "[";
-    for (size_t i = 0; i < len; i++) {
-        if ((i < print) || (i >= len - print)) {
-            os << p[i];
-            if (i != len - 1)
-                os << ", ";
-        } else if (i == 3)
-            os << "..., ";
-    }
-    os << "]";
-    return os;
-}
-
 /** @} */
 
 }  // namespace hku

hikyuu/include/hikyuu/KData.h

@@ -191,7 +191,10 @@ public:
     }
 
 private:
-    static shared_ptr<KDataImp> ms_null_kdata_imp;
+    std::shared_ptr<KDataImp>& get_null_kdata_imp() {
+        static std::shared_ptr<KDataImp> instance = std::make_shared<KDataImp>();  // 第一次调用时初始化
+        return instance;
+    }
 
 private:
     KDataImpPtr m_imp;
@@ -249,7 +252,7 @@ KData HKU_API getKData(const string& market_code, int64_t start = 0, int64_t end
 inline KData::KData(const KData& x) : m_imp(x.m_imp) {}
 
 inline KData::KData(KData&& x) : m_imp(std::move(x.m_imp)) {
-    x.m_imp = ms_null_kdata_imp;
+    x.m_imp = get_null_kdata_imp();
 }
 
 inline KData& KData::operator=(const KData& x) {
@@ -263,7 +266,7 @@ inline KData& KData::operator=(KData&& x) {
     if (this == &x)
         return *this;
     m_imp = std::move(x.m_imp);
-    x.m_imp = ms_null_kdata_imp;
+    x.m_imp = get_null_kdata_imp();
     return *this;
 }
 

hikyuu/include/hikyuu/KDataPrivatedBufferImp.h

@@ -15,7 +15,7 @@ class HKU_API KDataPrivatedBufferImp : public KDataImp {
 public:
     KDataPrivatedBufferImp();
     KDataPrivatedBufferImp(const Stock& stock, const KQuery& query);
-    virtual ~KDataPrivatedBufferImp();
+    virtual ~KDataPrivatedBufferImp() override;
 
     virtual bool empty() const override {
         return m_buffer.empty();

hikyuu/include/hikyuu/KDataSharedBufferImp.h

@@ -15,7 +15,7 @@ class HKU_API KDataSharedBufferImp : public KDataImp {
 public:
     KDataSharedBufferImp() = default;
     KDataSharedBufferImp(const Stock& stock, const KQuery& query);
-    virtual ~KDataSharedBufferImp();
+    virtual ~KDataSharedBufferImp() override;
 
     virtual bool empty() const override {
         return m_size == 0;

hikyuu/include/hikyuu/KQuery.h

@@ -157,7 +157,7 @@ public:
 
     /** 获取K线数据类型 */
     // KType kType() const { return m_dataType; }
-    string kType() const {
+    const string& kType() const {
         return m_dataType;
     }
 
@@ -191,7 +191,7 @@ public:
     static string getQueryTypeName(QueryType);
 
     /** 获取KType名称，用于显示输出 */
-    static string getKTypeName(KType);
+    static string getKTypeName(const KType&);
 
     /** 获取recoverType名称，用于显示输出 */
     static string getRecoverTypeName(RecoverType);

hikyuu/include/hikyuu/Stock.h

@@ -240,6 +240,8 @@ public:
     /** 指定类型的K线数据是否被缓存 */
     bool isBuffer(KQuery::KType) const;
 
+    bool isPreload(KQuery::KType ktype) const;
+
     /** 是否为Null */
     bool isNull() const;
 
@@ -274,7 +276,8 @@ private:
     // 仅供 StockManager 初始化时调用
     void setPreload(const vector<KQuery::KType>& preload_ktypes);
 
-    bool isPreload(KQuery::KType ktype) const;
+    void loadKDataToBufferFromKRecordList(const KQuery::KType& ktype, KRecordList&& ks) const;
+    void setHistoryFinance(vector<HistoryFinanceInfo>&&);
 
 private:
     struct HKU_API Data;

hikyuu/include/hikyuu/StockManager.h

@@ -130,6 +130,9 @@ public:
     /** 获取市场简称列表 */
     StringList getAllMarket() const;
 
+    /** 获取所有板块分类 */
+    StringList getAllCategory();
+
     /**
      * 获取预定义的板块
      * @param category 板块分类
@@ -265,6 +268,11 @@ public:
     /** 设置多语言支持路径（仅在初始化之前有效） */
     void setLanguagePath(const std::string& path);
 
+    /** 取消加载，退出时使用 */
+    void cancelLoad() {
+        m_cancel_load = true;
+    }
+
 public:
     typedef StockMapIterator const_iterator;
     const_iterator begin() const {
@@ -280,6 +288,7 @@ private:
 
     /* 加载 K线数据至缓存 */
     void loadAllKData();
+    std::unordered_set<string> tryLoadAllKDataFromColumnFirst(const vector<KQuery::KType>& ktypes);
 
     /* 加载节假日信息 */
     void loadAllHolidays();
@@ -307,9 +316,10 @@ private:
 
 private:
     static StockManager* m_sm;
-    std::atomic_bool m_initializing;
-    std::atomic_bool m_data_ready;  // 用于指示是否所有数据准备完毕
-    std::thread::id m_thread_id;    // 记录线程id，用于判断Stratege是以独立进程方式还是线程方式运行
+    std::atomic_bool m_initializing{false};
+    std::atomic_bool m_cancel_load{false};  // 取消加载, 用于退出指示
+    std::atomic_bool m_data_ready{false};   // 用于指示是否所有数据准备完毕
+    std::thread::id m_thread_id;  // 记录线程id，用于判断Stratege是以独立进程方式还是线程方式运行
     string m_tmpdir;
     string m_datadir;
     BaseInfoDriverPtr m_baseInfoDriver;

hikyuu/include/hikyuu/data_driver/BaseInfoDriver.h

@@ -216,6 +216,14 @@ public:
      */
     virtual ZhBond10List getAllZhBond10() = 0;
 
+    /**
+     * 获取所有历史财务信息, 用于列式存储时数据初始化使用
+     */
+    virtual unordered_map<string, vector<HistoryFinanceInfo>> getAllHistoryFinance() {
+        HKU_ERROR("Not support getAllHistoryFinance()!");
+        return unordered_map<string, vector<HistoryFinanceInfo>>();
+    }
+
 private:
     bool checkType();
 

hikyuu/include/hikyuu/data_driver/BlockInfoDriver.h

@@ -53,6 +53,12 @@ public:
      */
     virtual bool _init() = 0;
 
+    /**
+     * 获取所有板块分类
+     * @return StringList
+     */
+    virtual StringList getAllCategory() = 0;
+
     /**
      * 获取指定的板块
      * @param category 指定的板块分类

hikyuu/include/hikyuu/data_driver/KDataDriver.h

@@ -119,6 +119,21 @@ public:
      */
     virtual TransList getTransList(const string& market, const string& code, const KQuery& query);
 
+    //---------------------------------------------------
+    // 以下为列式数据库接口
+    //---------------------------------------------------
+
+    /** 是否列优先(列数据库存储K线数据) */
+    virtual bool isColumnFirst() const {
+        return false;
+    }
+
+    virtual std::unordered_map<std::string, KRecordList> getAllKRecordList(
+      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;
@@ -169,7 +184,7 @@ public:
         return m_driver->canParallelLoad();
     }
 
-    size_t getCount(const string& market, const string& code, KQuery::KType kType) {
+    size_t getCount(const string& market, const string& code, const KQuery::KType& kType) {
         return m_driver->getCount(market, code, kType);
     }
 
@@ -190,6 +205,16 @@ public:
         return m_driver->getTransList(market, code, query);
     }
 
+    bool isColumnFirst() const {
+        return m_driver->isColumnFirst();
+    }
+
+    std::unordered_map<std::string, KRecordList> getAllKRecordList(
+      const KQuery::KType& ktype, const Datetime& start_date,
+      const std::atomic<bool>& cancel_flag) {
+        return m_driver->getAllKRecordList(ktype, start_date, cancel_flag);
+    }
+
 private:
     KDataDriverPtr m_driver;
 };

hikyuu/include/hikyuu/data_driver/base_info/mysql/MySQLBaseInfoDriver.h

@@ -24,7 +24,7 @@ namespace hku {
 class MySQLBaseInfoDriver : public BaseInfoDriver {
 public:
     MySQLBaseInfoDriver();
-    virtual ~MySQLBaseInfoDriver();
+    virtual ~MySQLBaseInfoDriver() override;
 
     virtual bool _init() override;
     virtual vector<StockInfo> getAllStockInfo() override;

hikyuu/include/hikyuu/data_driver/base_info/sqlite/SQLiteBaseInfoDriver.h

@@ -20,7 +20,7 @@ namespace hku {
 class SQLiteBaseInfoDriver : public BaseInfoDriver {
 public:
     SQLiteBaseInfoDriver();
-    virtual ~SQLiteBaseInfoDriver();
+    virtual ~SQLiteBaseInfoDriver() override;
 
     virtual bool _init() override;
     virtual vector<MarketInfo> getAllMarketInfo() override;

hikyuu/include/hikyuu/data_driver/block_info/mysql/MySQLBlockInfoDriver.h

@@ -15,10 +15,11 @@ namespace hku {
 class MySQLBlockInfoDriver : public BlockInfoDriver {
 public:
     MySQLBlockInfoDriver() : BlockInfoDriver("mysql") {};
-    virtual ~MySQLBlockInfoDriver();
+    virtual ~MySQLBlockInfoDriver() override;
 
     virtual void load() override;
     virtual bool _init() override;
+    virtual StringList getAllCategory() override;
     virtual Block getBlock(const string&, const string&) override;
     virtual BlockList getBlockList(const string& category) override;
     virtual BlockList getBlockList() override;

hikyuu/include/hikyuu/data_driver/block_info/qianlong/QLBlockInfoDriver.h

@@ -16,9 +16,10 @@ namespace hku {
 class QLBlockInfoDriver : public BlockInfoDriver {
 public:
     QLBlockInfoDriver() : BlockInfoDriver("qianlong") {};
-    virtual ~QLBlockInfoDriver();
+    virtual ~QLBlockInfoDriver() override;
 
     virtual bool _init() override;
+    virtual StringList getAllCategory() override;
     virtual Block getBlock(const string&, const string&) override;
     virtual BlockList getBlockList(const string& category) override;
     virtual BlockList getBlockList() override;

hikyuu/include/hikyuu/data_driver/block_info/sqlite/SQLiteBlockInfoDriver.h

@@ -15,10 +15,11 @@ namespace hku {
 class SQLiteBlockInfoDriver : public BlockInfoDriver {
 public:
     SQLiteBlockInfoDriver() : BlockInfoDriver("sqlite3") {};
-    virtual ~SQLiteBlockInfoDriver();
+    virtual ~SQLiteBlockInfoDriver() override;
 
     virtual void load() override;
     virtual bool _init() override;
+    virtual StringList getAllCategory() override;
     virtual Block getBlock(const string&, const string&) override;
     virtual BlockList getBlockList(const string& category) override;
     virtual BlockList getBlockList() override;

hikyuu/include/hikyuu/data_driver/kdata/DoNothingKDataDriver.h

@@ -15,7 +15,7 @@ namespace hku {
 class DoNothingKDataDriver : public KDataDriver {
 public:
     DoNothingKDataDriver() : KDataDriver("DoNothing") {}
-    virtual ~DoNothingKDataDriver() = default;
+    virtual ~DoNothingKDataDriver() override = default;
 
     virtual KDataDriverPtr _clone() override {
         return std::make_shared<DoNothingKDataDriver>();

hikyuu/include/hikyuu/data_driver/kdata/cvs/KDataTempCsvDriver.h

@@ -21,7 +21,7 @@ class KDataTempCsvDriver : public KDataDriver {
 public:
     KDataTempCsvDriver();
     KDataTempCsvDriver(const string& day_filename, const string& min_filename);
-    virtual ~KDataTempCsvDriver();
+    virtual ~KDataTempCsvDriver() override;
 
     void setDayFileName(const string& day_filename) {
         m_day_filename = day_filename;

hikyuu/include/hikyuu/data_driver/kdata/hdf5/H5KDataDriver.h

@@ -17,7 +17,7 @@ namespace hku {
 class HKU_API H5KDataDriver : public KDataDriver {
 public:
     H5KDataDriver();
-    virtual ~H5KDataDriver();
+    virtual ~H5KDataDriver() override;
 
     virtual KDataDriverPtr _clone() override {
         return std::make_shared<H5KDataDriver>();

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

@@ -24,7 +24,7 @@ namespace hku {
 class MySQLKDataDriver : public KDataDriver {
 public:
     MySQLKDataDriver();
-    virtual ~MySQLKDataDriver();
+    virtual ~MySQLKDataDriver() override;
 
     virtual KDataDriverPtr _clone() override {
         return std::make_shared<MySQLKDataDriver>();

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

@@ -17,7 +17,7 @@ namespace hku {
 class SQLiteKDataDriver : public KDataDriver {
 public:
     SQLiteKDataDriver();
-    virtual ~SQLiteKDataDriver();
+    virtual ~SQLiteKDataDriver() override;
 
     virtual KDataDriverPtr _clone() override {
         return std::make_shared<SQLiteKDataDriver>();

hikyuu/include/hikyuu/data_driver/kdata/tdx/TdxKDataDriver.h

@@ -16,7 +16,7 @@ namespace hku {
 class TdxKDataDriver : public KDataDriver {
 public:
     TdxKDataDriver();
-    virtual ~TdxKDataDriver();
+    virtual ~TdxKDataDriver() override;
 
     virtual KDataDriverPtr _clone() override {
         return std::make_shared<TdxKDataDriver>();

hikyuu/include/hikyuu/hikyuu.h

@@ -13,10 +13,10 @@
 #include "Stock.h"
 #include "StockManager.h"
 #include "utilities/Parameter.h"
-#include "indicator/build_in.h"
 #include "trade_manage/build_in.h"
 #include "trade_sys/all.h"
 #include "strategy/Strategy.h"
+#include "indicator/build_in.h"
 
 namespace hku {
 

hikyuu/include/hikyuu/indicator/build_in.h

@@ -129,5 +129,6 @@
 #include "crt/ZHBOND10.h"
 #include "crt/ZONGGUBEN.h"
 #include "crt/ZSCORE.h"
+#include "crt/QUANTILE_TRUNC.h"
 
 #endif /* INDICATOR_BUILD_IN_H_ */

hikyuu/include/hikyuu/indicator/crt/CYCLE.h

@@ -19,9 +19,9 @@ namespace hku {
  * @param delay_to_trading_day 延迟至交易日，当调仓日为非交易日时，自动延迟至下一个交易日作为调仓日
  * @ingroup Indicator
  */
-Indicator CYCLE(const KData& k, int adjust_cycle = 1, const string& adjust_mode = "query",
-                bool delay_to_trading_day = true);
-Indicator CYCLE(int adjust_cycle = 1, const string& adjust_mode = "query",
-                bool delay_to_trading_day = true);
+Indicator HKU_API CYCLE(const KData& k, int adjust_cycle = 1, const string& adjust_mode = "query",
+                        bool delay_to_trading_day = true);
+Indicator HKU_API CYCLE(int adjust_cycle = 1, const string& adjust_mode = "query",
+                        bool delay_to_trading_day = true);
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/crt/HSL.h

@@ -20,8 +20,8 @@ namespace hku {
  * @param k 关联的K线数据
  * @ingroup Indicator
  */
-Indicator HSL(const KData& k);
-Indicator HSL();
+Indicator HKU_API HSL(const KData& k);
+Indicator HKU_API HSL();
 
 }  // namespace hku
 #endif /* INDICATOR_CRT_HSL_H_ */