hikyuu 2.6.9__py3-none-win_amd64.whl → 2.7.0__py3-none-win_amd64.whl

hikyuu/fetcher/stock/zh_block_em.py

@@ -17,7 +17,6 @@ from hikyuu.util import *
 em_num_per_page = 100
 
 
-@hku_catch(ret=[], trace=False)
 def get_hybk_names():
     """获取所有行业(板块代码,板块名称)列表"""
     url = "https://19.push2.eastmoney.com/api/qt/clist/get"
@@ -50,7 +49,6 @@ def get_hybk_names():
     return ret
 
 
-@hku_catch(ret=[], trace=False)
 def get_hybk_cons_code(blk_code):
     "获取指定行业板块成分代码列表"
     url = "http://30.push2.eastmoney.com/api/qt/clist/get"
@@ -83,7 +81,6 @@ def get_hybk_cons_code(blk_code):
     return ret
 
 
-@hku_catch(ret={}, trace=False)
 def get_all_hybk_info(code_market_dict, sep=""):
     """获取所有行业板块列表"""
     blk_list = get_hybk_names()
@@ -434,7 +431,6 @@ def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
     return temp_df
 
 
-@hku_catch(ret={}, trace=False)
 def get_all_gnbk_info(code_market_dict, sep=""):
     """获取所有概念版本列表"""
     blk_names = stock_board_concept_name_em()['板块名称']
@@ -450,7 +446,6 @@ def get_all_gnbk_info(code_market_dict, sep=""):
     return ret
 
 
-@hku_catch(ret=[], trace=False)
 def get_dybk_names():
     """获取所有地域板块名称列表"""
     url = "http://13.push2.eastmoney.com/api/qt/clist/get"
@@ -483,7 +478,6 @@ def get_dybk_names():
     return ret
 
 
-@hku_catch(ret={}, trace=False)
 def get_all_dybk_info(code_market_dict, sep=""):
     """获取所有地域板块列表"""
     blk_list = get_dybk_names()
@@ -534,60 +528,6 @@ def get_all_dybk_info(code_market_dict, sep=""):
     return ret
 
 
