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

hikyuu/extend.py

@@ -13,6 +13,9 @@ from datetime import datetime, timedelta, date  # NOQA: E402
 import numpy as np  # NOQA: E402
 import pandas as pd  # NOQA: E402
 
+# 解决中文对齐问题
+pd.set_option('display.unicode.ambiguous_as_wide', True)
+pd.set_option('display.unicode.east_asian_width', True)
 
 # ------------------------------------------------------------------
 # 增加Datetime、Stock的hash支持，以便可做为dict的key
@@ -152,43 +155,6 @@ TimeDelta.__add__ = __new_TimeDelta_add__
 TimeDelta.__sub__ = __new_TimeDelta_sub__
 TimeDelta.timedelta = TimeDelta_timedelta
 
-# ------------------------------------------------------------------
-# 增强 KData 的遍历
-# ------------------------------------------------------------------
-
-
-def KData_getitem(kdata, i):
-    """
-    :param i: int | Datetime | slice | str 类型
-    """
-    if isinstance(i, int):
-        length = len(kdata)
-        index = length + i if i < 0 else i
-        if index < 0 or index >= length:
-            raise IndexError("index out of range: %d" % i)
-        return kdata.get(index)
-
-    elif isinstance(i, Datetime):
-        return kdata.get_by_datetime(i)
-
-    elif isinstance(i, str):
-        return kdata.get_by_datetime(Datetime(i))
-
-    elif isinstance(i, slice):
-        return [kdata.get(x) for x in range(*i.indices(len(kdata)))]
-
-    else:
-        raise IndexError("Error index type")
-
-
-def KData_iter(kdata):
-    for i in range(len(kdata)):
-        yield kdata[i]
-
-
-KData.__getitem__ = KData_getitem
-KData.__iter__ = KData_iter
-
 
 # ------------------------------------------------------------------
 # 重定义Query
@@ -247,83 +213,32 @@ Query.__init__ = new_Query_init
 # ------------------------------------------------------------------
 # 增加转化为 np.array、pandas.DataFrame 的功能
 # ------------------------------------------------------------------
-def KData_to_np(kdata):
-    """转化为numpy结构数组"""
-    if kdata.get_query().ktype in ('DAY', 'WEEK', 'MONTH', 'QUARTER', 'HALFYEAR', 'YEAR'):
-        k_type = np.dtype(
-            {
-                'names': ['datetime', 'open', 'high', 'low', 'close', 'amount', 'volume'],
-                'formats': ['datetime64[D]', 'd', 'd', 'd', 'd', 'd', 'd']
-            }
-        )
-    else:
-        k_type = np.dtype(
-            {
-                'names': ['datetime', 'open', 'high', 'low', 'close', 'amount', 'volume'],
-                'formats': ['datetime64[ms]', 'd', 'd', 'd', 'd', 'd', 'd']
-            }
-        )
-    return np.array(
-        [(k.datetime.datetime(), k.open, k.high, k.low, k.close, k.amount, k.volume) for k in kdata], dtype=k_type
-    )
-
-
-def KData_to_df(kdata):
-    """转化为pandas的DataFrame"""
-    return pd.DataFrame.from_records(KData_to_np(kdata), index='datetime')
-
-
-KData.to_np = KData_to_np
-KData.to_df = KData_to_df
+def DatetimeList_to_np(data: DatetimeList):
+    return dates_to_np(data)
 
 
-def DatetimeList_to_np(data):
-    """仅在安装了numpy模块时生效，转换为numpy.array"""
-    return np.array(data, dtype='datetime64[D]')
-
-
-def DatetimeList_to_df(data):
-    """仅在安装了pandas模块时生效，转换为pandas.DataFrame"""
-    return pd.DataFrame(data.to_np(), columns=('Datetime', ))
+def DatetimeList_to_df(data: DatetimeList):
+    return pd.DataFrame.from_records(dates_to_np(data))
 
 
 DatetimeList.to_np = DatetimeList_to_np
 DatetimeList.to_df = DatetimeList_to_df
 
 
-def TimeLine_to_np(data):
-    """转化为numpy结构数组"""
-    t_type = np.dtype({'names': ['datetime', 'price', 'vol'], 'formats': ['datetime64[ms]', 'd', 'd']})
-    return np.array([(t.date.datetime(), t.price, t.vol) for t in data], dtype=t_type)
-
-
-def TimeLine_to_df(kdata):
-    """转化为pandas的DataFrame"""
-    return pd.DataFrame.from_records(TimeLine_to_np(kdata), index='datetime')
+TimeLineList.to_np = lambda data: timeline_to_np(data)
+TimeLineList.to_df = lambda data: timeline_to_df(data)
 
 
-TimeLineList.to_np = TimeLine_to_np
-TimeLineList.to_df = TimeLine_to_df
-
-
-def TransList_to_np(data):
-    """转化为numpy结构数组"""
-    t_type = np.dtype(
-        {
-            'names': ['datetime', 'price', 'vol', 'direct'],
-            'formats': ['datetime64[ms]', 'd', 'd', 'd']
-        }
-    )
-    return np.array([(t.date.datetime(), t.price, t.vol, t.direct) for t in data], dtype=t_type)
+TransList.to_np = lambda data: translist_to_np(data)
+TransList.to_df = lambda data: translist_to_df(data)
 
 
-def TransList_to_df(kdata):
-    """转化为pandas的DataFrame"""
-    return pd.DataFrame.from_records(TransList_to_np(kdata), index='datetime')
+StockWeightList.to_np = lambda data: weights_to_np(data)
+StockWeightList.to_df = lambda data: weights_to_df(data)
 
 
-TransList.to_np = TransList_to_np
-TransList.to_df = TransList_to_df
+KRecordList.to_np = lambda data: krecords_to_np(data)
+KRecordList.to_df = lambda data: krecords_to_df(data)
 
 # ------------------------------------------------------------------
 # 增强 Parameter