hikyuu 2.6.7__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.core39
-from hikyuu.cpp.core39 import Indicator
-from hikyuu.cpp.core39 import Query
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import CVAL
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import EMA
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import MACD
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import PRICELIST
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SAFTYLOSS
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 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.core39.Indicator  # value = Indicator{...
-constant: hikyuu.cpp.core39.Constant  # value = <hikyuu.cpp.core39.Constant object>
+CLOSE: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+constant: hikyuu.cpp.core313.Constant  # value = <hikyuu.cpp.core313.Constant object>

hikyuu/draw/kaufman.pyi

@@ -4,19 +4,19 @@
 参见：《精明交易者》（2006年 广东经济出版社） 
 """
 from __future__ import annotations
-import hikyuu.cpp.core39
-from hikyuu.cpp.core39 import Query
-from hikyuu.cpp.core39 import StockManager
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import AMA
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import CVAL
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import EMA
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import POS
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import PRICELIST
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import RESULT
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SG_Cross
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SG_Flex
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import SG_Single
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import STDEV
+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.core39.Indicator  # value = Indicator{...
-HIGH: hikyuu.cpp.core39.Indicator  # value = Indicator{...
-KDATA: hikyuu.cpp.core39.Indicator  # value = Indicator{...
-LOW: hikyuu.cpp.core39.Indicator  # value = Indicator{...
-OPEN: hikyuu.cpp.core39.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.core39
-from hikyuu.cpp.core39 import Indicator
-from hikyuu.cpp.core39 import Query
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import CVAL
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import IF
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import MA
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 import PRICELIST
-from hikyuu.cpp.core39.pybind11_detail_function_record_v1_msvc_md_mscver19 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.core39.Indicator  # value = Indicator{...
-VOL: hikyuu.cpp.core39.Indicator  # value = Indicator{...
+CLOSE: hikyuu.cpp.core313.Indicator  # value = Indicator{...
+VOL: hikyuu.cpp.core313.Indicator  # value = Indicator{...

hikyuu/extend.py

@@ -223,22 +223,41 @@ def DatetimeList_to_df(data: DatetimeList):
 
 DatetimeList.to_np = DatetimeList_to_np
 DatetimeList.to_df = DatetimeList_to_df
+DatetimeList.to_numpy = DatetimeList.to_np
+DatetimeList.to_pandas = DatetimeList.to_df
+DatetimeList.to_pyarrow = lambda data: dates_to_pa(data)
 
 
 TimeLineList.to_np = lambda data: timeline_to_np(data)
 TimeLineList.to_df = lambda data: timeline_to_df(data)
+TimeLineList.to_numpy = TimeLineList.to_np
+TimeLineList.to_pandas = TimeLineList.to_df
+TimeLineList.to_pyarrow = lambda data: timeline_to_pa(data)
 
 
 TransList.to_np = lambda data: translist_to_np(data)
 TransList.to_df = lambda data: translist_to_df(data)
+TransList.to_numpy = TransList.to_np
+TransList.to_pandas = TransList.to_df
+TransList.to_pyarrow = lambda data: translist_to_pa(data)
 
 
 StockWeightList.to_np = lambda data: weights_to_np(data)
 StockWeightList.to_df = lambda data: weights_to_df(data)
+StockWeightList.to_numpy = StockWeightList.to_np
+StockWeightList.to_pandas = StockWeightList.to_df
+StockWeightList.to_pyarrow = lambda data: weights_to_pa(data)
 
 
 KRecordList.to_np = lambda data: krecords_to_np(data)
 KRecordList.to_df = lambda data: krecords_to_df(data)
+KRecordList.to_numpy = KRecordList.to_np
+KRecordList.to_pandas = KRecordList.to_df
+KRecordList.to_pyarrow = lambda data: krecords_to_pa(data)
+
+KData.to_numpy = KData.to_np
+KData.to_pandas = KData.to_df
+
 
 # ------------------------------------------------------------------
 # 增强 Parameter