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

hikyuu/include/hikyuu/utilities/SpendTimer.h

@@ -34,6 +34,15 @@
 #include <TargetConditionals.h>
 #endif
 
+#ifdef _WIN32
+#include <shlwapi.h>
+#pragma comment(lib, "shlwapi.lib")  // Windows 链接时需要的库
+#define GET_FILENAME(path) PathFindFileNameA(path)
+#else
+#include <libgen.h>
+#define GET_FILENAME(path) basename((char *)path)
+#endif
+
 #ifndef HKU_CLOSE_SPEND_TIME
 #define HKU_CLOSE_SPEND_TIME 1
 #endif
@@ -81,7 +90,7 @@ namespace hku {
  * 代码执行耗时计时器
  * @param id 自定义耗时计时器id
  */
-#define SPEND_TIME(id) hku::SpendTimer test_spend_timer_##id(#id, __FILE__, __LINE__);
+#define SPEND_TIME(id) hku::SpendTimer test_spend_timer_##id(#id, GET_FILENAME(__FILE__), __LINE__);
 
 /**
  * 代码执行耗时计时器，附带输出信息
@@ -90,7 +99,7 @@ namespace hku {
  */
 #define SPEND_TIME_MSG(id, ...)                     \
     std::string msg_##id(fmt::format(__VA_ARGS__)); \
-    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), __FILE__, __LINE__);
+    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), GET_FILENAME(__FILE__), __LINE__);
 
 /** 秒表计时 */
 #define SPEND_TIME_KEEP(id, ...) test_spend_timer_##id.keep(fmt::format(__VA_ARGS__));
@@ -117,8 +126,8 @@ namespace hku {
  * @param id 自定义耗时计时器id
  * @param cycle  循环运行的次数（仅用于统计打印耗时输出）
  */
-#define BENCHMARK_TIME(id, cycle)                                   \
-    hku::SpendTimer test_spend_timer_##id(#id, __FILE__, __LINE__); \
+#define BENCHMARK_TIME(id, cycle)                                                 \
+    hku::SpendTimer test_spend_timer_##id(#id, GET_FILENAME(__FILE__), __LINE__); \
     test_spend_timer_##id.setCycle(cycle);
 
 /**
@@ -127,9 +136,10 @@ namespace hku {
  * @param cycle  循环运行的次数（仅用于统计打印耗时输出）
  * @param ... 输出信息
  */
-#define BENCHMARK_TIME_MSG(id, cycle, ...)                                            \
-    std::string msg_##id(fmt::format(__VA_ARGS__));                                   \
-    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), __FILE__, __LINE__); \
+#define BENCHMARK_TIME_MSG(id, cycle, ...)                                               \
+    std::string msg_##id(fmt::format(__VA_ARGS__));                                      \
+    hku::SpendTimer test_spend_timer_##id(#id, msg_##id.c_str(), GET_FILENAME(__FILE__), \
+                                          __LINE__);                                     \
     test_spend_timer_##id.setCycle(cycle);
 
 #endif /* HKU_CLOSE_SPEND_TIME */

hikyuu/include/hikyuu/utilities/arithmetic.h

@@ -120,6 +120,11 @@ ValueT roundEx(ValueT number, int ndigits = 0) {
         return static_cast<ValueT>(std::ceil(number * factor - 0.5 - epsilon) / factor);
 }
 
+extern template double HKU_UTILS_API roundEx(double number, int ndigits);
+
+template <>
+float HKU_UTILS_API roundEx(float number, int ndigits);
+
 /**
  * 向上截取，如10.1截取后为11
  * @param number  待处理数据
@@ -194,6 +199,11 @@ ValueT roundDown(ValueT number, int ndigits = 0) {
     return number;
 }
 
+extern template double HKU_UTILS_API roundUp(double number, int ndigits);
+extern template float HKU_UTILS_API roundUp(float number, int ndigits);
+extern template double HKU_UTILS_API roundDown(double number, int ndigits);
+extern template float HKU_UTILS_API roundDown(float number, int ndigits);
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
@@ -405,6 +415,51 @@ inline std::string byteToHexStrForPrint(const std::string &bytes) {
     return byteToHexStrForPrint(bytes.c_str(), bytes.size());
 }
 
+/** 判断 double 是否为整数 */
+bool HKU_UTILS_API isInteger(double num);
+
+/** 判断 float 是否为整数 */
+bool HKU_UTILS_API isInteger(float num);
+
+/**
+ * @brief 获取已排序的向量中指定分位数的值
+ * @param vec 已排序的数组
+ * @param quantile
+ * @return Indicator::value_t
+ */
+template <typename T>
+T get_quantile(const std::vector<T> &vec, double quantile) {
+    if (vec.empty()) {
+        return std::numeric_limits<T>::quiet_NaN();
+    }
+
+    if (quantile <= 0.0) {
+        return vec.front();
+    } else if (quantile >= 1.0) {
+        return vec.back();
+    }
+
+    T ret;
+    double qpos = vec.size() * quantile;
+    if (qpos <= 1.0) {
+        ret = vec[0];
+    } else if (isInteger(qpos)) {
+        size_t pos = static_cast<size_t>(qpos);
+        ret = (vec[pos - 1] + vec[pos]) / 2;
+    } else {
+        size_t pos = static_cast<size_t>(qpos);
+        T x = qpos - pos;
+        ret = vec[pos - 1] + x * (vec[pos] - vec[pos - 1]);
+    }
+    return ret;
+}
+
+extern template double HKU_UTILS_API get_quantile(const std::vector<double> &vec, double quantile);
+extern template float HKU_UTILS_API get_quantile(const std::vector<float> &vec, double quantile);
+
+HKU_UTILS_API std::ostream &operator<<(std::ostream &os, const std::vector<double> &p);
+HKU_UTILS_API std::ostream &operator<<(std::ostream &os, const std::vector<float> &p);
+
 /** @} */
 } /* namespace hku */
 

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

