hikyuu 2.2.3__py3-none-win_amd64.whl → 2.2.4__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()
@@ -711,6 +712,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 +806,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 +827,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(1131, 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, 31), QtCore.QTime(0, 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, 31), QtCore.QTime(0, 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: 本地仓库名称（自行起名）
@@ -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/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/trade_manage/OrderBrokerBase.h

@@ -147,8 +147,33 @@ public:
 
 protected:
     string m_name;
+
+//============================================
+// 序列化支持
+//============================================
+#if HKU_SUPPORT_SERIALIZATION
+private:
+    friend class boost::serialization::access;
+    template <class Archive>
+    void save(Archive& ar, const unsigned int version) const {
+        ar& BOOST_SERIALIZATION_NVP(m_name);
+        ar& BOOST_SERIALIZATION_NVP(m_params);
+    }
+
+    template <class Archive>
+    void load(Archive& ar, const unsigned int version) {
+        ar& BOOST_SERIALIZATION_NVP(m_name);
+        ar& BOOST_SERIALIZATION_NVP(m_params);
+    }
+
+    BOOST_SERIALIZATION_SPLIT_MEMBER()
+#endif /* HKU_SUPPORT_SERIALIZATION */
 };
 
+#if HKU_SUPPORT_SERIALIZATION
+BOOST_SERIALIZATION_ASSUME_ABSTRACT(OrderBrokerBase)
+#endif
+
 /**
  * 客户程序应使用此类型进行实际操作
  * @ingroup OrderBroker

hikyuu/include/hikyuu/trade_manage/TradeManagerBase.h

@@ -737,10 +737,6 @@ private:
 #endif /* HKU_SUPPORT_SERIALIZATION */
 };
 
