hikyuu 2.5.1__py3-none-win_amd64.whl → 2.5.3__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.core38
+from hikyuu.cpp.core38 import CVAL
+from hikyuu.cpp.core38 import EMA
+from hikyuu.cpp.core38 import Indicator
+from hikyuu.cpp.core38 import MACD
+from hikyuu.cpp.core38 import PRICELIST
+from hikyuu.cpp.core38 import Query
+from hikyuu.cpp.core38 import SAFTYLOSS
+from hikyuu.cpp.core38 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
@@ -40,5 +40,5 @@ 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.core38.Indicator  # value = Indicator{...
+constant: hikyuu.cpp.core38.Constant  # value = <hikyuu.cpp.core38.Constant object>

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 BUSINESS
-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 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.core38
+from hikyuu.cpp.core38 import AMA
+from hikyuu.cpp.core38 import BUSINESS
+from hikyuu.cpp.core38 import CVAL
+from hikyuu.cpp.core38 import EMA
+from hikyuu.cpp.core38 import POS
+from hikyuu.cpp.core38 import PRICELIST
+from hikyuu.cpp.core38 import Query
+from hikyuu.cpp.core38 import SG_Cross
+from hikyuu.cpp.core38 import SG_Flex
+from hikyuu.cpp.core38 import SG_Single
+from hikyuu.cpp.core38 import STDEV
+from hikyuu.cpp.core38 import StockManager
 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.core38.Indicator  # value = Indicator{...
+HIGH: hikyuu.cpp.core38.Indicator  # value = Indicator{...
+KDATA: hikyuu.cpp.core38.Indicator  # value = Indicator{...
+LOW: hikyuu.cpp.core38.Indicator  # value = Indicator{...
+OPEN: hikyuu.cpp.core38.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.core38
+from hikyuu.cpp.core38 import CVAL
+from hikyuu.cpp.core38 import IF
+from hikyuu.cpp.core38 import Indicator
+from hikyuu.cpp.core38 import MA
+from hikyuu.cpp.core38 import PRICELIST
+from hikyuu.cpp.core38 import Query
+from hikyuu.cpp.core38 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.core38.Indicator  # value = Indicator{...
+VOL: hikyuu.cpp.core38.Indicator  # value = Indicator{...

hikyuu/extend.py

@@ -186,32 +186,8 @@ def KData_iter(kdata):
         yield kdata[i]
 
 
-def KData_getPos(kdata, datetime):
-    """
-    获取指定时间对应的索引位置
-
-    :param Datetime datetime: 指定的时间
-    :return: 对应的索引位置，如果不在数据范围内，则返回 None
-    """
-    pos = kdata._getPos(datetime)
-    return pos if pos != constant.null_size else None
-
-
-def KData_getPosInStock(kdata, datetime):
-    """
-    获取指定时间对应的原始K线中的索引位置
-
-    :param Datetime datetime: 指定的时间
-    :return: 对应的索引位置，如果不在数据范围内，则返回 None
-    """
-    pos = kdata._getPosInStock(datetime)
-    return pos if pos != constant.null_size else None
-
-
 KData.__getitem__ = KData_getitem
 KData.__iter__ = KData_iter
-KData.get_pos = KData_getPos
-KData.get_pos_in_stock = KData_getPosInStock
 
 
 # ------------------------------------------------------------------