hikyuu 2.6.6__py3-none-win_amd64.whl → 2.6.8__py3-none-win_amd64.whl

hikyuu/draw/elder.pyi

@@ -4,15 +4,15 @@
 参见：《走进我的交易室》（2007年 地震出版社） Alexander Elder
 """
 from __future__ import annotations
-import hikyuu.cpp.core312
-from hikyuu.cpp.core312 import CVAL
-from hikyuu.cpp.core312 import EMA
-from hikyuu.cpp.core312 import Indicator
-from hikyuu.cpp.core312 import MACD
-from hikyuu.cpp.core312 import PRICELIST
-from hikyuu.cpp.core312 import Query
-from hikyuu.cpp.core312 import SAFTYLOSS
-from hikyuu.cpp.core312 import VIGOR
+import hikyuu.cpp.core313
+from hikyuu.cpp.core313 import Indicator
+from hikyuu.cpp.core313 import Query
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import CVAL
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import EMA
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import MACD
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import PRICELIST
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import SAFTYLOSS
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import VIGOR
 from hikyuu.draw.drawplot import adjust_axes_show
 from hikyuu.draw.drawplot import ax_draw_macd2
 from hikyuu.draw.drawplot import ax_set_locator_formatter
@@ -26,19 +26,18 @@ def _draw_ema_pipe(axes, kdata, ema, n = 22, w = 0.1):
 def _find_ema_coefficient(closes, emas, number = 66, percent = 0.95):
     """
     计算EMA通道系数。
-        在《走进我的交易室》中，艾尔德介绍的价格通道为：
-            通道上轨 ＝ EMA ＋ EMA＊通道系数
-            通道下轨 ＝ EMA － EMA＊通道系数
-        其中一条绘制得恰到好处的通道应能将绝大多数价格包含在内，一般调节通道系数使其能够包含95％的价格
-        参数：closes：收盘价序列
-              emas：收盘价对应的EMA序列
-              number: 以最近多少天的数据来计算，即取最后N天的数据作为计算标准
-              percent：通道包含多少的价格，如0.95表示通道将包含95%的价格
-        
+    在《走进我的交易室》中，艾尔德介绍的价格通道为：
+        通道上轨 ＝ EMA ＋ EMA＊通道系数
+        通道下轨 ＝ EMA － EMA＊通道系数
+    其中一条绘制得恰到好处的通道应能将绝大多数价格包含在内，一般调节通道系数使其能够包含95％的价格
+    参数：closes：收盘价序列
+          emas：收盘价对应的EMA序列
+          number: 以最近多少天的数据来计算，即取最后N天的数据作为计算标准
+          percent：通道包含多少的价格，如0.95表示通道将包含95%的价格
     """
 def draw(stock, query = ..., ma_n = 22, ma_w = 'auto', vigor_n = 13):
     """
     绘制亚历山大.艾尔德交易系统图形
     """
-CLOSE: hikyuu.cpp.core312.Indicator  # value = Indicator{...
-constant: hikyuu.cpp.core312.Constant  # value = <hikyuu.cpp.core312.Constant object>
+CLOSE: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+constant: hikyuu.cpp.core313.Constant  # value = <hikyuu.cpp.core313.Constant object>

hikyuu/draw/kaufman.py

@@ -83,7 +83,7 @@ def draw(
     else:
         print("sg_type only in ('CORSS', 'SINGLE')")
 
-    cer = PRICELIST(cama, 1)
+    cer = RESULT(cama, 1)
     label = "ER(%s)" % cer[-1]
     cer.plot(axes=ax2, color='b', marker='o', label=label, legend_on=False, text_on=True, kref=kdata)
 

hikyuu/draw/kaufman.pyi

@@ -4,19 +4,19 @@
 参见：《精明交易者》（2006年 广东经济出版社） 
 """
 from __future__ import annotations