-@hku_catch(ret={}, trace=False)
-def get_all_zsbk_info(code_market_dict, sep=""):
-    """获取所有指数成分股列表"""
-    blk_info = ak.index_stock_info()
-    blk_info['index_code'] = blk_info['index_code'].astype(str)  # 确保是字符串类型
-    df_000 = blk_info[blk_info['index_code'].str.startswith('000')].reset_index(drop=True)  # 000前缀
-    df_399 = blk_info[blk_info['index_code'].str.startswith('399')].reset_index(drop=True)  # 399前缀
-
-    # 2. 交替合并两个DataFrame
-    merged_rows = []
-    max_length = max(len(df_000), len(df_399))  # 取两个DataFrame的最大长度
-
-    for i in range(max_length):
-        # 先加000前缀的行（如果存在）
-        if i < len(df_000):
-            merged_rows.append(df_000.iloc[i])
-        # 再加399前缀的行（如果存在）
-        if i < len(df_399):
-            merged_rows.append(df_399.iloc[i])
-
-    # 3. 转换为DataFrame
-    blk_info = pd.DataFrame(merged_rows).reset_index(drop=True)
-
-    blk_codes = blk_info["index_code"]
-    blk_names = blk_info["display_name"]
-    ret = {}
-    total = len(blk_codes)
-    for i in range(total):
-        blk_name = blk_names[i]
-        blk_code = blk_codes[i]
-        # print(i, blk_name)
-        # 沪深指数有重复，避免深指覆盖
-        if blk_name in ret:
-            continue
-
-        time.sleep(random.uniform(1, 3))
-        try:
-            if blk_code[:3] == "399":
-                stk_codes = ak.index_stock_cons(symbol=blk_code)
-                stk_codes = stk_codes['品种代码'].to_list()
-            else:
-                stk_codes = ak.index_stock_cons_csindex(symbol=blk_code)
-                stk_codes = stk_codes['成分券代码'].to_list()
-            hku_info("{}|{} 获取指数板块 {}|{} 成分: {}", i, total, blk_code, blk_name, len(stk_codes))
-            ret[blk_name] = [
-                f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
-        except KeyboardInterrupt:
-            break
-        except Exception as e:
-            print(f"Failed! {i}, {blk_code}, {blk_name}")
-            # raise e
-    return ret
-
-
 if __name__ == "__main__":
     blks = get_hybk_names()
     # blks = get_hybk_cons_code('BK0480')

hikyuu/gui/HikyuuTDX.py

@@ -35,7 +35,8 @@ from hikyuu.gui.data.CollectSpotThread import CollectSpotThread
 from hikyuu.gui.data.SchedImportThread import SchedImportThread
 from hikyuu.gui.spot_server import release_nng_senders
 
-from hikyuu import can_upgrade, get_last_version, fetch_trial_license, view_license, is_valid_license
+from hikyuu import (can_upgrade, get_last_version, fetch_trial_license,
+                    view_license, is_valid_license, get_expire_date, Datetime, TimeDelta)
 from hikyuu.data import hku_config_template
 from hikyuu.util import *
 
@@ -313,6 +314,7 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         if os.path.exists(this_dir + '/importdata-gui.ini'):
             import_config.read(this_dir + '/importdata-gui.ini', encoding='utf-8')
 
+        self.use_download = 'pytdx'
         self._is_sched_import_running = False
         self._is_collect_running = False
         self._stream = None
@@ -332,6 +334,9 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         icon = QIcon(f"{current_dir}/images/hikyuu_small.png")
         star_img = QPixmap(f"{current_dir}/images/star.png")
         self.label_44.setPixmap(star_img)
+        liandong_img = QPixmap(f"{current_dir}/images/liandongxiaopu.png")
+        self.label_56.setPixmap(liandong_img)
+
         # 修改 label_46 的 HTML 文本，直接在 HTML 中设置字体大小
 
         label_46_txt = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -863,6 +868,17 @@ li.checked::marker { content: "\2612"; }
                         "Hikyuu 新版本 ({}) 已发布，建议更新".format(get_last_version()))
                     self.import_detail_textEdit.append("更新命令: pip instal hikyuu --upgrade")
                     self.import_detail_textEdit.append("========================================================")
+                if is_valid_license():
+                    expire_date = get_expire_date()
+                    if expire_date != Datetime.min():
+                        delta = expire_date - Datetime.now()
+                        if delta < TimeDelta(3):
+                            self.import_detail_textEdit.append(
+                                "========================================================")
+                            self.import_detail_textEdit.append(
+                                "您的授权即将到期，截止日期：{}!".format(expire_date))
+                            self.import_detail_textEdit.append(
+                                "========================================================")
                 self.import_running = False
 
             elif msg_task_name == 'IMPORT_KDATA':
@@ -1109,5 +1125,6 @@ if __name__ == "__main__":
     else:
         myWin = MyMainWindow(capture_output=True)
 
+    myWin.resize(1100, 400)
     myWin.show()
     sys.exit(app.exec())

hikyuu/gui/data/MainWindow.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'MainWindow.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.8.1
+## Created by: Qt User Interface Compiler version 6.10.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -17,16 +17,17 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QDateEdit,
     QDateTimeEdit, QFrame, QGridLayout, QGroupBox,
-    QHBoxLayout, QLabel, QLineEdit, QMainWindow,
-    QProgressBar, QPushButton, QRadioButton, QSizePolicy,
-    QSpacerItem, QSpinBox, QTabWidget, QTextBrowser,
-    QTextEdit, QTimeEdit, QVBoxLayout, QWidget)
+    QHBoxLayout, QLabel, QLayout, QLineEdit,
+    QMainWindow, QProgressBar, QPushButton, QRadioButton,
+    QSizePolicy, QSpacerItem, QSpinBox, QTabWidget,
+    QTextBrowser, QTextEdit, QTimeEdit, QVBoxLayout,
+    QWidget)
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         if not MainWindow.objectName():
             MainWindow.setObjectName(u"MainWindow")
