hikyuu 2.6.2__py3-none-win_amd64.whl → 2.6.5__py3-none-win_amd64.whl

hikyuu/data/sqlite_upgrade/0028.sql

@@ -0,0 +1,97 @@
+BEGIN TRANSACTION;
+DELETE FROM holiday;
+INSERT INTO holiday (`id`, `date`) VALUES (1, 20210101);
+INSERT INTO holiday (`id`, `date`) VALUES (2, 20210211);
+INSERT INTO holiday (`id`, `date`) VALUES (3, 20210212);
+INSERT INTO holiday (`id`, `date`) VALUES (4, 20210215);
+INSERT INTO holiday (`id`, `date`) VALUES (5, 20210216);
+INSERT INTO holiday (`id`, `date`) VALUES (6, 20210217);
+INSERT INTO holiday (`id`, `date`) VALUES (7, 20210405);
+INSERT INTO holiday (`id`, `date`) VALUES (8, 20210501);
+INSERT INTO holiday (`id`, `date`) VALUES (9, 20210503);
+INSERT INTO holiday (`id`, `date`) VALUES (10, 20210504);
+INSERT INTO holiday (`id`, `date`) VALUES (11, 20210505);
+INSERT INTO holiday (`id`, `date`) VALUES (12, 20210614);
+INSERT INTO holiday (`id`, `date`) VALUES (13, 20210920);
+INSERT INTO holiday (`id`, `date`) VALUES (14, 20210921);
+INSERT INTO holiday (`id`, `date`) VALUES (15, 20211001);
+INSERT INTO holiday (`id`, `date`) VALUES (16, 20211004);
+INSERT INTO holiday (`id`, `date`) VALUES (17, 20211005);
+INSERT INTO holiday (`id`, `date`) VALUES (18, 20211006);
+INSERT INTO holiday (`id`, `date`) VALUES (19, 20211007);
+INSERT INTO holiday (`id`, `date`) VALUES (20, 20220103);
+INSERT INTO holiday (`id`, `date`) VALUES (21, 20220131);
+INSERT INTO holiday (`id`, `date`) VALUES (22, 20220201);
+INSERT INTO holiday (`id`, `date`) VALUES (23, 20220202);
+INSERT INTO holiday (`id`, `date`) VALUES (24, 20220203);
+INSERT INTO holiday (`id`, `date`) VALUES (25, 20220204);
+INSERT INTO holiday (`id`, `date`) VALUES (26, 20220205);
+INSERT INTO holiday (`id`, `date`) VALUES (27, 20220404);
+INSERT INTO holiday (`id`, `date`) VALUES (28, 20220405);
+INSERT INTO holiday (`id`, `date`) VALUES (29, 20220502);
+INSERT INTO holiday (`id`, `date`) VALUES (30, 20220503);
+INSERT INTO holiday (`id`, `date`) VALUES (31, 20220504);
+INSERT INTO holiday (`id`, `date`) VALUES (32, 20220603);
+INSERT INTO holiday (`id`, `date`) VALUES (33, 20220912);
+INSERT INTO holiday (`id`, `date`) VALUES (34, 20221003);
+INSERT INTO holiday (`id`, `date`) VALUES (35, 20221004);
+INSERT INTO holiday (`id`, `date`) VALUES (36, 20221005);
+INSERT INTO holiday (`id`, `date`) VALUES (37, 20221006);
+INSERT INTO holiday (`id`, `date`) VALUES (38, 20221007);
+INSERT INTO holiday (`id`, `date`) VALUES (39, 20230102);
+INSERT INTO holiday (`id`, `date`) VALUES (40, 20230123);
+INSERT INTO holiday (`id`, `date`) VALUES (41, 20230124);
+INSERT INTO holiday (`id`, `date`) VALUES (42, 20230125);
+INSERT INTO holiday (`id`, `date`) VALUES (43, 20230126);
+INSERT INTO holiday (`id`, `date`) VALUES (44, 20230127);
+INSERT INTO holiday (`id`, `date`) VALUES (45, 20230405);
+INSERT INTO holiday (`id`, `date`) VALUES (46, 20230501);
+INSERT INTO holiday (`id`, `date`) VALUES (47, 20230502);
+INSERT INTO holiday (`id`, `date`) VALUES (48, 20230503);
+INSERT INTO holiday (`id`, `date`) VALUES (49, 20230622);
+INSERT INTO holiday (`id`, `date`) VALUES (50, 20230623);
+INSERT INTO holiday (`id`, `date`) VALUES (51, 20230929);
+INSERT INTO holiday (`id`, `date`) VALUES (52, 20231002);
+INSERT INTO holiday (`id`, `date`) VALUES (53, 20231003);
+INSERT INTO holiday (`id`, `date`) VALUES (54, 20231004);
+INSERT INTO holiday (`id`, `date`) VALUES (55, 20231005);
+INSERT INTO holiday (`id`, `date`) VALUES (56, 20231006);
+INSERT INTO holiday (`id`, `date`) VALUES (57, 20240101);
+INSERT INTO holiday (`id`, `date`) VALUES (58, 20240212);
+INSERT INTO holiday (`id`, `date`) VALUES (59, 20240213);
+INSERT INTO holiday (`id`, `date`) VALUES (60, 20240214);
+INSERT INTO holiday (`id`, `date`) VALUES (61, 20240215);
+INSERT INTO holiday (`id`, `date`) VALUES (62, 20240216);
+INSERT INTO holiday (`id`, `date`) VALUES (63, 20240404);
+INSERT INTO holiday (`id`, `date`) VALUES (64, 20240405);
+INSERT INTO holiday (`id`, `date`) VALUES (65, 20240501);
+INSERT INTO holiday (`id`, `date`) VALUES (66, 20240502);
+INSERT INTO holiday (`id`, `date`) VALUES (67, 20240503);
+INSERT INTO holiday (`id`, `date`) VALUES (68, 20240610);
+INSERT INTO holiday (`id`, `date`) VALUES (69, 20240916);
+INSERT INTO holiday (`id`, `date`) VALUES (70, 20240917);
+INSERT INTO holiday (`id`, `date`) VALUES (71, 20241001);
+INSERT INTO holiday (`id`, `date`) VALUES (72, 20241002);
+INSERT INTO holiday (`id`, `date`) VALUES (73, 20241003);
+INSERT INTO holiday (`id`, `date`) VALUES (74, 20241004);
+INSERT INTO holiday (`id`, `date`) VALUES (75, 20241007);
+INSERT INTO holiday (`id`, `date`) VALUES (76, 20250101);
+INSERT INTO holiday (`id`, `date`) VALUES (77, 20250128);
+INSERT INTO holiday (`id`, `date`) VALUES (78, 20250129);
+INSERT INTO holiday (`id`, `date`) VALUES (79, 20250130);
+INSERT INTO holiday (`id`, `date`) VALUES (80, 20250131);
+INSERT INTO holiday (`id`, `date`) VALUES (81, 20250203);
+INSERT INTO holiday (`id`, `date`) VALUES (82, 20250204);
+INSERT INTO holiday (`id`, `date`) VALUES (83, 20250404);
+INSERT INTO holiday (`id`, `date`) VALUES (84, 20250501);
+INSERT INTO holiday (`id`, `date`) VALUES (85, 20250502);
+INSERT INTO holiday (`id`, `date`) VALUES (86, 20250505);
+INSERT INTO holiday (`id`, `date`) VALUES (87, 20250602);
+INSERT INTO holiday (`id`, `date`) VALUES (88, 20251001);
+INSERT INTO holiday (`id`, `date`) VALUES (89, 20251002);
+INSERT INTO holiday (`id`, `date`) VALUES (90, 20251003);
+INSERT INTO holiday (`id`, `date`) VALUES (91, 20251006);
+INSERT INTO holiday (`id`, `date`) VALUES (92, 20251007);
+INSERT INTO holiday (`id`, `date`) VALUES (93, 20251008);
+UPDATE `version` set `version` = 28;
+COMMIT;