-import hikyuu.cpp.core312
-from hikyuu.cpp.core312 import AMA
-from hikyuu.cpp.core312 import CVAL
-from hikyuu.cpp.core312 import EMA
-from hikyuu.cpp.core312 import POS
-from hikyuu.cpp.core312 import PRICELIST
-from hikyuu.cpp.core312 import Query
-from hikyuu.cpp.core312 import RESULT
-from hikyuu.cpp.core312 import SG_Cross
-from hikyuu.cpp.core312 import SG_Flex
-from hikyuu.cpp.core312 import SG_Single
-from hikyuu.cpp.core312 import STDEV
-from hikyuu.cpp.core312 import StockManager
+import hikyuu.cpp.core313
+from hikyuu.cpp.core313 import Query
+from hikyuu.cpp.core313 import StockManager
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import AMA
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import CVAL
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import EMA
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import POS
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import PRICELIST
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import RESULT
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import SG_Cross
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import SG_Flex
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import SG_Single
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import STDEV
 from hikyuu.draw.drawplot import adjust_axes_show
 from hikyuu.draw.drawplot import ax_draw_macd
 from hikyuu.draw.drawplot import ax_set_locator_formatter
@@ -31,8 +31,8 @@ def draw2(block, query = ..., ama1 = None, ama2 = None, n = 10, filter_n = 20, f
     """
     绘制佩里.J.考夫曼（Perry J.Kaufman） 自适应移动平均系统(AMA)
     """
-CLOSE: hikyuu.cpp.core312.Indicator  # value = Indicator{...
-HIGH: hikyuu.cpp.core312.Indicator  # value = Indicator{...
-KDATA: hikyuu.cpp.core312.Indicator  # value = Indicator{...
-LOW: hikyuu.cpp.core312.Indicator  # value = Indicator{...
-OPEN: hikyuu.cpp.core312.Indicator  # value = Indicator{...
+CLOSE: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+HIGH: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+KDATA: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+LOW: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+OPEN: hikyuu.cpp.core313.Indicator  # value = Indicator{...

hikyuu/draw/volume.pyi

@@ -3,14 +3,14 @@
 绘制普通K线图 + 成交量（成交金额）
 """
 from __future__ import annotations
-import hikyuu.cpp.core312
-from hikyuu.cpp.core312 import CVAL
-from hikyuu.cpp.core312 import IF
-from hikyuu.cpp.core312 import Indicator
-from hikyuu.cpp.core312 import MA
-from hikyuu.cpp.core312 import PRICELIST
-from hikyuu.cpp.core312 import Query
-from hikyuu.cpp.core312 import SG_Cross
+import hikyuu.cpp.core313
+from hikyuu.cpp.core313 import Indicator
+from hikyuu.cpp.core313 import Query
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import CVAL
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import IF
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import MA
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import PRICELIST
+from hikyuu.cpp.core313.pybind11_detail_function_record_v1_msvc_md_mscver19 import SG_Cross
 from hikyuu.draw.drawplot import adjust_axes_show
 from hikyuu.draw.drawplot import ax_draw_macd
 from hikyuu.draw.drawplot import ax_set_locator_formatter
@@ -27,5 +27,5 @@ def draw2(stock, query = ..., ma1_n = 7, ma2_n = 20, ma3_n = 30, ma4_n = 42, ma5
     """
     绘制普通K线图 + 成交量（成交金额）+ MACD
     """
-CLOSE: hikyuu.cpp.core312.Indicator  # value = Indicator{...
-VOL: hikyuu.cpp.core312.Indicator  # value = Indicator{...
+CLOSE: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+VOL: hikyuu.cpp.core313.Indicator  # value = Indicator{...

hikyuu/examples/notebook/000-Index.ipynb

@@ -68,7 +68,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.16"
+   "version": "3.12.7"
   }
  },
  "nbformat": 4,

hikyuu/examples/notebook/001-overview.ipynb

@@ -19,20 +19,39 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "2025-08-11 23:22:04,241 [INFO] runing in interactive session [<module>] (D:\\workspace\\hikyuu\\hikyuu\\__init__.py:109) [hikyuu::hku_info]\n",
+      "2025-08-11 23:22:04,241 [INFO] running in jupyter [<module>] (D:\\workspace\\hikyuu\\hikyuu\\__init__.py:116) [hikyuu::hku_info]\n"
+     ]
+    },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 127 μs, sys: 183 μs, total: 310 μs\n",
-      "Wall time: 312 μs\n"
+      "current plugin path: D:\\workspace\\hikyuu\\hikyuu\\plugin\n",
+      "2025-08-11 23:22:04.300 [HKU-I] - Using MYSQL BaseInfoDriver (BaseInfoDriver.cpp:57)\n",
+      "2025-08-11 23:22:04.326 [HKU-I] - 加载市场信息…… (StockManager.cpp:572)\n",
+      "2025-08-11 23:22:04.331 [HKU-I] - 加载证券类型信息…… (StockManager.cpp:590)\n",
+      "2025-08-11 23:22:04.336 [HKU-I] - 加载证券信息…… (StockManager.cpp:476)\n",
+      "2025-08-11 23:22:04.471 [HKU-I] - 加载权息数据…… (StockManager.cpp:608)\n",
+      "2025-08-11 23:22:05.420 [HKU-I] - 加载板块信息…… (StockManager.cpp:181)\n",
+      "2025-08-11 23:22:06.582 [HKU-I] - 加载K线数据…… (StockManager.cpp:185)\n",
+      "2025-08-11 23:22:06.582 [HKU-I] - 预加载 day K线数据至缓存 (最大数量: 100000)! (StockManager.cpp:229)\n",
+      "2025-08-11 23:22:06.583 [HKU-I] - 2.27 秒数据加载完毕. (StockManager.cpp:191)\n",
+      "2025-08-11 23:22:06.583 [HKU-I] - 启动行情接收. (SpotAgent.cpp:39)\n",
+      "CPU times: total: 1.62 s\n",
+      "Wall time: 3.75 s\n"
      ]
     }
    ],
    "source": [
-    "%matplotlib inline\n",
+    "#%matplotlib inline\n",
     "%time from hikyuu.interactive import *\n",
     "#use_draw_engine('echarts') #use_draw_engine('matplotlib')  #默认为'matplotlib'绘图"
    ]
@@ -47,7 +66,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -75,7 +94,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -102,7 +121,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -122,7 +141,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -134,57 +153,53 @@
       "累计投入资产: 0.00\n",
       "累计借入现金: 0.00\n",
       "累计借入资产: 0.00\n",
-      "累计红利: 0.00\n",
-      "现金余额: 287880.00\n",
-      "未平仓头寸净值: 11460.00\n",
-      "当前总资产: 299340.00\n",
+      "累计红利: 362.00\n",
+      "现金余额: 301532.00\n",
+      "未平仓头寸净值: 0.00\n",
+      "当前总资产: 301532.00\n",
       "已平仓交易总成本: 0.00\n",
-      "已平仓净利润总额: -1050.00\n",
-      "单笔交易最大占用现金比例%: 3.98\n",
+      "已平仓净利润总额: 1532.00\n",
+      "单笔交易最大占用现金比例%: 4.14\n",
       "交易平均占用现金比例%: 3.84\n",
-      "已平仓帐户收益率%: -0.35\n",
-      "帐户年复合收益率%: -0.39\n",
-      "帐户平均年收益率%: -0.39\n",
-      "赢利交易赢利总额: 130.00\n",
-      "亏损交易亏损总额: -1180.00\n",
-      "已平仓交易总数: 7.00\n",
-      "赢利交易数: 1.00\n",
-      "亏损交易数: 6.00\n",
-      "赢利交易比例%: 14.29\n",
-      "赢利期望值: -150.00\n",
-      "赢利交易平均赢利: 130.00\n",
-      "亏损交易平均亏损: -196.67\n",
-      "平均赢利/平均亏损比例: 0.66\n",
-      "净赢利/亏损比例: 0.11\n",
-      "最大单笔赢利: 130.00\n",
-      "最大单笔盈利百分比%: 1.14\n",
-      "最大单笔亏损: -470.00\n",
-      "最大单笔亏损百分比%: -4.00\n",
-      "赢利交易平均持仓时间: 16.00\n",
-      "赢利交易最大持仓时间: 16.00\n",
-      "亏损交易平均持仓时间: 9.67\n",
-      "亏损交易最大持仓时间: 28.00\n",
-      "空仓总时间: 130.00\n",
-      "空仓时间/总时间%: 63.00\n",
-      "平均空仓时间: 18.00\n",
-      "最长空仓时间: 38.00\n",
+      "已平仓帐户收益率%: 0.51\n",
+      "帐户年复合收益率%: 1.03\n",
+      "帐户平均年收益率%: 1.02\n",
+      "赢利交易赢利总额: 1882.00\n",
+      "亏损交易亏损总额: -350.00\n",
+      "已平仓交易总数: 6.00\n",
+      "赢利交易数: 2.00\n",
+      "亏损交易数: 4.00\n",
+      "赢利交易比例%: 33.33\n",
+      "赢利期望值: 255.33\n",
+      "赢利交易平均赢利: 941.00\n",
+      "亏损交易平均亏损: -87.50\n",
+      "平均赢利/平均亏损比例: 10.75\n",
+      "净赢利/亏损比例: 5.38\n",
+      "最大单笔赢利: 1752.00\n",
+      "最大单笔盈利百分比%: 15.83\n",
+      "最大单笔亏损: -210.00\n",
+      "最大单笔亏损百分比%: -1.80\n",
+      "赢利交易平均持仓时间: 45.50\n",
+      "赢利交易最大持仓时间: 75.00\n",
+      "亏损交易平均持仓时间: 5.50\n",
+      "亏损交易最大持仓时间: 13.00\n",
+      "空仓总时间: 69.00\n",
+      "空仓时间/总时间%: 37.00\n",
+      "平均空仓时间: 11.00\n",
+      "最长空仓时间: 32.00\n",
       "最大连续赢利笔数: 1.00\n",
-      "最大连续亏损笔数: 3.00\n",
-      "最大连续赢利金额: 130.00\n",
-      "最大连续亏损金额: -910.00\n",
-      "R乘数期望值: -0.01\n",
-      "交易机会频率/年: 12.52\n",
-      "年度期望R乘数: -0.13\n",
-      "赢利交易平均R乘数: 0.01\n",
-      "亏损交易平均R乘数: -0.02\n",
-      "最大单笔赢利R乘数: 0.01\n",
-      "最大单笔亏损R乘数: -0.04\n",
-      "最大连续赢利R乘数: 0.01\n",
+      "最大连续亏损笔数: 1.00\n",
+      "最大连续赢利金额: 1752.00\n",
+      "最大连续亏损金额: -270.00\n",
+      "R乘数期望值: 0.02\n",
+      "交易机会频率/年: 12.03\n",
+      "年度期望R乘数: 0.24\n",
+      "赢利交易平均R乘数: 0.09\n",
+      "亏损交易平均R乘数: -0.01\n",
+      "最大单笔赢利R乘数: 0.16\n",
+      "最大单笔亏损R乘数: -0.02\n",
+      "最大连续赢利R乘数: 0.16\n",
       "最大连续亏损R乘数: -0.03\n",
-      "最大回撤百分比: -0.28\n",
-      "夏普比率: -1.59\n",
-      "单笔交易盈亏百分比均值: -1.27\n",
-      "单笔交易盈亏百分比标准差: 1.96\n",
       "\n"
      ]
     }
@@ -209,7 +224,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -251,24 +266,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 1.51 s, sys: 76.2 ms, total: 1.59 s\n",
-      "Wall time: 1.12 s\n"
+      "CPU times: total: 5.75 s\n",
+      "Wall time: 13.2 s\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "6790"
+       "6902"
       ]
      },
-     "execution_count": 15,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -288,7 +303,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "base",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -302,7 +317,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.7"
+   "version": "3.12.9"
   }
  },
  "nbformat": 4,