-        MainWindow.resize(1178, 719)
+        MainWindow.resize(1139, 713)
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.horizontalLayout_12 = QHBoxLayout(self.centralwidget)
@@ -250,7 +251,7 @@ class Ui_MainWindow(object):
 
         self.min5_start_dateEdit = QDateEdit(self.groupBox_7)
         self.min5_start_dateEdit.setObjectName(u"min5_start_dateEdit")
-        self.min5_start_dateEdit.setMinimumDateTime(QDateTime(QDate(1989, 12, 21), QTime(16, 0, 0)))
+        self.min5_start_dateEdit.setMinimumDateTime(QDateTime(QDate(1989, 12, 21), QTime(0, 0, 0)))
         self.min5_start_dateEdit.setCalendarPopup(True)
 
         self.gridLayout_4.addWidget(self.min5_start_dateEdit, 1, 1, 1, 1)
@@ -284,7 +285,7 @@ class Ui_MainWindow(object):
 
         self.day_start_dateEdit = QDateEdit(self.groupBox_7)
         self.day_start_dateEdit.setObjectName(u"day_start_dateEdit")
-        self.day_start_dateEdit.setMinimumDateTime(QDateTime(QDate(1989, 12, 21), QTime(16, 0, 0)))
+        self.day_start_dateEdit.setMinimumDateTime(QDateTime(QDate(1989, 12, 21), QTime(0, 0, 0)))
         self.day_start_dateEdit.setCalendarPopup(True)
 
         self.gridLayout_4.addWidget(self.day_start_dateEdit, 0, 1, 1, 1)
@@ -1211,6 +1212,14 @@ class Ui_MainWindow(object):
 
         self.verticalLayout_16.addWidget(self.label_48)
 
+        self.horizontalLayout_22 = QHBoxLayout()
+        self.horizontalLayout_22.setObjectName(u"horizontalLayout_22")
+
+        self.verticalLayout_16.addLayout(self.horizontalLayout_22)
+
+        self.horizontalLayout_26 = QHBoxLayout()
+        self.horizontalLayout_26.setObjectName(u"horizontalLayout_26")
+        self.horizontalLayout_26.setSizeConstraint(QLayout.SetFixedSize)
         self.label_44 = QLabel(self.tab_star)
         self.label_44.setObjectName(u"label_44")
         sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
@@ -1222,7 +1231,23 @@ class Ui_MainWindow(object):
         self.label_44.setPixmap(QPixmap(u"../images/star.png"))
         self.label_44.setScaledContents(True)
 
-        self.verticalLayout_16.addWidget(self.label_44)
+        self.horizontalLayout_26.addWidget(self.label_44, 0, Qt.AlignLeft)
+
+        self.label_56 = QLabel(self.tab_star)
+        self.label_56.setObjectName(u"label_56")
+        self.label_56.setMaximumSize(QSize(160, 160))
+        self.label_56.setFrameShape(QFrame.NoFrame)
+        self.label_56.setPixmap(QPixmap(u"../images/liandongxiaopu.png"))
+        self.label_56.setScaledContents(True)
+
+        self.horizontalLayout_26.addWidget(self.label_56, 0, Qt.AlignLeft)
+
+        self.horizontalSpacer_15 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_26.addItem(self.horizontalSpacer_15)
+
+
+        self.verticalLayout_16.addLayout(self.horizontalLayout_26)
 
 
         self.verticalLayout_18.addLayout(self.verticalLayout_16)
@@ -1446,8 +1471,9 @@ class Ui_MainWindow(object):
         self.label_47.setText(QCoreApplication.translate("MainWindow", u"\u7533\u8bf7\u6350\u8d60\u529f\u80fd\u8bd5\u7528\uff0830\u5929\u8bd5\u7528\uff09", None))
         self.label_45.setText(QCoreApplication.translate("MainWindow", u"\u7535\u5b50\u90ae\u4ef6\u5730\u5740:", None))
         self.fetch_trial_pushButton.setText(QCoreApplication.translate("MainWindow", u"\u7533\u8bf7\u8bd5\u7528\u8bb8\u53ef", None))