hikyuu/draw/__init__.pyi

@@ -9,8 +9,8 @@ from hikyuu.draw.drawplot import gcf
 from hikyuu.draw.drawplot import get_current_draw_engine
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWBAND
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWICON
-from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG as DRAWBMP
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG as DRAWBMP
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWLINE
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER_FIX

hikyuu/draw/drawplot/__init__.pyi

@@ -25,8 +25,8 @@ from hikyuu.draw.drawplot.echarts_draw import sys_performance as ec_sys_performa
 from hikyuu.draw.drawplot.echarts_draw import sysplot as ec_sysplot
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWBAND
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWICON
-from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG as DRAWBMP
+from hikyuu.draw.drawplot.matplotlib_draw import DRAWIMG
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWLINE
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER
 from hikyuu.draw.drawplot.matplotlib_draw import DRAWNUMBER_FIX

hikyuu/draw/drawplot/bokeh_draw.pyi

@@ -15,10 +15,7 @@ from bokeh.models.tools import HoverTool
 from bokeh.plotting._figure import figure
 from datetime import date
 from datetime import datetime
-from datetime import time
 from datetime import timedelta
-from datetime import timezone
-from datetime import tzinfo
 from hikyuu import analysis
 from hikyuu.analysis.analysis import analysis_sys_list
 from hikyuu.analysis.analysis import analysis_sys_list_multi
@@ -45,6 +42,7 @@ from hikyuu.cpp.core39 import AllocateFundsBase
 from hikyuu.cpp.core39 import BACKSET
 from hikyuu.cpp.core39 import BARSCOUNT
 from hikyuu.cpp.core39 import BARSLAST
+from hikyuu.cpp.core39 import BARSLASTCOUNT
 from hikyuu.cpp.core39 import BARSSINCE
 from hikyuu.cpp.core39 import BARSSINCEN
 from hikyuu.cpp.core39 import BETWEEN
@@ -139,8 +137,8 @@ from hikyuu.cpp.core39 import KDataToHdf5Importer
 from hikyuu.cpp.core39 import KRecord
 from hikyuu.cpp.core39 import KRecordList
 from hikyuu.cpp.core39 import LAST
-from hikyuu.cpp.core39 import LASTVALUE
 from hikyuu.cpp.core39 import LASTVALUE as CONST
+from hikyuu.cpp.core39 import LASTVALUE
 from hikyuu.cpp.core39 import LIUTONGPAN as CAPITAL
 from hikyuu.cpp.core39 import LIUTONGPAN
 from hikyuu.cpp.core39 import LLV
@@ -197,6 +195,7 @@ from hikyuu.cpp.core39 import PositionRecord
 from hikyuu.cpp.core39 import PositionRecordList
 from hikyuu.cpp.core39 import ProfitGoalBase
 from hikyuu.cpp.core39 import Query
+from hikyuu.cpp.core39 import RANK
 from hikyuu.cpp.core39 import RECOVER_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_FORWARD
@@ -214,6 +213,7 @@ from hikyuu.cpp.core39 import ROUNDDOWN
 from hikyuu.cpp.core39 import ROUNDUP
 from hikyuu.cpp.core39 import RSI
 from hikyuu.cpp.core39 import SAFTYLOSS
+from hikyuu.cpp.core39 import SE_EvaluateOptimal
 from hikyuu.cpp.core39 import SE_Fixed
 from hikyuu.cpp.core39 import SE_MaxFundsOptimal
 from hikyuu.cpp.core39 import SE_MultiFactor
@@ -246,8 +246,8 @@ from hikyuu.cpp.core39 import SPEARMAN
 from hikyuu.cpp.core39 import SP_FixedPercent
 from hikyuu.cpp.core39 import SP_FixedValue
 from hikyuu.cpp.core39 import SQRT
-from hikyuu.cpp.core39 import STDEV as STD
 from hikyuu.cpp.core39 import STDEV
+from hikyuu.cpp.core39 import STDEV as STD
 from hikyuu.cpp.core39 import STDP
 from hikyuu.cpp.core39 import ST_FixedPercent
 from hikyuu.cpp.core39 import ST_Indicator
@@ -458,12 +458,28 @@ from hikyuu.cpp.core39 import TradeRequest
 from hikyuu.cpp.core39 import TransList
 from hikyuu.cpp.core39 import TransRecord
 from hikyuu.cpp.core39 import UPNDAY
+from hikyuu.cpp.core39 import UTCOffset
 from hikyuu.cpp.core39 import VAR
 from hikyuu.cpp.core39 import VARP
 from hikyuu.cpp.core39 import VIGOR
 from hikyuu.cpp.core39 import WEAVE
 from hikyuu.cpp.core39 import WEEK
 from hikyuu.cpp.core39 import WINNER
+from hikyuu.cpp.core39 import WITHDAY
+from hikyuu.cpp.core39 import WITHHALFYEAR
+from hikyuu.cpp.core39 import WITHHOUR
+from hikyuu.cpp.core39 import WITHHOUR2
+from hikyuu.cpp.core39 import WITHHOUR4
+from hikyuu.cpp.core39 import WITHKTYPE
+from hikyuu.cpp.core39 import WITHMIN
+from hikyuu.cpp.core39 import WITHMIN15
+from hikyuu.cpp.core39 import WITHMIN30
+from hikyuu.cpp.core39 import WITHMIN5
+from hikyuu.cpp.core39 import WITHMIN60
+from hikyuu.cpp.core39 import WITHMONTH
+from hikyuu.cpp.core39 import WITHQUARTER
+from hikyuu.cpp.core39 import WITHWEEK
+from hikyuu.cpp.core39 import WITHYEAR
 from hikyuu.cpp.core39 import WMA
 from hikyuu.cpp.core39 import YEAR
 from hikyuu.cpp.core39 import ZHBOND10
@@ -503,6 +519,7 @@ from hikyuu.cpp.core39 import hikyuu_init
 from hikyuu.cpp.core39 import inner_analysis_sys_list
 from hikyuu.cpp.core39 import inner_combinate_ind_analysis
 from hikyuu.cpp.core39 import inner_combinate_ind_analysis_with_block
+from hikyuu.cpp.core39 import is_valid_license
 from hikyuu.cpp.core39 import isinf
 from hikyuu.cpp.core39 import isnan
 from hikyuu.cpp.core39 import open_ostream_to_python
@@ -609,8 +626,8 @@ from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
 from hikyuu.util.mylog import hku_debug
 from hikyuu.util.mylog import hku_debug as hku_trace
-from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
+from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_error
 from hikyuu.util.mylog import hku_error_if
 from hikyuu.util.mylog import hku_fatal
@@ -634,7 +651,7 @@ from pathlib import Path
 import pickle as pickle
 import sys as sys
 import traceback as traceback
-__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'ALIGN', 'AMA', 'AMO', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSSINCE', 'BARSSINCEN', 'BASE_DIR', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CAPITAL', 'CEILING', 'CLOSE', 'CN_Bool', 'CN_OPLine', 'CONST', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ColumnDataSource', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DIRECT', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'DatetimeTickFormatter', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EasyTraderOrderBroker', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'HHV', 'HHVBARS', 'HIGH', 'HKUCheckError', 'HKUException', 'HOUR', 'HSL', 'Hours', 'HoverTool', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'KALMAN', 'KDATA', 'KDATA_PART', 'KDJ', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KData_getitem', 'KData_iter', 'KData_to_df', 'KData_to_np', 'KRecord', 'KRecordList', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LOW', 'Label', 'LoanRecord', 'LoggingContext', 'MA', 'MACD', 'MAX', 'MAXYEAR', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MINYEAR', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MailOrderBroker', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'NDAY', 'NOT', 'OFF', 'OPEN', 'OrderBrokerBase', 'OrderBrokerWrap', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Path', 'Performance', 'Performance_to_df', 'Portfolio', 'PositionList_to_df', 'PositionList_to_np', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'Query', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STD', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'ScoreRecord', 'ScoreRecordList', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TestOrderBroker', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TimeLine_to_df', 'TimeLine_to_np', 'Title', 'TradeCostBase', 'TradeList_to_df', 'TradeList_to_np', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransList_to_df', 'TransList_to_np', 'TransRecord', 'UPNDAY', 'VALUE', 'VAR', 'VARP', 'VIGOR', 'VOL', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'add_class_logger_handler', 'add_local_hub', 'add_remote_hub', 'analysis', 'analysis_sys_list', 'analysis_sys_list_multi', 'ax_draw_macd', 'ax_draw_macd2', 'ax_fill_between', 'ax_set_xlim', 'ax_set_ylim', 'backtest', 'batch_calculate_inds', 'broker', 'broker_easytrader', 'broker_mail', 'build_hub', 'can_upgrade', 'capture_multiprocess_all_logger', 'class_logger', 'close_ostream_to_python', 'close_spend_time', 'column', 'combinate_ind', 'combinate_ind_analysis', 'combinate_ind_analysis_multi', 'combinate_index', 'concat_to_df', 'constant', 'core', 'cpp', 'create_figure', 'create_one_axes_figure', 'create_three_axes_figure', 'create_two_axes_figure', 'crtAF', 'crtBrokerTM', 'crtCN', 'crtEV', 'crtMF', 'crtMM', 'crtOB', 'crtPG', 'crtSE', 'crtSEOptimal', 'crtSG', 'crtSP', 'crtST', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'current_path', 'date', 'datetime', 'df_to_ind', 'dll_directory', 'extend', 'fetch_trial_license', 'figure', 'find_optimal_system', 'find_optimal_system_multi', 'g_axes', 'g_figure', 'g_use_in_notbook', 'gca', 'gcf', 'get_block', 'get_business_name', 'get_color', 'get_current_hub', 'get_data_from_buffer_server', 'get_date_format', 'get_date_range', 'get_hub_name_list', 'get_hub_path', 'get_kdata', 'get_last_version', 'get_log_level', 'get_part', 'get_part_info', 'get_part_list', 'get_part_module', 'get_part_name_list', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'help_part', 'hikyuu_init', 'hku_benchmark', 'hku_catch', 'hku_check', 'hku_check_ignore', 'hku_check_throw', 'hku_debug', 'hku_debug_if', 'hku_error', 'hku_error_if', 'hku_fatal', 'hku_fatal_if', 'hku_info', 'hku_info_if', 'hku_logger', 'hku_to_async', 'hku_trace', 'hku_trace_if', 'hku_warn', 'hku_warn_if', 'hub', 'ibar', 'in_interactive_session', 'in_ipython_frontend', 'indicator', 'indicator_getitem', 'indicator_iter', 'indicator_to_df', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'iplot', 'isinf', 'isnan', 'kplot', 'list_getitem', 'mkplot', 'new_Query_init', 'new_path', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'os', 'output_file', 'output_notebook', 'part_clone', 'part_init', 'part_iter', 'pd', 'pickle', 'print_part_info', 'pyind', 'remove_hub', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'search_part', 'set_log_level', 'set_my_logger_file', 'set_python_in_interactive', 'set_python_in_jupyter', 'sgplot', 'show', 'show_gcf', 'spend_time', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'talib_wrap', 'time', 'timedelta', 'timeout', 'timezone', 'toPriceList', 'traceback', 'trade', 'trade_manage', 'trade_sys', 'trans_color', 'tzinfo', 'update_hub', 'use_bokeh_in_notebook', 'util', 'view_license', 'with_trace']
+__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'ALIGN', 'AMA', 'AMO', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSLASTCOUNT', 'BARSSINCE', 'BARSSINCEN', 'BASE_DIR', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CAPITAL', 'CEILING', 'CLOSE', 'CN_Bool', 'CN_OPLine', 'CONST', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ColumnDataSource', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DIRECT', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'DatetimeTickFormatter', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EasyTraderOrderBroker', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'HHV', 'HHVBARS', 'HIGH', 'HKUCheckError', 'HKUException', 'HOUR', 'HSL', 'Hours', 'HoverTool', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'KALMAN', 'KDATA', 'KDATA_PART', 'KDJ', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KData_getitem', 'KData_iter', 'KData_to_df', 'KData_to_np', 'KRecord', 'KRecordList', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LOW', 'Label', 'LoanRecord', 'LoggingContext', 'MA', 'MACD', 'MAX', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MailOrderBroker', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'NDAY', 'NOT', 'OFF', 'OPEN', 'OrderBrokerBase', 'OrderBrokerWrap', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Path', 'Performance', 'Performance_to_df', 'Portfolio', 'PositionList_to_df', 'PositionList_to_np', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'Query', 'RANK', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SE_EvaluateOptimal', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STD', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'ScoreRecord', 'ScoreRecordList', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TestOrderBroker', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TimeLine_to_df', 'TimeLine_to_np', 'Title', 'TradeCostBase', 'TradeList_to_df', 'TradeList_to_np', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransList_to_df', 'TransList_to_np', 'TransRecord', 'UPNDAY', 'UTCOffset', 'VALUE', 'VAR', 'VARP', 'VIGOR', 'VOL', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WITHDAY', 'WITHHALFYEAR', 'WITHHOUR', 'WITHHOUR2', 'WITHHOUR4', 'WITHKTYPE', 'WITHMIN', 'WITHMIN15', 'WITHMIN30', 'WITHMIN5', 'WITHMIN60', 'WITHMONTH', 'WITHQUARTER', 'WITHWEEK', 'WITHYEAR', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'add_class_logger_handler', 'add_local_hub', 'add_remote_hub', 'analysis', 'analysis_sys_list', 'analysis_sys_list_multi', 'ax_draw_macd', 'ax_draw_macd2', 'ax_fill_between', 'ax_set_xlim', 'ax_set_ylim', 'backtest', 'batch_calculate_inds', 'broker', 'broker_easytrader', 'broker_mail', 'build_hub', 'can_upgrade', 'capture_multiprocess_all_logger', 'class_logger', 'close_ostream_to_python', 'close_spend_time', 'column', 'combinate_ind', 'combinate_ind_analysis', 'combinate_ind_analysis_multi', 'combinate_index', 'concat_to_df', 'constant', 'core', 'cpp', 'create_figure', 'create_one_axes_figure', 'create_three_axes_figure', 'create_two_axes_figure', 'crtAF', 'crtBrokerTM', 'crtCN', 'crtEV', 'crtMF', 'crtMM', 'crtOB', 'crtPG', 'crtSE', 'crtSEOptimal', 'crtSG', 'crtSP', 'crtST', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'current_path', 'date', 'datetime', 'df_to_ind', 'dll_directory', 'extend', 'fetch_trial_license', 'figure', 'find_optimal_system', 'find_optimal_system_multi', 'g_axes', 'g_figure', 'g_use_in_notbook', 'gca', 'gcf', 'get_block', 'get_business_name', 'get_color', 'get_current_hub', 'get_data_from_buffer_server', 'get_date_format', 'get_date_range', 'get_hub_name_list', 'get_hub_path', 'get_kdata', 'get_last_version', 'get_log_level', 'get_part', 'get_part_info', 'get_part_list', 'get_part_module', 'get_part_name_list', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'help_part', 'hikyuu_init', 'hku_benchmark', 'hku_catch', 'hku_check', 'hku_check_ignore', 'hku_check_throw', 'hku_debug', 'hku_debug_if', 'hku_error', 'hku_error_if', 'hku_fatal', 'hku_fatal_if', 'hku_info', 'hku_info_if', 'hku_logger', 'hku_to_async', 'hku_trace', 'hku_trace_if', 'hku_warn', 'hku_warn_if', 'hub', 'ibar', 'in_interactive_session', 'in_ipython_frontend', 'indicator', 'indicator_getitem', 'indicator_iter', 'indicator_to_df', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'iplot', 'is_valid_license', 'isinf', 'isnan', 'kplot', 'list_getitem', 'mkplot', 'new_Query_init', 'new_path', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'os', 'output_file', 'output_notebook', 'part_clone', 'part_init', 'part_iter', 'pd', 'pickle', 'print_part_info', 'pyind', 'remove_hub', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'search_part', 'set_log_level', 'set_my_logger_file', 'set_python_in_interactive', 'set_python_in_jupyter', 'sgplot', 'show', 'show_gcf', 'spend_time', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'talib_wrap', 'timedelta', 'timeout', 'toPriceList', 'traceback', 'trade', 'trade_manage', 'trade_sys', 'trans_color', 'update_hub', 'use_bokeh_in_notebook', 'util', 'view_license', 'with_trace']
 def ax_draw_macd(axes, kdata, n1 = 12, n2 = 26, n3 = 9):
     """
     绘制MACD
@@ -807,8 +824,6 @@ HIGH: hikyuu.cpp.core39.Indicator  # value = Indicator{...
 INFO: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.INFO: 2>
 KDATA: hikyuu.cpp.core39.Indicator  # value = Indicator{...
 LOW: hikyuu.cpp.core39.Indicator  # value = Indicator{...
-MAXYEAR: int = 9999
-MINYEAR: int = 1
 OFF: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.OFF: 6>
 OPEN: hikyuu.cpp.core39.Indicator  # value = Indicator{...
 TRACE: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.TRACE: 0>

hikyuu/draw/drawplot/echarts_draw.pyi

@@ -1,10 +1,7 @@
 from __future__ import annotations
 from datetime import date
 from datetime import datetime
-from datetime import time
 from datetime import timedelta
-from datetime import timezone
-from datetime import tzinfo
 from functools import wraps
 from hikyuu import analysis
 from hikyuu.analysis.analysis import analysis_sys_list
@@ -32,6 +29,7 @@ from hikyuu.cpp.core39 import AllocateFundsBase
 from hikyuu.cpp.core39 import BACKSET
 from hikyuu.cpp.core39 import BARSCOUNT
 from hikyuu.cpp.core39 import BARSLAST
+from hikyuu.cpp.core39 import BARSLASTCOUNT
 from hikyuu.cpp.core39 import BARSSINCE
 from hikyuu.cpp.core39 import BARSSINCEN
 from hikyuu.cpp.core39 import BETWEEN
@@ -126,8 +124,8 @@ from hikyuu.cpp.core39 import KDataToHdf5Importer
 from hikyuu.cpp.core39 import KRecord
 from hikyuu.cpp.core39 import KRecordList
 from hikyuu.cpp.core39 import LAST
-from hikyuu.cpp.core39 import LASTVALUE
 from hikyuu.cpp.core39 import LASTVALUE as CONST
+from hikyuu.cpp.core39 import LASTVALUE
 from hikyuu.cpp.core39 import LIUTONGPAN as CAPITAL
 from hikyuu.cpp.core39 import LIUTONGPAN
 from hikyuu.cpp.core39 import LLV
@@ -184,6 +182,7 @@ from hikyuu.cpp.core39 import PositionRecord
 from hikyuu.cpp.core39 import PositionRecordList
 from hikyuu.cpp.core39 import ProfitGoalBase
 from hikyuu.cpp.core39 import Query
+from hikyuu.cpp.core39 import RANK
 from hikyuu.cpp.core39 import RECOVER_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_BACKWARD
 from hikyuu.cpp.core39 import RECOVER_EQUAL_FORWARD
@@ -201,6 +200,7 @@ from hikyuu.cpp.core39 import ROUNDDOWN
 from hikyuu.cpp.core39 import ROUNDUP
 from hikyuu.cpp.core39 import RSI
 from hikyuu.cpp.core39 import SAFTYLOSS
+from hikyuu.cpp.core39 import SE_EvaluateOptimal
 from hikyuu.cpp.core39 import SE_Fixed
 from hikyuu.cpp.core39 import SE_MaxFundsOptimal
 from hikyuu.cpp.core39 import SE_MultiFactor
@@ -233,8 +233,8 @@ from hikyuu.cpp.core39 import SPEARMAN
 from hikyuu.cpp.core39 import SP_FixedPercent
 from hikyuu.cpp.core39 import SP_FixedValue
 from hikyuu.cpp.core39 import SQRT
-from hikyuu.cpp.core39 import STDEV as STD
 from hikyuu.cpp.core39 import STDEV
+from hikyuu.cpp.core39 import STDEV as STD
 from hikyuu.cpp.core39 import STDP
 from hikyuu.cpp.core39 import ST_FixedPercent
 from hikyuu.cpp.core39 import ST_Indicator
@@ -445,12 +445,28 @@ from hikyuu.cpp.core39 import TradeRequest
 from hikyuu.cpp.core39 import TransList
 from hikyuu.cpp.core39 import TransRecord
 from hikyuu.cpp.core39 import UPNDAY
+from hikyuu.cpp.core39 import UTCOffset
 from hikyuu.cpp.core39 import VAR
 from hikyuu.cpp.core39 import VARP
 from hikyuu.cpp.core39 import VIGOR
 from hikyuu.cpp.core39 import WEAVE
 from hikyuu.cpp.core39 import WEEK
 from hikyuu.cpp.core39 import WINNER
+from hikyuu.cpp.core39 import WITHDAY
+from hikyuu.cpp.core39 import WITHHALFYEAR
+from hikyuu.cpp.core39 import WITHHOUR
+from hikyuu.cpp.core39 import WITHHOUR2
+from hikyuu.cpp.core39 import WITHHOUR4
+from hikyuu.cpp.core39 import WITHKTYPE
+from hikyuu.cpp.core39 import WITHMIN
+from hikyuu.cpp.core39 import WITHMIN15
+from hikyuu.cpp.core39 import WITHMIN30
+from hikyuu.cpp.core39 import WITHMIN5
+from hikyuu.cpp.core39 import WITHMIN60
+from hikyuu.cpp.core39 import WITHMONTH
+from hikyuu.cpp.core39 import WITHQUARTER
+from hikyuu.cpp.core39 import WITHWEEK
+from hikyuu.cpp.core39 import WITHYEAR
 from hikyuu.cpp.core39 import WMA
 from hikyuu.cpp.core39 import YEAR
 from hikyuu.cpp.core39 import ZHBOND10
@@ -490,6 +506,7 @@ from hikyuu.cpp.core39 import hikyuu_init
 from hikyuu.cpp.core39 import inner_analysis_sys_list
 from hikyuu.cpp.core39 import inner_combinate_ind_analysis
 from hikyuu.cpp.core39 import inner_combinate_ind_analysis_with_block
+from hikyuu.cpp.core39 import is_valid_license
 from hikyuu.cpp.core39 import isinf
 from hikyuu.cpp.core39 import isnan
 from hikyuu.cpp.core39 import open_ostream_to_python
@@ -597,8 +614,8 @@ from hikyuu.util.mylog import class_logger
 from hikyuu.util.mylog import hku_benchmark
 from hikyuu.util.mylog import hku_debug
 from hikyuu.util.mylog import hku_debug as hku_trace
-from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_debug_if
+from hikyuu.util.mylog import hku_debug_if as hku_trace_if
 from hikyuu.util.mylog import hku_error
 from hikyuu.util.mylog import hku_error_if
 from hikyuu.util.mylog import hku_fatal
@@ -633,7 +650,7 @@ from pyecharts import options as opts
 import pyecharts.options.global_options
 import sys as sys
 import traceback as traceback
-__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'ALIGN', 'AMA', 'AMO', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSSINCE', 'BARSSINCEN', 'BASE_DIR', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Bar', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CAPITAL', 'CEILING', 'CLOSE', 'CN_Bool', 'CN_OPLine', 'CONST', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ChartBase', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DIRECT', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EasyTraderOrderBroker', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'Grid', 'HHV', 'HHVBARS', 'HIGH', 'HKUCheckError', 'HKUException', 'HOUR', 'HSL', 'Hours', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'JsCode', 'KALMAN', 'KDATA', 'KDATA_PART', 'KDJ', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KData_getitem', 'KData_iter', 'KData_to_df', 'KData_to_np', 'KRecord', 'KRecordList', 'Kline', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LOW', 'Line', 'LoanRecord', 'LoggingContext', 'MA', 'MACD', 'MAX', 'MAXYEAR', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MINYEAR', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MailOrderBroker', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'MultiLineTextChart', 'NDAY', 'NOT', 'OFF', 'OPEN', 'OrderBrokerBase', 'OrderBrokerWrap', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Page', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Path', 'Performance', 'Performance_to_df', 'Portfolio', 'PositionList_to_df', 'PositionList_to_np', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'Query', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STD', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'Scatter', 'ScoreRecord', 'ScoreRecordList', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TestOrderBroker', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TimeLine_to_df', 'TimeLine_to_np', 'TradeCostBase', 'TradeList_to_df', 'TradeList_to_np', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransList_to_df', 'TransList_to_np', 'TransRecord', 'UPNDAY', 'VALUE', 'VAR', 'VARP', 'VIGOR', 'VOL', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'add_class_logger_handler', 'add_local_hub', 'add_remote_hub', 'analysis', 'analysis_sys_list', 'analysis_sys_list_multi', 'backtest', 'batch_calculate_inds', 'broker', 'broker_easytrader', 'broker_mail', 'build_hub', 'can_upgrade', 'capture_multiprocess_all_logger', 'class_logger', 'close_ostream_to_python', 'close_spend_time', 'combinate_ind', 'combinate_ind_analysis', 'combinate_ind_analysis_multi', 'combinate_index', 'concat_to_df', 'constant', 'core', 'cpp', 'crtAF', 'crtBrokerTM', 'crtCN', 'crtEV', 'crtMF', 'crtMM', 'crtOB', 'crtPG', 'crtSE', 'crtSEOptimal', 'crtSG', 'crtSP', 'crtST', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'current_path', 'date', 'datetime', 'df_to_ind', 'dll_directory', 'extend', 'fetch_trial_license', 'find_optimal_system', 'find_optimal_system_multi', 'get_block', 'get_business_name', 'get_current_hub', 'get_data_from_buffer_server', 'get_date_range', 'get_draw_title', 'get_hub_name_list', 'get_hub_path', 'get_kdata', 'get_last_version', 'get_log_level', 'get_part', 'get_part_info', 'get_part_list', 'get_part_module', 'get_part_name_list', 'get_series_name', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'grid_pos', 'help_part', 'hikyuu_init', 'hku_benchmark', 'hku_catch', 'hku_check', 'hku_check_ignore', 'hku_check_throw', 'hku_debug', 'hku_debug_if', 'hku_error', 'hku_error_if', 'hku_fatal', 'hku_fatal_if', 'hku_info', 'hku_info_if', 'hku_logger', 'hku_to_async', 'hku_trace', 'hku_trace_if', 'hku_warn', 'hku_warn_if', 'hub', 'ibar', 'in_interactive_session', 'in_ipython_frontend', 'indicator', 'indicator_getitem', 'indicator_iter', 'indicator_to_df', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'iplot', 'isinf', 'isnan', 'kplot', 'kplot_line', 'list_getitem', 'new_Query_init', 'new_path', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'opts', 'os', 'part_clone', 'part_init', 'part_iter', 'pd', 'pickle', 'print_part_info', 'pyind', 'remove_hub', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'search_part', 'set_log_level', 'set_my_logger_file', 'set_python_in_interactive', 'set_python_in_jupyter', 'simple_datetime_list', 'spend_time', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'sys_performance', 'sysplot', 'talib_wrap', 'time', 'timedelta', 'timeout', 'timezone', 'toPriceList', 'traceback', 'trade', 'trade_manage', 'trade_sys', 'tzinfo', 'update_hub', 'util', 'view_license', 'volume_barplot', 'with_trace', 'wraps']
+__all__ = ['ABS', 'ACOS', 'AD', 'ADVANCE', 'AF_EqualWeight', 'AF_FixedWeight', 'AF_FixedWeightList', 'AF_MultiFactor', 'ALIGN', 'AMA', 'AMO', 'ASIN', 'ATAN', 'ATR', 'AVEDEV', 'AllocateFundsBase', 'BACKSET', 'BARSCOUNT', 'BARSLAST', 'BARSLASTCOUNT', 'BARSSINCE', 'BARSSINCEN', 'BASE_DIR', 'BETWEEN', 'BLOCKSETNUM', 'BUSINESS', 'Bar', 'Block', 'BlockInfoDriver', 'BorrowRecord', 'BrokerPositionRecord', 'CAPITAL', 'CEILING', 'CLOSE', 'CN_Bool', 'CN_OPLine', 'CONST', 'CONTEXT', 'CONTEXT_K', 'CORR', 'COS', 'COST', 'COUNT', 'CROSS', 'CVAL', 'CYCLE', 'C_AMO', 'C_CLOSE', 'C_HIGH', 'C_KDATA', 'C_LOW', 'C_OPEN', 'C_VOL', 'ChartBase', 'ConditionBase', 'Constant', 'CostRecord', 'DATE', 'DAY', 'DEBUG', 'DECLINE', 'DEVSQ', 'DIFF', 'DIRECT', 'DISCARD', 'DMA', 'DOWNNDAY', 'DROPNA', 'DataDriverFactory', 'Datetime', 'DatetimeList', 'DatetimeList_to_df', 'DatetimeList_to_np', 'Datetime_date', 'Datetime_datetime', 'Days', 'EMA', 'ERROR', 'EVERY', 'EV_Bool', 'EV_TwoLine', 'EXIST', 'EXP', 'EasyTraderOrderBroker', 'EnvironmentBase', 'FATAL', 'FILTER', 'FINANCE', 'FLOOR', 'FundsRecord', 'Grid', 'HHV', 'HHVBARS', 'HIGH', 'HKUCheckError', 'HKUException', 'HOUR', 'HSL', 'Hours', 'IC', 'ICIR', 'IF', 'INBLOCK', 'INDEXA', 'INDEXADV', 'INDEXC', 'INDEXDEC', 'INDEXH', 'INDEXL', 'INDEXO', 'INDEXV', 'INFO', 'INSUM', 'INTPART', 'IR', 'ISINF', 'ISINFA', 'ISLASTBAR', 'ISNA', 'IndParam', 'Indicator', 'IndicatorImp', 'JUMPDOWN', 'JUMPUP', 'JsCode', 'KALMAN', 'KDATA', 'KDATA_PART', 'KDJ', 'KData', 'KDataDriver', 'KDataToHdf5Importer', 'KData_getitem', 'KData_iter', 'KData_to_df', 'KData_to_np', 'KRecord', 'KRecordList', 'Kline', 'LAST', 'LASTVALUE', 'LIUTONGPAN', 'LLV', 'LLVBARS', 'LN', 'LOG', 'LOG_LEVEL', 'LONGCROSS', 'LOW', 'Line', 'LoanRecord', 'LoggingContext', 'MA', 'MACD', 'MAX', 'MDD', 'MF_EqualWeight', 'MF_ICIRWeight', 'MF_ICWeight', 'MF_Weight', 'MIN', 'MINUTE', 'MM_FixedCapital', 'MM_FixedCapitalFunds', 'MM_FixedCount', 'MM_FixedCountTps', 'MM_FixedPercent', 'MM_FixedRisk', 'MM_FixedUnits', 'MM_Nothing', 'MM_WilliamsFixedRisk', 'MOD', 'MONTH', 'MRR', 'MailOrderBroker', 'MarketInfo', 'Microseconds', 'Milliseconds', 'Minutes', 'MoneyManagerBase', 'MultiFactorBase', 'MultiLineTextChart', 'NDAY', 'NOT', 'OFF', 'OPEN', 'OrderBrokerBase', 'OrderBrokerWrap', 'PF_Simple', 'PF_WithoutAF', 'PG_FixedHoldDays', 'PG_FixedPercent', 'PG_NoGoal', 'POS', 'POW', 'PRICELIST', 'Page', 'Parameter', 'Parameter_items', 'Parameter_iter', 'Parameter_keys', 'Parameter_to_dict', 'Path', 'Performance', 'Performance_to_df', 'Portfolio', 'PositionList_to_df', 'PositionList_to_np', 'PositionRecord', 'PositionRecordList', 'ProfitGoalBase', 'Query', 'RANK', 'RECOVER_BACKWARD', 'RECOVER_EQUAL_BACKWARD', 'RECOVER_EQUAL_FORWARD', 'RECOVER_FORWARD', 'REF', 'REPLACE', 'RESULT', 'REVERSE', 'ROC', 'ROCP', 'ROCR', 'ROCR100', 'ROUND', 'ROUNDDOWN', 'ROUNDUP', 'RSI', 'SAFTYLOSS', 'SE_EvaluateOptimal', 'SE_Fixed', 'SE_MaxFundsOptimal', 'SE_MultiFactor', 'SE_PerformanceOptimal', 'SE_Signal', 'SGN', 'SG_Add', 'SG_AllwaysBuy', 'SG_And', 'SG_Band', 'SG_Bool', 'SG_Buy', 'SG_Cross', 'SG_CrossGold', 'SG_Cycle', 'SG_Div', 'SG_Flex', 'SG_Mul', 'SG_OneSide', 'SG_Or', 'SG_Sell', 'SG_Single', 'SG_Single2', 'SG_Sub', 'SIN', 'SLICE', 'SLOPE', 'SMA', 'SPEARMAN', 'SP_FixedPercent', 'SP_FixedValue', 'SQRT', 'STD', 'STDEV', 'STDP', 'ST_FixedPercent', 'ST_Indicator', 'ST_Saftyloss', 'SUM', 'SUMBARS', 'SYS_Simple', 'SYS_WalkForward', 'Scatter', 'ScoreRecord', 'ScoreRecordList', 'Seconds', 'SelectorBase', 'SignalBase', 'SlippageBase', 'SpotRecord', 'Stock', 'StockManager', 'StockTypeInfo', 'StockWeight', 'StockWeightList', 'StoplossBase', 'Strategy', 'StrategyContext', 'System', 'SystemPart', 'SystemWeight', 'SystemWeightList', 'TAN', 'TA_ACCBANDS', 'TA_ACOS', 'TA_AD', 'TA_ADD', 'TA_ADOSC', 'TA_ADX', 'TA_ADXR', 'TA_APO', 'TA_AROON', 'TA_AROONOSC', 'TA_ASIN', 'TA_ATAN', 'TA_ATR', 'TA_AVGDEV', 'TA_AVGPRICE', 'TA_BBANDS', 'TA_BETA', 'TA_BOP', 'TA_CCI', 'TA_CDL2CROWS', 'TA_CDL3BLACKCROWS', 'TA_CDL3INSIDE', 'TA_CDL3LINESTRIKE', 'TA_CDL3OUTSIDE', 'TA_CDL3STARSINSOUTH', 'TA_CDL3WHITESOLDIERS', 'TA_CDLABANDONEDBABY', 'TA_CDLADVANCEBLOCK', 'TA_CDLBELTHOLD', 'TA_CDLBREAKAWAY', 'TA_CDLCLOSINGMARUBOZU', 'TA_CDLCONCEALBABYSWALL', 'TA_CDLCOUNTERATTACK', 'TA_CDLDARKCLOUDCOVER', 'TA_CDLDOJI', 'TA_CDLDOJISTAR', 'TA_CDLDRAGONFLYDOJI', 'TA_CDLENGULFING', 'TA_CDLEVENINGDOJISTAR', 'TA_CDLEVENINGSTAR', 'TA_CDLGAPSIDESIDEWHITE', 'TA_CDLGRAVESTONEDOJI', 'TA_CDLHAMMER', 'TA_CDLHANGINGMAN', 'TA_CDLHARAMI', 'TA_CDLHARAMICROSS', 'TA_CDLHIGHWAVE', 'TA_CDLHIKKAKE', 'TA_CDLHIKKAKEMOD', 'TA_CDLHOMINGPIGEON', 'TA_CDLIDENTICAL3CROWS', 'TA_CDLINNECK', 'TA_CDLINVERTEDHAMMER', 'TA_CDLKICKING', 'TA_CDLKICKINGBYLENGTH', 'TA_CDLLADDERBOTTOM', 'TA_CDLLONGLEGGEDDOJI', 'TA_CDLLONGLINE', 'TA_CDLMARUBOZU', 'TA_CDLMATCHINGLOW', 'TA_CDLMATHOLD', 'TA_CDLMORNINGDOJISTAR', 'TA_CDLMORNINGSTAR', 'TA_CDLONNECK', 'TA_CDLPIERCING', 'TA_CDLRICKSHAWMAN', 'TA_CDLRISEFALL3METHODS', 'TA_CDLSEPARATINGLINES', 'TA_CDLSHOOTINGSTAR', 'TA_CDLSHORTLINE', 'TA_CDLSPINNINGTOP', 'TA_CDLSTALLEDPATTERN', 'TA_CDLSTICKSANDWICH', 'TA_CDLTAKURI', 'TA_CDLTASUKIGAP', 'TA_CDLTHRUSTING', 'TA_CDLTRISTAR', 'TA_CDLUNIQUE3RIVER', 'TA_CDLUPSIDEGAP2CROWS', 'TA_CDLXSIDEGAP3METHODS', 'TA_CEIL', 'TA_CMO', 'TA_CORREL', 'TA_COS', 'TA_COSH', 'TA_DEMA', 'TA_DIV', 'TA_DX', 'TA_EMA', 'TA_EXP', 'TA_FLOOR', 'TA_HT_DCPERIOD', 'TA_HT_DCPHASE', 'TA_HT_PHASOR', 'TA_HT_SINE', 'TA_HT_TRENDLINE', 'TA_HT_TRENDMODE', 'TA_IMI', 'TA_KAMA', 'TA_LINEARREG', 'TA_LINEARREG_ANGLE', 'TA_LINEARREG_INTERCEPT', 'TA_LINEARREG_SLOPE', 'TA_LN', 'TA_LOG10', 'TA_MA', 'TA_MACD', 'TA_MACDEXT', 'TA_MACDFIX', 'TA_MAMA', 'TA_MAVP', 'TA_MAX', 'TA_MAXINDEX', 'TA_MEDPRICE', 'TA_MFI', 'TA_MIDPOINT', 'TA_MIDPRICE', 'TA_MIN', 'TA_MININDEX', 'TA_MINMAX', 'TA_MINMAXINDEX', 'TA_MINUS_DI', 'TA_MINUS_DM', 'TA_MOM', 'TA_MULT', 'TA_NATR', 'TA_OBV', 'TA_PLUS_DI', 'TA_PLUS_DM', 'TA_PPO', 'TA_ROC', 'TA_ROCP', 'TA_ROCR', 'TA_ROCR100', 'TA_RSI', 'TA_SAR', 'TA_SAREXT', 'TA_SIN', 'TA_SINH', 'TA_SMA', 'TA_SQRT', 'TA_STDDEV', 'TA_STOCH', 'TA_STOCHF', 'TA_STOCHRSI', 'TA_SUB', 'TA_SUM', 'TA_T3', 'TA_TAN', 'TA_TANH', 'TA_TEMA', 'TA_TRANGE', 'TA_TRIMA', 'TA_TRIX', 'TA_TSF', 'TA_TYPPRICE', 'TA_ULTOSC', 'TA_VAR', 'TA_WCLPRICE', 'TA_WILLR', 'TA_WMA', 'TC_FixedA', 'TC_FixedA2015', 'TC_FixedA2017', 'TC_TestStub', 'TC_Zero', 'TIME', 'TIMELINE', 'TIMELINEVOL', 'TR', 'TRACE', 'TURNOVER', 'TestOrderBroker', 'TimeDelta', 'TimeDelta_timedelta', 'TimeLineList', 'TimeLineRecord', 'TimeLine_to_df', 'TimeLine_to_np', 'TradeCostBase', 'TradeList_to_df', 'TradeList_to_np', 'TradeManager', 'TradeRecord', 'TradeRecordList', 'TradeRequest', 'TransList', 'TransList_to_df', 'TransList_to_np', 'TransRecord', 'UPNDAY', 'UTCOffset', 'VALUE', 'VAR', 'VARP', 'VIGOR', 'VOL', 'WARN', 'WEAVE', 'WEEK', 'WINNER', 'WITHDAY', 'WITHHALFYEAR', 'WITHHOUR', 'WITHHOUR2', 'WITHHOUR4', 'WITHKTYPE', 'WITHMIN', 'WITHMIN15', 'WITHMIN30', 'WITHMIN5', 'WITHMIN60', 'WITHMONTH', 'WITHQUARTER', 'WITHWEEK', 'WITHYEAR', 'WMA', 'YEAR', 'ZHBOND10', 'ZONGGUBEN', 'ZSCORE', 'active_device', 'add_class_logger_handler', 'add_local_hub', 'add_remote_hub', 'analysis', 'analysis_sys_list', 'analysis_sys_list_multi', 'backtest', 'batch_calculate_inds', 'broker', 'broker_easytrader', 'broker_mail', 'build_hub', 'can_upgrade', 'capture_multiprocess_all_logger', 'class_logger', 'close_ostream_to_python', 'close_spend_time', 'combinate_ind', 'combinate_ind_analysis', 'combinate_ind_analysis_multi', 'combinate_index', 'concat_to_df', 'constant', 'core', 'cpp', 'crtAF', 'crtBrokerTM', 'crtCN', 'crtEV', 'crtMF', 'crtMM', 'crtOB', 'crtPG', 'crtSE', 'crtSEOptimal', 'crtSG', 'crtSP', 'crtST', 'crtTM', 'crt_pf_strategy', 'crt_sys_strategy', 'current_path', 'date', 'datetime', 'df_to_ind', 'dll_directory', 'extend', 'fetch_trial_license', 'find_optimal_system', 'find_optimal_system_multi', 'get_block', 'get_business_name', 'get_current_hub', 'get_data_from_buffer_server', 'get_date_range', 'get_draw_title', 'get_hub_name_list', 'get_hub_path', 'get_kdata', 'get_last_version', 'get_log_level', 'get_part', 'get_part_info', 'get_part_list', 'get_part_module', 'get_part_name_list', 'get_series_name', 'get_stock', 'get_system_part_enum', 'get_system_part_name', 'get_version', 'get_version_git', 'get_version_with_build', 'grid_pos', 'help_part', 'hikyuu_init', 'hku_benchmark', 'hku_catch', 'hku_check', 'hku_check_ignore', 'hku_check_throw', 'hku_debug', 'hku_debug_if', 'hku_error', 'hku_error_if', 'hku_fatal', 'hku_fatal_if', 'hku_info', 'hku_info_if', 'hku_logger', 'hku_to_async', 'hku_trace', 'hku_trace_if', 'hku_warn', 'hku_warn_if', 'hub', 'ibar', 'in_interactive_session', 'in_ipython_frontend', 'indicator', 'indicator_getitem', 'indicator_iter', 'indicator_to_df', 'inner_analysis_sys_list', 'inner_combinate_ind_analysis', 'inner_combinate_ind_analysis_with_block', 'iplot', 'is_valid_license', 'isinf', 'isnan', 'kplot', 'kplot_line', 'list_getitem', 'new_Query_init', 'new_path', 'np', 'old_Query_init', 'open_ostream_to_python', 'open_spend_time', 'opts', 'os', 'part_clone', 'part_init', 'part_iter', 'pd', 'pickle', 'print_part_info', 'pyind', 'remove_hub', 'remove_license', 'roundDown', 'roundEx', 'roundUp', 'run_in_strategy', 'search_part', 'set_log_level', 'set_my_logger_file', 'set_python_in_interactive', 'set_python_in_jupyter', 'simple_datetime_list', 'spend_time', 'start_data_server', 'start_spot_agent', 'stop_data_server', 'stop_spot_agent', 'sys', 'sys_performance', 'sysplot', 'talib_wrap', 'timedelta', 'timeout', 'toPriceList', 'traceback', 'trade', 'trade_manage', 'trade_sys', 'update_hub', 'util', 'view_license', 'volume_barplot', 'with_trace', 'wraps']
 class MultiLineTextChart(pyecharts.charts.base.Base):
     def __init__(self, init_opts: pyecharts.options.global_options.InitOpts = ...):
         ...
@@ -695,8 +712,6 @@ HIGH: hikyuu.cpp.core39.Indicator  # value = Indicator{...
 INFO: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.INFO: 2>
 KDATA: hikyuu.cpp.core39.Indicator  # value = Indicator{...
 LOW: hikyuu.cpp.core39.Indicator  # value = Indicator{...
-MAXYEAR: int = 9999
-MINYEAR: int = 1
 OFF: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.OFF: 6>
 OPEN: hikyuu.cpp.core39.Indicator  # value = Indicator{...
 TRACE: hikyuu.cpp.core39.LOG_LEVEL  # value = <LOG_LEVEL.TRACE: 0>

hikyuu/draw/drawplot/matplotlib_draw.py

@@ -573,6 +573,17 @@ def ax_draw_macd(axes, kdata, n1=12, n2=26, n3=9):
     axt = axes.twinx()
     axt.grid(False)
     axt.set_yticks([])
+
+    # 计算MACD柱和DIF/DEA的y轴极值,并对齐
+    y_all = np.concatenate([np.asarray(bmacd), np.asarray(fmacd), np.asarray(smacd)])
+    y_min = np.nanmin(y_all)
+    y_max = np.nanmax(y_all)
+    y_pad = (y_max - y_min) * 0.1  # 上下各留10%空白
+    y_min -= y_pad
+    y_max += y_pad
+    axes.set_ylim(y_min, y_max)  # 设置MACD柱y轴范围
+    axt.set_ylim(y_min, y_max)  # 设置DIF/DEA的y轴范围
+
     fmacd.plot(axes=axt, linestyle='--', legend_on=False, text_on=False)
     smacd.plot(axes=axt, legend_on=False, text_on=False)
 
@@ -621,6 +632,17 @@ def ax_draw_macd2(axes, ref, kdata, n1=12, n2=26, n3=9):
     axt = axes.twinx()
     axt.grid(False)
     axt.set_yticks([])
+
+    # 计算MACD柱和DIF/DEA的y轴极值,并对齐
+    y_all = np.concatenate([np.asarray(bmacd), np.asarray(fmacd), np.asarray(smacd)])
+    y_min = np.nanmin(y_all)
+    y_max = np.nanmax(y_all)
+    y_pad = (y_max - y_min) * 0.1  # 上下各留10%空白
+    y_min -= y_pad
+    y_max += y_pad
+    axes.set_ylim(y_min, y_max)  # 设置MACD柱y轴范围
+    axt.set_ylim(y_min, y_max)  # 设置DIF/DEA的y轴范围
+
     fmacd.plot(axes=axt, linestyle='--', legend_on=False, text_on=False)
     smacd.plot(axes=axt, legend_on=False, text_on=False)
 
@@ -848,8 +870,8 @@ def tm_performance(tm: TradeManager, query: Query, ref_stk: Stock = None):
     ref_return = ALIGN(ROCR(ref_k.close, 0), ref_dates)
     ref_return.name = f"{ref_stk.name}({ref_stk.market_code})"
 
-    per = Performance()
-    text = per.report(tm, sh000001_k[-1].datetime)
+    per = tm.get_performance(sh000001_k[-1].datetime)
+    text = per.report()
 
     # 计算最大回撤
     max_pullback = min(MDD(funds).to_np())
@@ -929,8 +951,8 @@ def sys_performance(sys, ref_stk=None):
     ref_return = ALIGN(ROCR(ref_k.close, 0), ref_dates)
     ref_return.name = f"{ref_stk.name}({ref_stk.market_code})"
 
-    per = Performance()
-    text = per.report(sys.tm, sh000001_k[-1].datetime)
+    per = sys.tm.get_performance(sh000001_k[-1].datetime)
+    text = per.report()
 
     # 计算最大回撤
     max_pullback = min(MDD(funds).to_np())