@@ -25,7 +25,7 @@ namespace hku {
 class HKU_UTILS_API MySQLConnect : public DBConnectBase {
 public:
     explicit MySQLConnect(const Parameter &param);
-    virtual ~MySQLConnect();
+    virtual ~MySQLConnect() override;
 
     MySQLConnect(const MySQLConnect &) = delete;
     MySQLConnect &operator=(const MySQLConnect &) = delete;

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

@@ -36,7 +36,7 @@ class HKU_UTILS_API MySQLStatement : public SQLStatementBase {
 public:
     MySQLStatement() = delete;
     MySQLStatement(DBConnectBase *driver, const std::string &sql_statement);
-    virtual ~MySQLStatement();
+    virtual ~MySQLStatement() override;
 
     virtual void sub_exec() override;
     virtual bool sub_moveNext() override;

hikyuu/include/hikyuu/utilities/db_connect/sqlite/SQLiteConnect.h

@@ -40,7 +40,7 @@ public:
     explicit SQLiteConnect(const Parameter &param);
 
     /** 析构函数 */
-    virtual ~SQLiteConnect();
+    virtual ~SQLiteConnect() override;
 
     /** 如果 sqlite 文件无效，返回false */
     virtual bool ping() override;

hikyuu/include/hikyuu/utilities/db_connect/sqlite/SQLiteStatement.h

@@ -31,7 +31,7 @@ public:
     SQLiteStatement(DBConnectBase *driver, const std::string &sql_statement);
 
     /** 析构函数 */
-    virtual ~SQLiteStatement();
+    virtual ~SQLiteStatement() override;
 
     virtual void sub_exec() override;
     virtual bool sub_moveNext() override;

hikyuu/include/hikyuu/utilities/plugin/PluginLoader.h

@@ -51,10 +51,13 @@ public:
 
 #if HKU_OS_WINDOWS
         m_handle = LoadLibrary(HKU_PATH(filename).c_str());
+        HKU_WARN_IF_RETURN(!m_handle, false, "load plugin({}) failed! errcode: {}", filename,
+                           GetLastError());
+
 #else
         m_handle = dlopen(filename.c_str(), RTLD_LAZY);
+        HKU_WARN_IF_RETURN(!m_handle, false, "load plugin({}) failed! {}", filename, dlerror());
 #endif
-        HKU_WARN_IF_RETURN(!m_handle, false, "load plugin({}) failed!", filename);
 
         typedef PluginBase* (*CreateFunction)();
         CreateFunction createFunction =

hikyuu/include/hikyuu/version.h

@@ -12,13 +12,13 @@
 #define HKU_VERSION_H
 
 // clang-format off
-#define HKU_VERSION "2.6.8"
+#define HKU_VERSION "2.7.0"
 #define HKU_VERSION_MAJOR 2
-#define HKU_VERSION_MINOR 6
-#define HKU_VERSION_ALTER 8
-#define HKU_VERSION_BUILD 202509100121
+#define HKU_VERSION_MINOR 7
+#define HKU_VERSION_ALTER 0
+#define HKU_VERSION_BUILD 202511020040
 #define HKU_VERSION_MODE "RELEASE"
-#define HKU_VERSION_GIT "2.6.8 master.4088326f (RELEASE)"
+#define HKU_VERSION_GIT "2.7.0 release.3d6e5754 (RELEASE)"
 // clang-format on
 
 #endif /* HKU_VERSION_H */