-        self.label_48.setText(QCoreApplication.translate("MainWindow", u"\u52a0\u5165\u77e5\u8bc6\u661f\u7403\u8fdb\u884c\u6350\u8d60\uff08\u53ef\u540c\u65f6\u57283\u53f0\u8bbe\u5907\u4e0a\u4f7f\u7528\u6350\u8d60\u529f\u80fd\uff09", None))
+        self.label_48.setText(QCoreApplication.translate("MainWindow", u"\u52a0\u5165\u77e5\u8bc6\u661f\u7403\u8fdb\u884c\u6350\u8d60\uff08\u53ef\u540c\u65f6\u57283\u53f0\u8bbe\u5907\u4e0a\u4f7f\u7528\u6350\u8d60\u529f\u80fd\uff09,\u6216\u8005\u8bf7\u4f5c\u8005\u559d\u676f\u2615\ufe0f\uff0c\u8c22\u8c22", None))
         self.label_44.setText("")
+        self.label_56.setText("")
         self.label_49.setText(QCoreApplication.translate("MainWindow", u"\u5f53\u524d\u6350\u8d60\u6388\u6743\u4fe1\u606f", None))
         self.label_license.setText(QCoreApplication.translate("MainWindow", u"TextLabel", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_star), QCoreApplication.translate("MainWindow", u"\u9879\u76ee\u6350\u8d60", None))

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 0x1bdf3c17880; ConfigModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1ab4346acb0; 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 1bdf3c29220>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.ConfigModel'> at 1ab43480e50>
     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 0x1bdf3c17e20; HubModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1ab4346bdc0; 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 1bdf3c4cf90>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.HubModel'> at 1ab434a5b20>
     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 0x1bdf3c578e0; PartModel>