-#if HKU_SUPPORT_SERIALIZATION
-BOOST_SERIALIZATION_ASSUME_ABSTRACT(TradeManagerBase)
-#endif
-
 inline void TradeManagerBase::baseCheckParam(const string& name) const {
     if ("precision" == name) {
         int precision = getParam<int>("precision");

hikyuu/include/hikyuu/trade_sys/selector/imp/optimal/PerformanceOptimalSelector.h

@@ -22,7 +22,7 @@ public:
     virtual void _checkParam(const string& name) const override;
     virtual void calculate(const SystemList& pf_realSysList, const KQuery& query) override;
 
-    virtual SystemWeightList getSelected(Datetime date);
+    virtual SystemWeightList getSelected(Datetime date) override;
     virtual SelectorPtr _clone() override;
     virtual void _reset() override;
 

hikyuu/include/hikyuu/utilities/Parameter.h

@@ -463,7 +463,7 @@ void Parameter::set(const string& name, const ValueType& value) {
         return;
     }
 
-    if (m_params[name].type() != typeid(ValueType)) {
+    if (strcmp(m_params[name].type().name(), typeid(ValueType).name()) != 0) {
         if ((m_params[name].type() == typeid(int) || m_params[name].type() == typeid(int64_t)) &&
             (typeid(ValueType) == typeid(int) || typeid(ValueType) == typeid(int64_t))) {
             // 忽略，允许设定
@@ -494,7 +494,7 @@ inline void Parameter::set(const string& name, const boost::any& value) {
         return;
     }
 
-    if (m_params[name].type() != value.type()) {
+    if (strcmp(m_params[name].type().name(), value.type().name()) != 0) {
         throw std::logic_error("Mismatching type! need type " +
                                string(m_params[name].type().name()) + " but value type is " +
                                string(value.type().name()));

hikyuu/include/hikyuu/utilities/db_connect/mysql/MySQLStatement.h

@@ -60,6 +60,7 @@ public:
     virtual void sub_getColumnAsBlob(int idx, std::vector<char> &item) override;
 
 private:
+    void _prepare(DBConnectBase *driver);
     void _reset();
     void _bindResult();
 

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.2.3"
+#define HKU_VERSION "2.2.4"
 #define HKU_VERSION_MAJOR 2
 #define HKU_VERSION_MINOR 2
-#define HKU_VERSION_ALTER 3
-#define HKU_VERSION_BUILD 202411031222
+#define HKU_VERSION_ALTER 4
+#define HKU_VERSION_BUILD 202412082122
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.2.3 master.a225e17f (RELEASE)"
+#define HKU_VERSION_GIT "2.2.4 master.2fafc6fb (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */

hikyuu/test/Datetime.py

@@ -2,10 +2,10 @@
 # -*- coding: utf8 -*-
 # cp936
 
-#===============================================================================
+# ===============================================================================
 # 作者：fasiondog
 # 历史：1）20120927, Added by fasiondog
-#===============================================================================
+# ===============================================================================
 
 import unittest
 
@@ -24,16 +24,16 @@ class DatetimeTest(unittest.TestCase):
         self.assertEqual(Datetime(140001010000), Datetime.min())
         self.assertEqual(Datetime(999912310000), Datetime.max())
 
-        self.assert_(d == Datetime(201209272301))
-        self.assert_(d != Datetime(200101010000))
-        self.assert_(d >= Datetime(201209272301))
-        self.assert_(d >= Datetime(201209272259))
-        self.assert_(d <= Datetime(201209272301))
-        self.assert_(d <= Datetime(201209272302))
-        self.assert_(not (d > Datetime(201209272301)))
-        self.assert_(d > Datetime(201209272259))
-        self.assert_(not (d < Datetime(201209272301)))
-        self.assert_(d < Datetime(201209272302))
+        self.assertEqual(d, Datetime(201209272301))
+        self.assertNotEqual(d, Datetime(200101010000))
+        self.assertGreaterEqual(d, Datetime(201209272301))
+        self.assertTrue(d >= Datetime(201209272259))
+        self.assertTrue(d <= Datetime(201209272301))
+        self.assertTrue(d <= Datetime(201209272302))
+        self.assertTrue(not (d > Datetime(201209272301)))
+        self.assertTrue(d > Datetime(201209272259))
+        self.assertTrue(not (d < Datetime(201209272301)))
+        self.assertTrue(d < Datetime(201209272302))
 
         d = Datetime(200101010159)
         self.assertEqual(str(d), "2001-01-01 01:59:00")

hikyuu/test/Indicator.py

@@ -48,10 +48,10 @@ class IndicatorTest(unittest.TestCase):
         self.assertEqual(m.name, "AddIndicator")
         self.assertEqual(len(m), 4)
         self.assertEqual(m.empty(), False)
-        self.assert_(abs(m[0] - 1) < 0.0001)
-        self.assert_(abs(m[1] - 2) < 0.0001)
-        self.assert_(abs(m[2] - 3) < 0.0001)
-        self.assert_(abs(m[3] - 4) < 0.0001)
+        self.assertTrue(abs(m[0] - 1) < 0.0001)
+        self.assertTrue(abs(m[1] - 2) < 0.0001)
+        self.assertTrue(abs(m[2] - 3) < 0.0001)
+        self.assertTrue(abs(m[3] - 4) < 0.0001)
 
         b = toPriceList([1, 2, 3, 4])
         x = PRICELIST(b)
@@ -59,10 +59,10 @@ class IndicatorTest(unittest.TestCase):
         m = m(x)
         self.assertEqual(len(m), 4)
         self.assertEqual(m.empty(), False)
-        self.assert_(abs(m[0] - 2) < 0.0001)
-        self.assert_(abs(m[1] - 3) < 0.0001)
-        self.assert_(abs(m[2] - 4) < 0.0001)
-        self.assert_(abs(m[3] - 5) < 0.0001)
+        self.assertTrue(abs(m[0] - 2) < 0.0001)
+        self.assertTrue(abs(m[1] - 3) < 0.0001)
+        self.assertTrue(abs(m[2] - 4) < 0.0001)
+        self.assertTrue(abs(m[3] - 5) < 0.0001)
 
     def test_operator(self):
         a = toPriceList([0, 1, 2, 3, 5])
@@ -76,16 +76,16 @@ class IndicatorTest(unittest.TestCase):
         self.assertEqual(a[3], 7)
 
         a = x1 + 1.1
-        self.assert_(abs(a[0] - 1.1) < 0.0001)
-        self.assert_(abs(a[1] - 2.1) < 0.0001)
-        self.assert_(abs(a[2] - 3.1) < 0.0001)
-        self.assert_(abs(a[3] - 4.1) < 0.0001)
+        self.assertTrue(abs(a[0] - 1.1) < 0.0001)
+        self.assertTrue(abs(a[1] - 2.1) < 0.0001)
+        self.assertTrue(abs(a[2] - 3.1) < 0.0001)
+        self.assertTrue(abs(a[3] - 4.1) < 0.0001)
 
         a = 2.1 + x1
-        self.assert_(abs(a[0] - 2.1) < 0.0001)
-        self.assert_(abs(a[1] - 3.1) < 0.0001)
-        self.assert_(abs(a[2] - 4.1) < 0.0001)
-        self.assert_(abs(a[3] - 5.1) < 0.0001)
+        self.assertTrue(abs(a[0] - 2.1) < 0.0001)
+        self.assertTrue(abs(a[1] - 3.1) < 0.0001)
+        self.assertTrue(abs(a[2] - 4.1) < 0.0001)
+        self.assertTrue(abs(a[3] - 5.1) < 0.0001)
 
         a = x2 - x1
         self.assertEqual(a[0], 1)
@@ -124,10 +124,10 @@ class IndicatorTest(unittest.TestCase):
         self.assertEqual(a[3], 6)
 
         a = x2 / x1
-        self.assert_(isinf(a[0]))
+        self.assertTrue(isinf(a[0]))
         self.assertEqual(a[1], 2)
         self.assertEqual(a[2], 1.5)
-        self.assert_(abs(a[3] - 4.0 / 3.0) < 0.0001)
+        self.assertTrue(abs(a[3] - 4.0 / 3.0) < 0.0001)
 
         a = x1 / 0.5
         self.assertEqual(a[0], 0)
@@ -136,10 +136,10 @@ class IndicatorTest(unittest.TestCase):
         self.assertEqual(a[3], 6)
 
         a = 2. / x1
-        self.assert_(isinf(a[0]))
+        self.assertTrue(isinf(a[0]))
         self.assertEqual(a[1], 2.0)
         self.assertEqual(a[2], 1.)
-        self.assert_(abs(a[3] - 2.0/3.0) < 0.0001)
+        self.assertTrue(abs(a[3] - 2.0/3.0) < 0.0001)
 
         a = x1 > x2
         self.assertEqual(a[0], 0 > 1)
@@ -180,19 +180,19 @@ class IndicatorTest(unittest.TestCase):
         self.assertEqual(a.empty(), False)
         self.assertEqual(v.empty(), False)
 
-        self.assert_(abs(o[0] - 96.05) < 0.0001)
-        self.assert_(abs(h[0] - 99.98) < 0.0001)
-        self.assert_(abs(l[0] - 95.79) < 0.0001)
-        self.assert_(abs(c[0] - 99.98) < 0.0001)
-        self.assert_(abs(a[0] - 49.4) < 0.0001)
-        self.assert_(abs(v[0] - 1260) < 0.0001)
+        self.assertTrue(abs(o[0] - 96.05) < 0.0001)
+        self.assertTrue(abs(h[0] - 99.98) < 0.0001)
+        self.assertTrue(abs(l[0] - 95.79) < 0.0001)
+        self.assertTrue(abs(c[0] - 99.98) < 0.0001)
+        self.assertTrue(abs(a[0] - 49.4) < 0.0001)
+        self.assertTrue(abs(v[0] - 1260) < 0.0001)
 
-        self.assert_(abs(o[1] - 104.3) < 0.0001)
-        self.assert_(abs(h[1] - 104.39) < 0.0001)
-        self.assert_(abs(l[1] - 99.98) < 0.0001)
-        self.assert_(abs(c[1] - 104.39) < 0.0001)
-        self.assert_(abs(a[1] - 8.4) < 0.0001)
-        self.assert_(abs(v[1] - 197) < 0.0001)
+        self.assertTrue(abs(o[1] - 104.3) < 0.0001)
+        self.assertTrue(abs(h[1] - 104.39) < 0.0001)
+        self.assertTrue(abs(l[1] - 99.98) < 0.0001)
+        self.assertTrue(abs(c[1] - 104.39) < 0.0001)
+        self.assertTrue(abs(a[1] - 8.4) < 0.0001)
+        self.assertTrue(abs(v[1] - 197) < 0.0001)
 
     def test_MA(self):
         a = toPriceList([0, 1, 2, 3])
@@ -200,10 +200,10 @@ class IndicatorTest(unittest.TestCase):
         m = MA(x, 2)
         self.assertEqual(len(m), 4)
         self.assertEqual(m.discard, 0)
-        self.assert_(abs(m[0] - 0.0) < 0.0001)
-        self.assert_(abs(m[1] - 0.5) < 0.0001)
-        self.assert_(abs(m[2] - 1.5) < 0.0001)
-        self.assert_(abs(m[3] - 2.5) < 0.0001)
+        self.assertTrue(abs(m[0] - 0.0) < 0.0001)
+        self.assertTrue(abs(m[1] - 0.5) < 0.0001)
+        self.assertTrue(abs(m[2] - 1.5) < 0.0001)
+        self.assertTrue(abs(m[3] - 2.5) < 0.0001)
 
     def test_pickle(self):
         if not constant.pickle_support:

hikyuu/test/KData.py

@@ -2,10 +2,10 @@
 # -*- coding: utf8 -*-
 # gb18030
 
-#===============================================================================
+# ===============================================================================
 # 作者：fasiondog
 # 历史：1）20130220, Added by fasiondog
-#===============================================================================
+# ===============================================================================
 
 import unittest
 
@@ -33,14 +33,14 @@ class KDataTest(unittest.TestCase):
         self.assertEqual(k.end_pos, 10)
         self.assertEqual(k.last_pos, 9)
         self.assertEqual(k[0].datetime, Datetime(199012190000))
-        self.assert_(abs(k[0].open - 96.05) < 0.0001)
-        self.assert_(abs(k[0].high - 99.980) < 0.0001)
-        self.assert_(abs(k[0].low - 95.79) < 0.0001)
-        self.assert_(abs(k[0].close - 99.98) < 0.0001)
-        self.assert_(abs(k[0].amount - 49.4) < 0.0001)
-        self.assert_(abs(k[0].volume - 1260) < 0.0001)
-        self.assert_(abs(k[1].open - 104.3) < 0.0001)
-        self.assert_(abs(k[9].open - 127.61) < 0.0001)
+        self.assertTrue(abs(k[0].open - 96.05) < 0.0001)
+        self.assertTrue(abs(k[0].high - 99.980) < 0.0001)
+        self.assertTrue(abs(k[0].low - 95.79) < 0.0001)
+        self.assertTrue(abs(k[0].close - 99.98) < 0.0001)
+        self.assertTrue(abs(k[0].amount - 49.4) < 0.0001)
+        self.assertTrue(abs(k[0].volume - 1260) < 0.0001)
+        self.assertTrue(abs(k[1].open - 104.3) < 0.0001)
+        self.assertTrue(abs(k[9].open - 127.61) < 0.0001)
 
     def test_pickle(self):
         if not constant.pickle_support:
@@ -61,4 +61,4 @@ class KDataTest(unittest.TestCase):
 
 
 def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(KDataTest)
+    return unittest.TestLoader().loadTestsFromTestCase(KDataTest)