hikyuu 2.5.1__py3-none-win_amd64.whl → 2.5.3__py3-none-win_amd64.whl

hikyuu/data/mysql_upgrade/0027.sql

@@ -0,0 +1,6 @@
+INSERT INTO `hku_base`.`coderuletype` (`marketid`, `codepre`, `type`, `description`) 
+SELECT 2, '302', 8, '创业板'
+WHERE NOT EXISTS (
+    SELECT id FROM `hku_base`.`coderuletype` WHERE `codepre`=302
+);
+UPDATE `hku_base`.`version` set `version` = 27;

hikyuu/data/pytdx_to_h5.py

@@ -282,10 +282,13 @@ def import_one_stock_data(connect, api, h5file, market, ktype, stock_record, sta
 
         for bar in bar_list:
             try:
-                tmp = datetime.date(bar['year'], bar['month'], bar['day'])
-                bar_datetime = (tmp.year * 10000 + tmp.month * 100 + tmp.day) * 10000
-                if ktype != 'DAY':
-                    bar_datetime += bar['hour'] * 100 + bar['minute']
+                if ktype == "DAY":
+                    tmp = datetime.date(bar["year"], bar["month"], bar["day"])
+                    bar_datetime = (tmp.year * 10000 + tmp.month * 100 + tmp.day) * 10000
+                else:
+                    tmp = datetime.datetime(bar["year"], bar["month"], bar["day"], bar['hour'], bar['minute'])
+                    bar_datetime = (tmp.year * 10000 + tmp.month * 100 + tmp.day) * \
+                        10000 + bar["hour"] * 100 + bar["minute"]
             except Exception as e:
                 hku_error("Failed translate datetime: {}, from {}! {}".format(bar, api.ip, e))
                 continue

hikyuu/data/pytdx_to_mysql.py

@@ -331,10 +331,13 @@ def import_one_stock_data(
 
         for bar in bar_list:
             try:
-                tmp = datetime.date(bar["year"], bar["month"], bar["day"])
-                bar_datetime = (tmp.year * 10000 + tmp.month * 100 + tmp.day) * 10000
-                if ktype != "DAY":
-                    bar_datetime += bar["hour"] * 100 + bar["minute"]
+                if ktype == "DAY":
+                    tmp = datetime.date(bar["year"], bar["month"], bar["day"])
+                    bar_datetime = (tmp.year * 10000 + tmp.month * 100 + tmp.day) * 10000
+                else:
+                    tmp = datetime.datetime(bar["year"], bar["month"], bar["day"], bar['hour'], bar['minute'])
+                    bar_datetime = (tmp.year * 10000 + tmp.month * 100 + tmp.day) * \
+                        10000 + bar["hour"] * 100 + bar["minute"]
             except Exception as e:
                 hku_error("Failed translate datetime: {}, from {}! {}".format(bar, api.ip, e))
                 continue

hikyuu/data/sqlite_upgrade/0027.sql

@@ -0,0 +1,8 @@
+BEGIN TRANSACTION;
+INSERT INTO `CodeRuleType` (`marketid`, `codepre`, `type`, `description`) 
+SELECT 2, '302', 8, '创业板'
+WHERE NOT EXISTS (
+    SELECT id FROM `CodeRuleType` WHERE `codepre`=302
+);
+UPDATE `version` set `version` = 27;
+COMMIT;

hikyuu/draw/drawplot/__init__.py

@@ -29,7 +29,7 @@
 # 1. 20171122, Added by fasiondog
 # ===============================================================================
 
-from hikyuu.core import KData, Indicator, SignalBase, ConditionBase, EnvironmentBase, System, Portfolio
+from hikyuu.core import KData, Indicator, SignalBase, ConditionBase, EnvironmentBase, System, Portfolio, TradeManager
 
 import matplotlib
 from matplotlib.pylab import gca as mpl_gca
@@ -49,6 +49,9 @@ from .matplotlib_draw import ax_draw_macd2 as mpl_ax_draw_macd2
 from .matplotlib_draw import ax_set_locator_formatter as mpl_ax_set_locator_formatter
 from .matplotlib_draw import adjust_axes_show as mpl_adjust_axes_show
 from .matplotlib_draw import sys_performance as mpl_sys_performance
+from .matplotlib_draw import tm_heatmap as mpl_tm_heatmap
+from .matplotlib_draw import sys_heatmap as mpl_sys_heatmap
+from .matplotlib_draw import iheatmap as mpl_iheatmap
 from .matplotlib_draw import (DRAWNULL, STICKLINE, DRAWBAND, RGB, PLOYLINE,
                               DRAWLINE, DRAWTEXT, DRAWNUMBER, DRAWTEXT_FIX, DRAWNUMBER_FIX, DRAWSL,
                               DRAWIMG, DRAWICON, DRAWBMP, SHOWICONS, DRAWRECTREL)
@@ -119,6 +122,7 @@ def use_draw_with_matplotlib():
 
     Indicator.plot = mpl_iplot
     Indicator.bar = mpl_ibar
+    Indicator.heatmap = mpl_iheatmap
 
     SignalBase.plot = mpl_sgplot
 
@@ -128,6 +132,9 @@ def use_draw_with_matplotlib():
     System.plot = mpl_sysplot
     System.performance = mpl_sys_performance
     Portfolio.performance = mpl_sys_performance
+    TradeManager.heatmap = mpl_tm_heatmap
+    System.heatmap = mpl_sys_heatmap
+    Portfolio.heatmap = mpl_sys_heatmap
 
 
 def use_draw_with_echarts():

hikyuu/draw/drawplot/__init__.pyi

@@ -1,11 +1,12 @@
 from __future__ import annotations
-from hikyuu.cpp.core312 import ConditionBase
-from hikyuu.cpp.core312 import EnvironmentBase
-from hikyuu.cpp.core312 import Indicator
-from hikyuu.cpp.core312 import KData
-from hikyuu.cpp.core312 import Portfolio
-from hikyuu.cpp.core312 import SignalBase
-from hikyuu.cpp.core312 import System
+from hikyuu.cpp.core38 import ConditionBase
+from hikyuu.cpp.core38 import EnvironmentBase
+from hikyuu.cpp.core38 import Indicator
+from hikyuu.cpp.core38 import KData
+from hikyuu.cpp.core38 import Portfolio
+from hikyuu.cpp.core38 import SignalBase
+from hikyuu.cpp.core38 import System
+from hikyuu.cpp.core38 import TradeManager
 from hikyuu.draw.drawplot.bokeh_draw import ax_draw_macd as bk_ax_draw_macd
 from hikyuu.draw.drawplot.bokeh_draw import ax_draw_macd2 as bk_ax_draw_macd2
 from hikyuu.draw.drawplot.bokeh_draw import create_figure as bk_create_figure
@@ -45,13 +46,16 @@ from hikyuu.draw.drawplot.matplotlib_draw import cnplot as mpl_cnplot
 from hikyuu.draw.drawplot.matplotlib_draw import create_figure as mpl_create_figure
 from hikyuu.draw.drawplot.matplotlib_draw import evplot as mpl_evplot
 from hikyuu.draw.drawplot.matplotlib_draw import ibar as mpl_ibar
+from hikyuu.draw.drawplot.matplotlib_draw import iheatmap as mpl_iheatmap
 from hikyuu.draw.drawplot.matplotlib_draw import iplot as mpl_iplot
 from hikyuu.draw.drawplot.matplotlib_draw import kplot as mpl_kplot
 from hikyuu.draw.drawplot.matplotlib_draw import mkplot as mpl_mkplot
 from hikyuu.draw.drawplot.matplotlib_draw import set_mpl_params
 from hikyuu.draw.drawplot.matplotlib_draw import sgplot as mpl_sgplot
+from hikyuu.draw.drawplot.matplotlib_draw import sys_heatmap as mpl_sys_heatmap
 from hikyuu.draw.drawplot.matplotlib_draw import sys_performance as mpl_sys_performance
 from hikyuu.draw.drawplot.matplotlib_draw import sysplot as mpl_sysplot
+from hikyuu.draw.drawplot.matplotlib_draw import tm_heatmap as mpl_tm_heatmap
 import matplotlib as matplotlib
 from matplotlib.pyplot import gca as mpl_gca
 from matplotlib.pyplot import gcf as mpl_gcf