+    __mapper__: typing.ClassVar[sqlalchemy.orm.mapper.Mapper]  # value = <Mapper at 0x1ab434b8280; 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 1bdf3c539f0>
+    _sa_class_manager: typing.ClassVar[sqlalchemy.orm.instrumentation.ClassManager]  # value = <ClassManager of <class 'hikyuu.hub.PartModel'> at 1ab434a6a70>
     def __init__(self, **kwargs):
         """
         A simple constructor that allows initialization from kwargs.

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,8 +276,6 @@ 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>&&);
 

hikyuu/include/hikyuu/config.h

@@ -46,9 +46,6 @@
 // 使用 TA-Lib
 #define HKU_ENABLE_TA_LIB 1
 
-// 使用 Arrow
-#define HKU_ENABLE_ARROW 1
-
 // clang-format on
 
 #endif /* HIKYUU_CONFIG_H_ */

hikyuu/include/hikyuu/plugin/device.h

@@ -11,6 +11,13 @@
 
 namespace hku {
 
+/**
+ * @brief 绑定授权码
+ * @param email 邮箱
+ * @param active_code 授权码
+ */
+void HKU_API bindEmail(const std::string& email, const std::string& active_code);
+
 /**
  * @brief 激活设备
  * @param active_code 授权码
@@ -30,4 +37,7 @@ std::string HKU_API fetchTrialLicense(const std::string& email);
 /** 检查授权是否有效 */
 bool HKU_API isValidLicense();
 
+/** 获取授权到期时间 */
+Datetime HKU_API getExpireDate();
+
 }  // namespace hku

hikyuu/include/hikyuu/plugin/interface/DevicePluginInterface.h

@@ -16,11 +16,13 @@ public:
     DevicePluginInterface() = default;
     virtual ~DevicePluginInterface() = default;
 
+    virtual void bind(const std::string& email, const std::string& active_code) noexcept = 0;
     virtual void activate(const std::string& active_code, bool replace) noexcept = 0;
     virtual std::string viewLicense() noexcept = 0;
     virtual void removeLicense() noexcept = 0;
     virtual std::string fetchTrialLicense(const std::string& email) noexcept = 0;
     virtual bool isValidLicsense() noexcept = 0;
+    virtual Datetime getExpireDate() const noexcept = 0;
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/plugin/interface/plugins.h

@@ -18,10 +18,6 @@
 #include "DataDriverPluginInterface.h"
 #include "HkuExtraPluginInterface.h"
 
-#if HKU_ENABLE_ARROW
-#include "HkuViewsPluginInterface.h"
-#endif
-
 namespace hku {
 
 #define HKU_PLUGIN_BACKTEST "backtest"
@@ -32,6 +28,5 @@ namespace hku {
 #define HKU_PLUGIN_TMREPORT "tmreport"
 #define HKU_PLUGIN_CLICKHOUSE_DRIVER "clickhousedriver"
 #define HKU_PLUGIN_HKU_EXTRA "hkuextra"
-#define HKU_PLUGIN_HKU_VIEWS "hkuviews"
 
 }  // namespace hku

hikyuu/include/hikyuu/python/pybind_utils.h

@@ -10,9 +10,6 @@
 #define HIKYUU_PYTHON_BIND_UTILS_H
 
 #include <hikyuu/config.h>
-#if HKU_ENABLE_ARROW
-#include <arrow/api.h>
-#endif
 #include <pybind11/pybind11.h>
 
 #include <pybind11/operators.h>
@@ -127,15 +124,6 @@ inline bool check_pyfunction_arg_num(const py::object& func, size_t arg_num) {
  */
 size_t utf8_to_utf32(const std::string& utf8_str, int32_t* out, size_t out_len) noexcept;
 
-#if HKU_ENABLE_ARROW
-/*
- * 将arrow::Table转换为 pyarrow::Table
- * @param table 待转换的arrow::Table
- * @return 转换后的py::object
- */
-py::object to_pyarrow_table(const std::shared_ptr<arrow::Table>& table);
-#endif
-
 }  // namespace hku
 
 #endif  // HIKYUU_PYTHON_BIND_UTILS_H

hikyuu/include/hikyuu/trade_sys/slippage/build_in.h

@@ -11,5 +11,9 @@
 
 #include "crt/SP_FixedPercent.h"
 #include "crt/SP_FixedValue.h"
+#include "crt/SP_Uniform.h"
+#include "crt/SP_Normal.h"
+#include "crt/SP_LogNormal.h"
+#include "crt/SP_TruncNormal.h"
 
-#endif /* SLIPPAGE_BUILD_IN_H_ */
+#endif /* SLIPPAGE_BUILD_IN_H_ */

hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_LogNormal.h

@@ -0,0 +1,22 @@
+/*
+ * SP_LogNormal.h
+ *
+ *  Created on: 2025年10月25日
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+/**
+ * 对数正态分布随机价格移滑价差算法, 买入和卖出操作是基于对数正态分布的随机价格偏移
+ * @param mean 对数正态分布的均值参数
+ * @param stddev 对数正态分布的标准差参数
+ * @return 滑点对象指针
+ */
+SlippagePtr HKU_API SP_LogNormal(double mean = 0.0, double stddev = 0.05);
+
+} /* namespace hku */

hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_Normal.h

@@ -0,0 +1,22 @@
+/*
+ * SP_Normal.h
+ *
+ *  Created on: 2025年10月25日
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+/**
+ * 正态分布随机价格移滑价差算法, 买入和卖出操作是基于正态分布的随机价格偏移
+ * @param mean 正态分布均值
+ * @param stddev 正态分布标准差
+ * @return 滑点对象指针
+ */
+SlippagePtr HKU_API SP_Normal(double mean = 0.0, double stddev = 0.05);
+
+} /* namespace hku */

hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_TruncNormal.h

@@ -0,0 +1,25 @@
+/*
+ * SP_TruncNormal.h
+ *
+ *  Created on: 2025年10月25日
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+/**
+ * 截断正态分布随机价格移滑价差算法, 买入和卖出操作是基于截断正态分布的随机价格偏移
+ * @param mean 正态分布均值
+ * @param stddev 正态分布标准差
+ * @param min_value 截断最小值
+ * @param max_value 截断最大值
+ * @return 滑点对象指针
+ */
+SlippagePtr HKU_API SP_TruncNormal(double mean = 0.0, double stddev = 0.05, double min_value = -0.1,
+                                   double max_value = 0.1);
+
+} /* namespace hku */

hikyuu/include/hikyuu/trade_sys/slippage/crt/SP_Uniform.h

@@ -0,0 +1,23 @@
+/*
+ * SL_FixedValue.h
+ *
+ *  Created on: 2016年5月7日
+ *      Author: Administrator
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+/**
+ * 均匀分布随机价格移滑价差算法, 买入和卖出操作是价格在[min_value,
+ * max_value]范围内的均匀分布随机偏移
+ * @param min_value 偏移价格下限
+ * @param max_value 偏移价格上限
+ * @return
+ */
+SlippagePtr HKU_API SP_Uniform(double min_value = -0.05, double max_value = 0.05);
+
+} /* namespace hku */

hikyuu/include/hikyuu/trade_sys/slippage/imp/LogNormalSlippage.h

@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-10-25
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+class LogNormalSlippage : public SlippageBase {
+    SLIPPAGE_IMP(LogNormalSlippage)
+    SLIPPAGE_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    LogNormalSlippage();
+    virtual ~LogNormalSlippage();
+    virtual void _checkParam(const string& name) const override;
+
+private:
+    static std::random_device ms_rd;
+    static std::mt19937 ms_gen;
+};
+
+} /* namespace hku */

hikyuu/include/hikyuu/trade_sys/slippage/imp/NormalSlippage.h

@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-10-25
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+class NormalSlippage : public SlippageBase {
+    SLIPPAGE_IMP(NormalSlippage)
+    SLIPPAGE_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    NormalSlippage();
+    virtual ~NormalSlippage();
+    virtual void _checkParam(const string& name) const override;
+
+private:
+    static std::random_device ms_rd;
+    static std::mt19937 ms_gen;
+};
+
+} /* namespace hku */

hikyuu/include/hikyuu/trade_sys/slippage/imp/TruncNormalSlippage.h

@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-10-25
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+class TruncNormalSlippage : public SlippageBase {
+    SLIPPAGE_IMP(TruncNormalSlippage)
+    SLIPPAGE_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    TruncNormalSlippage();
+    virtual ~TruncNormalSlippage();
+    virtual void _checkParam(const string& name) const override;
+
+private:
+    static std::random_device ms_rd;
+    static std::mt19937 ms_gen;
+};
+
+} /* namespace hku */

hikyuu/include/hikyuu/trade_sys/slippage/imp/UniformSlippage.h

@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2025 hikyuu.org
+ *
+ *  Created on: 2025-10-25
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SlippageBase.h"
+
+namespace hku {
+
+class UniformSlippage : public SlippageBase {
+    SLIPPAGE_IMP(UniformSlippage)
+    SLIPPAGE_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    UniformSlippage();
+    virtual ~UniformSlippage();
+    virtual void _checkParam(const string& name) const override;
+};
+
+} /* namespace hku */

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.6.9"
+#define HKU_VERSION "2.7.0"
 #define HKU_VERSION_MAJOR 2
-#define HKU_VERSION_MINOR 6
-#define HKU_VERSION_ALTER 9
-#define HKU_VERSION_BUILD 202510192112
+#define HKU_VERSION_MINOR 7
+#define HKU_VERSION_ALTER 0
+#define HKU_VERSION_BUILD 202511012109
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.9 release.5d57f8d9 (RELEASE)"
+#define HKU_VERSION_GIT "2.7.0 release.31701445 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */