hikyuu 2.2.3__py3-none-win_amd64.whl → 2.3.0__py3-none-win_amd64.whl

hikyuu/gui/HikyuuTDX.py

@@ -16,7 +16,7 @@ import PyQt5
 
 from PyQt5.QtWidgets import QApplication, QMainWindow, QFileDialog, QMessageBox
 from PyQt5.QtCore import pyqtSlot, QObject, pyqtSignal
-from PyQt5.QtGui import QIcon, QTextCursor, QFont
+from PyQt5.QtGui import QIcon, QTextCursor, QFont, QPalette
 
 import mysql.connector
 from mysql.connector import errorcode
@@ -50,11 +50,12 @@ class EmittingStream(QObject):
 
 
 class MyMainWindow(QMainWindow, Ui_MainWindow):
-    def __init__(self, parent=None, capture_output=False, use_dark_style=False):
+    def __init__(self, parent=None, capture_output=False):
         super(MyMainWindow, self).__init__(parent)
         self._capture_output = capture_output  # 捕获Python stdout 输出
-        self._use_dark_style = use_dark_style  # 使用暗黑主题
-        self._text_color = '#FFFFFF' if use_dark_style else '#000000'
+        palette = QApplication.instance().palette()
+        # 获取文字默认颜色
+        self._text_color = palette.color(QPalette.WindowText).name()
         self.setupUi(self)
         self.initUI()
         self.initLogger()
@@ -266,7 +267,9 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.log_textEdit.document().setMaximumBlockCount(1000)
 
         current_dir = os.path.dirname(__file__)
-        self.setWindowIcon(QIcon("{}/hikyuu.ico".format(current_dir)))
+        icon = QIcon(f"{current_dir}/hikyuu_small.png")
+        self.setWindowIcon(icon)
+        QApplication.instance().setWindowIcon(icon)
         self.import_detail_textEdit.clear()
         self.reset_progress_bar()
         self.day_start_dateEdit.setMinimumDate(datetime.date(1990, 12, 19))
@@ -711,6 +714,14 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
             QMessageBox.about(self, "错误", str(e))
             return
 
+        now = hikyuu.Datetime.now()
+        today = hikyuu.Datetime.today()
+        if now.day_of_week() not in (0, 6) and hikyuu.TimeDelta(0, 8, 30) < now - today < hikyuu.TimeDelta(0, 15, 45):
+            reply = QMessageBox.question(self, '警告', '交易日8:30-15:45分之间导入数据将导致盘后数据错误，是否仍要继续执行导入?',
+                                         QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
+            if reply == QMessageBox.No:
+                return
+
         self.import_running = True
         self.start_import_pushButton.setEnabled(False)
         self.reset_progress_bar()
@@ -797,11 +808,7 @@ def start():
     logging.getLogger("requests").setLevel(logging.WARNING)
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     app = QApplication(sys.argv)
-    use_dark_style = False  # 使用暗黑主题
-    if use_dark_style:
-        import qdarkstyle
-        app.setStyleSheet(qdarkstyle.load_stylesheet(qt_api='pyqt5'))
-    myWin = MyMainWindow(capture_output=True, use_dark_style=use_dark_style)
+    myWin = MyMainWindow(capture_output=True)
     myWin.show()
     sys.exit(app.exec())
 
@@ -822,18 +829,14 @@ if __name__ == "__main__":
     f.setPixelSize(12)
     app.setFont(f)
 
-    use_dark_style = False  # 使用暗黑主题
-    if use_dark_style:
-        import qdarkstyle
-        app.setStyleSheet(qdarkstyle.load_stylesheet(qt_api='pyqt5'))
     if (len(sys.argv) > 1 and sys.argv[1] == '0'):
         FORMAT = '%(asctime)-15s [%(levelname)s]: %(message)s [%(name)s::%(funcName)s]'
         logging.basicConfig(format=FORMAT, level=logging.INFO, handlers=[
             logging.StreamHandler(),
         ])
-        myWin = MyMainWindow(capture_output=False, use_dark_style=use_dark_style)
+        myWin = MyMainWindow(capture_output=False)
     else:
-        myWin = MyMainWindow(capture_output=True, use_dark_style=use_dark_style)
+        myWin = MyMainWindow(capture_output=True)
 
     myWin.show()
     sys.exit(app.exec())

hikyuu/gui/data/MainWindow.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'MainWindow.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.9
+# Created by: PyQt5 UI code generator 5.15.10
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")
-        MainWindow.resize(1131, 604)
+        MainWindow.resize(1269, 690)
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.centralwidget)
@@ -165,7 +165,7 @@ class Ui_MainWindow(object):
         self.label_6.setObjectName("label_6")
         self.gridLayout_4.addWidget(self.label_6, 3, 0, 1, 1)
         self.min5_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1990, 1, 1), QtCore.QTime(0, 0, 0)))
+        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(16, 0, 0)))
         self.min5_start_dateEdit.setCalendarPopup(True)
         self.min5_start_dateEdit.setObjectName("min5_start_dateEdit")
         self.gridLayout_4.addWidget(self.min5_start_dateEdit, 1, 1, 1, 1)
@@ -174,9 +174,6 @@ class Ui_MainWindow(object):
         self.min_start_dateEdit.setObjectName("min_start_dateEdit")
         self.gridLayout_4.addWidget(self.min_start_dateEdit, 2, 1, 1, 1)
         self.label_3 = QtWidgets.QLabel(self.groupBox_7)
-        font = QtGui.QFont()
-        font.setPointSize(9)
-        self.label_3.setFont(font)
         self.label_3.setObjectName("label_3")
         self.gridLayout_4.addWidget(self.label_3, 0, 0, 1, 1)
         self.label_10 = QtWidgets.QLabel(self.groupBox_7)
@@ -190,7 +187,7 @@ class Ui_MainWindow(object):
         self.trans_start_dateEdit.setObjectName("trans_start_dateEdit")
         self.gridLayout_4.addWidget(self.trans_start_dateEdit, 3, 1, 1, 1)
         self.day_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1990, 1, 1), QtCore.QTime(0, 0, 0)))
+        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(16, 0, 0)))
         self.day_start_dateEdit.setCalendarPopup(True)
         self.day_start_dateEdit.setObjectName("day_start_dateEdit")
         self.gridLayout_4.addWidget(self.day_start_dateEdit, 0, 1, 1, 1)
@@ -751,9 +748,12 @@ class Ui_MainWindow(object):
         self.label_12.setText(_translate("MainWindow", "导入5分钟线："))
         self.label_9.setText(_translate("MainWindow", "导入权息数据："))
         self.import_detail_textEdit.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Sans Serif\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"hr { height: 1px; border-width: 0; }\n"
+"li.unchecked::marker { content: \"\\2610\"; }\n"
+"li.checked::marker { content: \"\\2612\"; }\n"
+"</style></head><body style=\" font-family:\'Microsoft YaHei UI\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证日线记录：</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入深证日线记录：</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">导入上证5分钟线记录：</span></p>\n"
@@ -808,9 +808,12 @@ class Ui_MainWindow(object):
         self.label_38.setText(_translate("MainWindow", "-"))
         self.collect_use_zhima_checkBox.setText(_translate("MainWindow", "使用芝麻代理"))
         self.textBrowser.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><meta charset=\"utf-8\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'Sans Serif\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+"hr { height: 1px; border-width: 0; }\n"
+"li.unchecked::marker { content: \"\\2610\"; }\n"
+"li.checked::marker { content: \"\\2612\"; }\n"
+"</style></head><body style=\" font-family:\'Microsoft YaHei UI\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">注：</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\'; font-size:10pt; font-weight:600; color:#ff0000;\">1、行情采集服务仅对预加载数据有效</span><span style=\" font-family:\'SimSun\';\">，在行情采集服务运行期间，hikyuu.interactive运行时将自动连接采集服务获取行情数据，并更新预加载的内容数据。</span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'SimSun\';\"><br /></p>\n"

hikyuu/hub.py

@@ -206,7 +206,7 @@ class HubManager(metaclass=SingletonType):
         # 检查并下载 hikyuu 默认策略仓库, hikyuu_hub 避免导入时模块和 hikyuu 重名
         hikyuu_hub_path = self._session.query(HubModel.local).filter(HubModel.name == 'default').first()
         if hikyuu_hub_path is None:
-            self.add_remote_hub('default', 'https://gitee.com/fasiondog/hikyuu_hub.git', 'master')
+            self.add_remote_hub('default', 'https://gitee.com/fasiondog/hikyuu_hub.git', 'main')
 
     def download_remote_hub(self, local_dir, url, branch):
         print('正在下载 hikyuu 策略仓库至："{}"'.format(local_dir))
@@ -222,7 +222,7 @@ class HubManager(metaclass=SingletonType):
         print('下载完毕')
 
     @dbsession
-    def add_remote_hub(self, name, url, branch='master'):
+    def add_remote_hub(self, name, url, branch='main'):
         """增加远程策略仓库
 
         :param str name: 本地仓库名称（自行起名）
@@ -266,7 +266,7 @@ class HubManager(metaclass=SingletonType):
         # 检查仓库目录名称是否与其他 python 模块存在冲突
         tmp = importlib.import_module(os.path.basename(local_path))
         checkif(
-            tmp.__path__[0] != local_path,
+            tmp.__path__[0] != local_path if sys.platform == 'win32' else tmp.__path__[0].lower() != local_path.lower(),
             name,
             ModuleConflictError,
             conflict_module=tmp.__path__[0],
@@ -502,7 +502,7 @@ class HubManager(metaclass=SingletonType):
         return hub_model.name
 
 
-def add_remote_hub(name, url, branch='master'):
+def add_remote_hub(name, url, branch='main'):
     """增加远程策略仓库
 
     :param str name: 本地仓库名称（自行起名）

hikyuu/include/hikyuu/DataType.h

@@ -17,6 +17,7 @@
 #define NOMINMAX
 #endif
 
+#include "config.h"
 #include <boost/config.hpp>
 
 #include <stdio.h>
@@ -28,8 +29,9 @@
 // #include <vector>
 #include <map>
 #include <unordered_map>
+#include <set>
+#include <unordered_set>
 
-#include "config.h"
 #include "utilities/Log.h"
 #include "utilities/osdef.h"
 #include "utilities/cppdef.h"

hikyuu/include/hikyuu/StockManager.h

@@ -129,6 +129,16 @@ public:
      */
     Block getBlock(const string& category, const string& name);
 
+    void addBlock(const Block& blk) {
+        saveBlock(blk);
+    }
+
+    void saveBlock(const Block& blk);
+    void removeBlock(const string& category, const string& name);
+    void removeBlock(const Block& blk) {
+        removeBlock(blk.category(), blk.name());
+    }
+
     /**
      * 获取指定分类的板块列表
      * @param category 板块分类

hikyuu/include/hikyuu/config.h

@@ -43,6 +43,9 @@
 // 使用低精度版本，Indicator 使用 float 类型进行计算
 #define HKU_USE_LOW_PRECISION 0
 
+// 使用 TA-Lib
+#define HKU_ENABLE_TA_LIB 1
+
 // clang-format on
 
 #endif /* HIKYUU_CONFIG_H_ */

hikyuu/include/hikyuu/data_driver/BlockInfoDriver.h

@@ -23,7 +23,7 @@ class HKU_API BlockInfoDriver {
 
 public:
     BlockInfoDriver(const string& name);
-    virtual ~BlockInfoDriver(){};
+    virtual ~BlockInfoDriver() {};
 
     /** 获取驱动名称 */
     const string& name() const;
@@ -74,6 +74,20 @@ public:
      */
     virtual BlockList getBlockList() = 0;
 
+    /**
+     * 保存指定的板块
+     * @note 如果已存在同名板块，则覆盖；如果板块分类或名称存在修改，需要手工在修改前删除原板块
+     * @param block
+     */
+    virtual void save(const Block& block) = 0;
+
+    /**
+     * 删除指定的板块
+     * @param category 板块分类
+     * @param name 板块名称
+     */
+    virtual void remove(const string& category, const string& name) = 0;
+
 private:
     bool checkType();
 

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

@@ -7,13 +7,14 @@
 
 #pragma once
 
+#include <mutex>
 #include "../../BlockInfoDriver.h"
 
 namespace hku {
 
 class MySQLBlockInfoDriver : public BlockInfoDriver {
 public:
-    MySQLBlockInfoDriver() : BlockInfoDriver("mysql"){};
+    MySQLBlockInfoDriver() : BlockInfoDriver("mysql") {};
     virtual ~MySQLBlockInfoDriver();
 
     virtual void load() override;
@@ -21,9 +22,15 @@ public:
     virtual Block getBlock(const string&, const string&) override;
     virtual BlockList getBlockList(const string& category) override;
     virtual BlockList getBlockList() override;
+    virtual void save(const Block& block) override;
+    virtual void remove(const string& category, const string& name) override;
+
+private:
+    DBConnectPtr getConnect();
 
 private:
     unordered_map<string, unordered_map<string, Block>> m_buffer;
+    std::shared_mutex m_buffer_mutex;
 };
 
 }  // namespace hku

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

@@ -15,13 +15,15 @@ namespace hku {
 
 class QLBlockInfoDriver : public BlockInfoDriver {
 public:
-    QLBlockInfoDriver() : BlockInfoDriver("qianlong"){};
+    QLBlockInfoDriver() : BlockInfoDriver("qianlong") {};
     virtual ~QLBlockInfoDriver();
 
     virtual bool _init() override;
     virtual Block getBlock(const string&, const string&) override;
     virtual BlockList getBlockList(const string& category) override;
     virtual BlockList getBlockList() override;
+    virtual void save(const Block& block) override;
+    virtual void remove(const string& category, const string& name) override;
 };
 
 } /* namespace hku */

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

@@ -7,13 +7,14 @@
 
 #pragma once
 
+#include <mutex>
 #include "../../BlockInfoDriver.h"
 
 namespace hku {
 
 class SQLiteBlockInfoDriver : public BlockInfoDriver {
 public:
-    SQLiteBlockInfoDriver() : BlockInfoDriver("sqlite3"){};
+    SQLiteBlockInfoDriver() : BlockInfoDriver("sqlite3") {};
     virtual ~SQLiteBlockInfoDriver();
 
     virtual void load() override;
@@ -21,9 +22,15 @@ public:
     virtual Block getBlock(const string&, const string&) override;
     virtual BlockList getBlockList(const string& category) override;
     virtual BlockList getBlockList() override;
+    virtual void save(const Block& block) override;
+    virtual void remove(const string& category, const string& name) override;
+
+private:
+    DBConnectPtr getConnect();
 
 private:
     unordered_map<string, unordered_map<string, Block>> m_buffer;
+    std::shared_mutex m_buffer_mutex;
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/Indicator.h

@@ -176,12 +176,12 @@ public:
         return m_imp;
     }
 
-    value_t* data(size_t result_num = 0) {
-        return m_imp ? m_imp->data(result_num) : nullptr;
+    value_t* data(size_t result_idx = 0) {
+        return m_imp ? m_imp->data(result_idx) : nullptr;
     }
 
-    value_t const* data(size_t result_num = 0) const {
-        return m_imp ? m_imp->data(result_num) : nullptr;
+    value_t const* data(size_t result_idx = 0) const {
+        return m_imp ? m_imp->data(result_idx) : nullptr;
     }
 
     /**

hikyuu/include/hikyuu/indicator/IndicatorImp.h

@@ -115,7 +115,8 @@ public:
     /** 返回形如：Name(param1=val,param2=val,...) */
     string long_name() const;
 
-    string formula() const;
+    virtual string formula() const;
+    virtual string str() const;
 
     bool isLeaf() const;
 
@@ -142,13 +143,15 @@ public:
     typedef std::map<string, IndicatorImpPtr> ind_param_map_t;
     const ind_param_map_t& getIndParams() const;
 
-    value_t* data(size_t result_num = 0);
-    value_t const* data(size_t result_num = 0) const;
+    value_t* data(size_t result_idx = 0);
+    value_t const* data(size_t result_idx = 0) const;
 
     // ===================
     //  子类接口
     // ===================
-    virtual void _calculate(const Indicator&) {}
+    virtual void _calculate(const Indicator&) {
+        HKU_WARN("{} will be empty always!", m_name);
+    }
 
     virtual void _dyn_run_one_step(const Indicator& ind, size_t curPos, size_t step) {}
 
@@ -391,12 +394,12 @@ inline bool IndicatorImp::haveIndParam(const string& name) const {
     return m_ind_params.find(name) != m_ind_params.end();
 }
 
-inline IndicatorImp::value_t* IndicatorImp::data(size_t result_num) {
-    return m_pBuffer[result_num] ? m_pBuffer[result_num]->data() : nullptr;
+inline IndicatorImp::value_t* IndicatorImp::data(size_t result_idx) {
+    return m_pBuffer[result_idx] ? m_pBuffer[result_idx]->data() : nullptr;
 }
 
-inline IndicatorImp::value_t const* IndicatorImp::data(size_t result_num) const {
-    return m_pBuffer[result_num] ? m_pBuffer[result_num]->data() : nullptr;
+inline IndicatorImp::value_t const* IndicatorImp::data(size_t result_idx) const {
+    return m_pBuffer[result_idx] ? m_pBuffer[result_idx]->data() : nullptr;
 }
 
 inline size_t IndicatorImp::_get_step_start(size_t pos, size_t step, size_t discard) {

hikyuu/include/hikyuu/indicator/build_in.h

@@ -28,6 +28,7 @@
 #include "crt/BETWEEN.h"
 #include "crt/BLOCKSETNUM.h"
 #include "crt/CEILING.h"
+#include "crt/CONTEXT.h"
 #include "crt/CORR.h"
 #include "crt/COS.h"
 #include "crt/COST.h"
@@ -55,6 +56,7 @@
 #include "crt/INSUM.h"
 #include "crt/IR.h"
 #include "crt/INTPART.h"
+#include "crt/ISLASTBAR.h"
 #include "crt/LAST.h"
 #include "crt/LIUTONGPAN.h"
 #include "crt/LLV.h"
@@ -107,6 +109,7 @@
 #include "crt/VAR.h"
 #include "crt/VARP.h"
 #include "crt/VIGOR.h"
+#include "crt/WMA.h"
 #include "crt/ZHBOND10.h"
 #include "crt/ZONGGUBEN.h"
 #include "crt/ZSCORE.h"

hikyuu/include/hikyuu/indicator/crt/CONTEXT.h

@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-12-28
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../Indicator.h"
+
+namespace hku {
+
+/**
+ * 独立上下文指标
+ * @ingroup Indicator
+ */
+Indicator HKU_API CONTEXT(const Indicator& ind);
+Indicator HKU_API CONTEXT();
+
+/**
+ * 获取指标上下文
+ * @note Indicator::getContext()方法获取的是当前的上下文，但对于 CONTEXT
+ * 独立上下文指标无法获取其指定的独立上下文，需用此方法获取
+ * @param ind
+ * @return KData
+ */
+KData HKU_API CONTEXT_K(const Indicator& ind);
+
+}  // namespace hku

hikyuu/include/hikyuu/indicator/crt/CORR.h

@@ -19,6 +19,6 @@ namespace hku {
  * @ingroup Indicator
  */
 Indicator HKU_API CORR(const Indicator& ind1, const Indicator& ind2, int n = 10);
-Indicator HKU_API CORR(int n = 10);
+Indicator HKU_API CORR(const Indicator& ref_ind, int n = 10);
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/crt/ISLASTBAR.h

@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-12-16
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_CRT_LASTBAR_H_
+#define INDICATOR_CRT_LASTBAR_H_
+
+#include "../Indicator.h"
+
+namespace hku {
+
+/**
+ * 判断当前数据是否为最后一个数据，若为最后一个数据，则返回1，否则返回0.
+ * @ingroup Indicator
+ */
+Indicator HKU_API ISLASTBAR();
+Indicator HKU_API ISLASTBAR(const KData& kdata);
+Indicator ISLASTBAR(const Indicator& ind);
+
+inline Indicator ISLASTBAR(const Indicator& ind) {
+    return ISLASTBAR()(ind);
+}
+
+}  // namespace hku
+
+#endif /* INDICATOR_CRT_LASTBAR_H_ */

hikyuu/include/hikyuu/indicator/crt/SPEARMAN.h

@@ -17,7 +17,7 @@ namespace hku {
  * @param n 滚动窗口(大于2 或 等于0)，等于0时，代表 n 实际使用 ind 的长度
  * @ingroup Indicator
  */
-Indicator HKU_API SPEARMAN(const Indicator& ind1, const Indicator& ind2, int n = 0);
-Indicator HKU_API SPEARMAN(int n = 0);
+Indicator HKU_API SPEARMAN(const Indicator& ind, const Indicator& ref_ind, int n = 0);
+Indicator HKU_API SPEARMAN(const Indicator& ref_ind, int n = 0);
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/crt/WMA.h

@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-12-15
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef WMA_H_
+#define WMA_H_
+
+#include "../Indicator.h"
+
+namespace hku {
+
+/**
+ * 加权移动平均
+ * 算法:Yn=(1*X1+2*X2+...+n*Xn)/(1+2+...+n)
+ * @param n 计算均值的周期窗口，n >= 1
+ * @ingroup Indicator
+ */
+Indicator HKU_API WMA(int n = 22);
+Indicator HKU_API WMA(const IndParam& n);
+
+/**
+ * 加权移动平均
+ * 算法:Yn=(1*X1+2*X2+...+n*Xn)/(1+2+...+n)
+ * @param ind 待计算的数据
+ * @param n 计算均值的周期窗口
+ * @ingroup Indicator
+ */
+inline Indicator HKU_API WMA(const Indicator& ind, int n = 22) {
+    return WMA(n)(ind);
+}
+
+inline Indicator HKU_API WMA(const Indicator& ind, const IndParam& n) {
+    return WMA(n)(ind);
+}
+
+inline Indicator WMA(const Indicator& ind, const Indicator& n) {
+    return WMA(IndParam(n))(ind);
+}
+
+}  // namespace hku
+
+#endif /* MA_H_ */

hikyuu/include/hikyuu/indicator/imp/IContext.h

@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-12-28
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../Indicator.h"
+
+namespace hku {
+
+class IContext : public IndicatorImp {
+public:
+    IContext();
+    IContext(const Indicator& ref_ind);
+    virtual ~IContext();
+
+    virtual string str() const override;
+    virtual string formula() const override;
+    virtual void _calculate(const Indicator& data) override;
+    virtual IndicatorImpPtr _clone() override;
+
+    KData getContextKdata() const;
+
+private:
+    Indicator m_ref_ind;
+
+//============================================
+// 序列化支持
+//============================================
+#if HKU_SUPPORT_SERIALIZATION
+private:
+    friend class boost::serialization::access;
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int version) {
+        ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(IndicatorImp);
+        ar& BOOST_SERIALIZATION_NVP(m_ref_ind);
+    }
+#endif
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/indicator/imp/ICorr.h

@@ -14,7 +14,6 @@ namespace hku {
 class ICorr : public IndicatorImp {
 public:
     ICorr();
-    explicit ICorr(int n);
     ICorr(const Indicator& ref_ind, int n);
     virtual ~ICorr();
 

hikyuu/include/hikyuu/indicator/imp/IIsLastBar.h

@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-12-16
+ *      Author: fasiondog
+ */
+
+#pragma once
+#ifndef INDICATOR_IMP_IISLASTBAR_H_
+#define INDICATOR_IMP_IISLASTBAR_H_
+
+#include "../Indicator.h"
+
+namespace hku {
+
+class IIsLastBar : public IndicatorImp {
+    INDICATOR_IMP(IIsLastBar)
+    INDICATOR_IMP_NO_PRIVATE_MEMBER_SERIALIZATION
+
+public:
+    IIsLastBar();
+    explicit IIsLastBar(const KData&);
+    virtual ~IIsLastBar();
+};
+
+} /* namespace hku */
+#endif /* INDICATOR_IMP_IISLASTBAR_H_ */