siat 3.2.4__py3-none-any.whl → 3.2.10__py3-none-any.whl

siat/stock_technical.py

@@ -90,7 +90,7 @@ if __name__ =="__main__":
     
     BIAS_days=[6,12,24]
     
-    CCI_days=14
+    CCI_day=14; CCI_madays=[5,20]
     
     WR_days=[10,6]
     
@@ -161,32 +161,51 @@ if __name__ =="__main__":
 
     
     
-def calc_technical(df,start,end, \
-                   RSI_days=14, \
-                   OBV_days=5, \
-                       
-                   MA_days=[5,20], \
-                   MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
-                       
-                   KDJ_fastk_period=9,KDJ_slowk_period=5,KDJ_slowk_matype=1, \
-                   KDJ_slowd_period=5,KDJ_slowd_matype=1, \
-                       
-                   VOL_fastperiod=5,VOL_slowperiod=10, \
-                   PSY_days=12, \
-                   ARBR_days=26, \
-                   CR_day=16,CR_madays=[5,10,20], \
-                   EMV_day=14,EMV_madays=9, \
-                   BULL_days=20,BULL_nbdevup=2,BULL_nbdevdn=2,BULL_matype=0, \
-                   DMA_fastperiod=10,DMA_slowperiod=50,DMA_madays=10, \
-                   TRIX_day=12,TRIX_madays=20, \
-                   BIAS_days=[6,12,24], \
-                   CCI_days=14, \
-                   WR_days=[10,6], \
-                   ROC_day=12,ROC_madays=6, \
-                   DMI_DIdays=14,DMI_ADXdays=6, \
-                       
-                   indicator='Close', \
-                   more_details=False):
+def calc_technical(df,start,end,technical='MACD', \
+                   
+        RSI_days=[14], \
+        OBV_days=[5], \
+            
+        MA_days=[5,20],EMA_days=[5,20], \
+        MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
+            
+        KDJ_fastk_period=9,KDJ_slowk_period=5,KDJ_slowk_matype=1,KDJ_slowd_period=5,KDJ_slowd_matype=1, \
+            
+        VOL_fastperiod=5,VOL_slowperiod=10, \
+        PSY_days=[12], \
+        ARBR_days=[26], \
+        CR_day=16,CR_madays=[5,10,20], \
+        EMV_day=14,EMV_madays=[9], \
+            
+        BULL_day=20,BULL_nbdevup=2,BULL_nbdevdn=2,BULL_matype=0, \
+            
+        DMA_fastperiod=10,DMA_slowperiod=50,DMA_madays=[10], \
+            
+        TRIX_day=12,TRIX_madays=[20], \
+        BIAS_days=[6,12,24], \
+        CCI_day=14,CCI_madays=[5,20], \
+        WR_days=[10,6], \
+        ROC_day=12,ROC_madays=[6], \
+        DMI_DIdays=[14],DMI_ADXdays=[6], \
+            
+        MFI_day=14,MFI_madays=[14], \
+        MOM_day=10,MOM_madays=[10], \
+            
+        #需要显示SAR
+        SAR_day=4,SAR_madays=[5,20], \
+            
+        #需要显示BETA
+        BETA_day=5,BETA_madays=[5,20], \
+        
+        #需要显示TSF
+        TSF_day=14,TSF_madays=[5,20], \
+            
+        #需要显示AD
+        AD_day=26,AD_madays=[5,20], \
+        
+        #不建议使用复权价，因为最高最低价和开盘价没有复权价！
+        indicator='Close', \
+        more_details=False):
     """
     功能：计算股票的技术分析指标
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -211,6 +230,9 @@ def calc_technical(df,start,end, \
         talib_install_method()
         return None
     
+    #用于对比，检查是否有计算结果的指标加入
+    dfcols_original=list(df)
+    
     #=========== RSI，相对强弱指标Relative Strength Index
     """
     计算公式：RSI有两种计算方法：
@@ -228,11 +250,13 @@ def calc_technical(df,start,end, \
     30-50 弱 观望，谨慎买入
     0-30 极弱 买入        
     """
-    if not isinstance(RSI_days,list):
-        RSI_days=[RSI_days]
-    for d in RSI_days:
-        df['rsi'+str(d)] = talib.RSI(df[indicator], timeperiod=d)
-    #注意：rsi1没有意义
+    if technical=='RSI':
+    
+        if not isinstance(RSI_days,list):
+            RSI_days=[RSI_days]
+        for d in RSI_days:
+            df['rsi'+str(d)] = talib.RSI(df[indicator], timeperiod=d)
+        #注意：rsi1没有意义
     
     #=========== OBV：能量潮
     """
@@ -263,15 +287,17 @@ def calc_technical(df,start,end, \
     因此，对于那些达到涨跌停板的股票，OBV指标也无法正常发挥作用。    
     
     """
-    df['obv'] = talib.OBV(df[indicator],df['Volume'])
-    
-    if not isinstance(OBV_days,list):
-        OBV_days=[OBV_days]
-    for d in OBV_days:    
-        df['obv_ma'+str(d)] = talib.MA(df['obv'],timeperiod=d)
+    if technical=='OBV':
     
-    if not more_details:    
-        df.drop(columns = ['obv'],inplace=True)
+        df['obv'] = talib.OBV(df[indicator],df['Volume'])
+        
+        if not isinstance(OBV_days,list):
+            OBV_days=[OBV_days]
+        for d in OBV_days:    
+            df['obv_ma'+str(d)] = talib.MA(df['obv'],timeperiod=d)
+        
+        if not more_details:    
+            df.drop(columns = ['obv'],inplace=True)
     
     #=========== MA: 简单、加权移动平均
     """
@@ -282,13 +308,22 @@ def calc_technical(df,start,end, \
     一般来说，现行价格在平均价之上，意味着市场买力（需求）较大，行情看好；
     反之，行情价在平均价之下，则意味着供过于求，卖压显然较重，行情看淡。    
     """
-    if not isinstance(MA_days,list):
-        MA_days=[MA_days]
+    if technical=='MA':
     
-    for d in MA_days:
-        df['ma'+str(d)] = talib.MA(df[indicator],timeperiod=d)
-        df['ema'+str(d)] = talib.EMA(df[indicator],timeperiod=d)
+        if not isinstance(MA_days,list):
+            MA_days=[MA_days]
+        
+        for d in MA_days:
+            df['ma'+str(d)] = talib.MA(df[indicator],timeperiod=d)
+
+    if technical=='EMA':
     
+        if not isinstance(EMA_days,list):
+            EMA_days=[EMA_days]
+        
+        for d in EMA_days:
+            df['ema'+str(d)] = talib.EMA(df[indicator],timeperiod=d)    
+            
     #=========== MACD：指数平滑异同平均线
     """
     计算方法：快速时间窗口设为12日，慢速时间窗口设为26日，DIF参数设为9日
@@ -317,10 +352,12 @@ def calc_technical(df,start,end, \
         3. MACD绿转红：MACD值由负变正，市场由空头转为多头。
         4. MACD红转绿：MACD值由正变负，市场由多头转为空头。        
     """
-    df['DIF'],df['DEA'],df['MACD']=talib.MACD(df[indicator], \
-                                fastperiod=MACD_fastperiod, \
-                                slowperiod=MACD_slowperiod, \
-                                signalperiod=MACD_signalperiod)
+    if technical=='MACD':
+    
+        df['DIF'],df['DEA'],df['MACD']=talib.MACD(df[indicator], \
+                                    fastperiod=MACD_fastperiod, \
+                                    slowperiod=MACD_slowperiod, \
+                                    signalperiod=MACD_signalperiod)
 
     #=========== KDJ: 随机指标
     """
@@ -339,13 +376,15 @@ def calc_technical(df,start,end, \
         多头区域，空头区域
         金叉，死叉
     """
-    df['kdj_k'],df['kdj_d'] = talib.STOCH(df['High'],df['Low'],df['Close'], \
-                        fastk_period=KDJ_fastk_period,
-                        slowk_period=KDJ_slowk_period, 
-                        slowk_matype=KDJ_slowk_matype, 
-                        slowd_period=KDJ_slowd_period, 
-                        slowd_matype=KDJ_slowd_matype)
-    df['kdj_j'] = 3*df['kdj_k'] - 2*df['kdj_d']
+    if technical=='KDJ':
+    
+        df['kdj_k'],df['kdj_d'] = talib.STOCH(df['High'],df['Low'],df[indicator], \
+                            fastk_period=KDJ_fastk_period,
+                            slowk_period=KDJ_slowk_period, 
+                            slowk_matype=KDJ_slowk_matype, 
+                            slowd_period=KDJ_slowd_period, 
+                            slowd_matype=KDJ_slowd_matype)
+        df['kdj_j'] = 3*df['kdj_k'] - 2*df['kdj_d']
 
     #=========== SAR: 抛物转向
     """
@@ -368,14 +407,29 @@ def calc_technical(df,start,end, \
         7）SAR指标基准周期的参数为2，如2日、2周、2月等，其计算周期的参数变动范围为2~8
         8）SAR指标在股价分析系统的主图上显示为“O”形点状图。    
     """
-    df['sar'] = talib.SAR(df['High'],df['Low'])
-
+    if technical=='SAR':
+    
+        df['sar'] = talib.SAR(df['High'],df['Low'])
+        
+        if not isinstance(SAR_madays,list):
+            SAR_madays=[SAR_madays]
+        for d in SAR_madays:    
+            df['sar_ma'+str(d)] = df['sar'].rolling(window=d).mean()    
+            
+        #需要显示SAR?
+        """
+        if not more_details:
+            #不保留指标本身
+            df.drop(columns = ['sar'],inplace=True) 
+        """
     #=========== VOL: 成交量
     """
     柱状图是成交量，两条曲线是成交量的移动平均    
     """
-    df['vol'+str(VOL_fastperiod)] = talib.MA(df['Volume'],timeperiod=VOL_fastperiod)
-    df['vol'+str(VOL_slowperiod)] = talib.MA(df['Volume'],timeperiod=VOL_slowperiod)
+    if technical=='VOL':
+    
+        df['vol'+str(VOL_fastperiod)] = talib.MA(df['Volume'],timeperiod=VOL_fastperiod)
+        df['vol'+str(VOL_slowperiod)] = talib.MA(df['Volume'],timeperiod=VOL_slowperiod)
     
     #=========== PSY: 心理线
     """
@@ -383,17 +437,19 @@ def calc_technical(df,start,end, \
     PSY(N) = A/N × 100
     说明：N为天数，A为在这N天之中股价上涨的天数    
     """
-    df['ext_0'] = df[indicator]-df[indicator].shift(1)
-    df['ext_1'] = 0
-    df.loc[df['ext_0']>0,'ext_1'] = 1
+    if technical=='PSY':
     
-    if not isinstance(PSY_days,list):
-        PSY_days=[PSY_days]
-    for d in PSY_days:    
-        df['ext_2'] = df['ext_1'].rolling(window=d).sum()
-        df['psy'+str(d)] = (df['ext_2']/float(d))*100
-    
-    df.drop(columns = ['ext_0','ext_1','ext_2'],inplace=True) 
+        df['ext_0'] = df[indicator]-df[indicator].shift(1)
+        df['ext_1'] = 0
+        df.loc[df['ext_0']>0,'ext_1'] = 1
+        
+        if not isinstance(PSY_days,list):
+            PSY_days=[PSY_days]
+        for d in PSY_days:    
+            df['ext_2'] = df['ext_1'].rolling(window=d).sum()
+            df['psy'+str(d)] = (df['ext_2']/float(d))*100
+        
+        df.drop(columns = ['ext_0','ext_1','ext_2'],inplace=True) 
     
     #=========== ARBR: 人气和意愿指标, AR为人气指标，BR为买卖意愿指标
     """
@@ -403,25 +459,27 @@ def calc_technical(df,start,end, \
     BR(N) = N日内（H-CY）之和 ÷ N日内（CY-L）之和 × 100
     说明：H表示当天最高价；L表示当天最低价；CY表示前一交易日的收盘价，N表示设定的时间参数，一般原始参数缺省值为26日    
     """
-    df['h_o'] = df['High'] - df['Open']
-    df['o_l'] = df['Open'] - df['Low']
-    
-    if not isinstance(ARBR_days,list):
-        ARBR_days=[ARBR_days]
-    for d in ARBR_days:    
-        df['h_o_sum'] = df['h_o'].rolling(window=d).sum()
-        df['o_l_sum'] = df['o_l'].rolling(window=d).sum()
-        df['ar'+str(d)] = (df['h_o_sum']/df['o_l_sum'])*100
+    if technical=='ARBR':
     
+        df['h_o'] = df['High'] - df['Open']
+        df['o_l'] = df['Open'] - df['Low']
+        
+        if not isinstance(ARBR_days,list):
+            ARBR_days=[ARBR_days]
+        for d in ARBR_days:    
+            df['h_o_sum'] = df['h_o'].rolling(window=d).sum()
+            df['o_l_sum'] = df['o_l'].rolling(window=d).sum()
+            df['ar'+str(d)] = (df['h_o_sum']/df['o_l_sum'])*100
+        
+        
+        df['h_c'] = df['High'] - df[indicator]
+        df['c_l'] = df[indicator] - df['Low']
+        for d in ARBR_days:    
+            df['h_c_sum'] = df['h_c'].rolling(window=d).sum()
+            df['c_l_sum'] = df['c_l'].rolling(window=d).sum()
+            df['br'+str(d)] = (df['h_c_sum']/df['c_l_sum'])*100
     
-    df['h_c'] = df['High'] - df['Close']
-    df['c_l'] = df['Close'] - df['Low']
-    for d in ARBR_days:    
-        df['h_c_sum'] = df['h_c'].rolling(window=d).sum()
-        df['c_l_sum'] = df['c_l'].rolling(window=d).sum()
-        df['br'+str(d)] = (df['h_c_sum']/df['c_l_sum'])*100
-
-    df.drop(columns = ['h_o','o_l','h_o_sum','o_l_sum','h_c','c_l','h_c_sum','c_l_sum'],inplace=True) 
+        df.drop(columns = ['h_o','o_l','h_o_sum','o_l_sum','h_c','c_l','h_c_sum','c_l_sum'],inplace=True) 
 
     #=========== CR: 带状能力线或中间意愿指标
     """
@@ -436,22 +494,22 @@ def calc_technical(df,start,end, \
     说明：N为设定的时间周期参数，一般原始参数日设定为26日
     3）计算CR值在不同时间周期内的移动平均值：这三条移动平均曲线分别为MA1 MA2 MA3,时间周期分别为5日 10日 20日    
     """
-    df['m_price'] = (df['High'] + df['Low'])/2
-    df['h_m'] = df['High']-df['m_price'].shift(1)
-    df['m_l'] = df['m_price'].shift(1)-df['Low']
-    
-    df['h_m_sum'] = df['h_m'].rolling(window=CR_day).sum()
-    df['m_l_sum'] = df['m_l'].rolling(window=CR_day).sum()
-    df['cr'] = (df['h_m_sum']/df['m_l_sum'])*100
-    
-    for d in CR_madays:
-        df['cr_ma'+str(d)] = talib.MA(df['cr'],timeperiod=d)
+    if technical=='CR':
     
-    if more_details:
-        #保留cr
-        df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum'],inplace=True) 
-    else:
-        df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum','cr'],inplace=True) 
+        df['m_price'] = (df['High'] + df['Low'])/2
+        df['h_m'] = df['High']-df['m_price'].shift(1)
+        df['m_l'] = df['m_price'].shift(1)-df['Low']
+        
+        df['h_m_sum'] = df['h_m'].rolling(window=CR_day).sum()
+        df['m_l_sum'] = df['m_l'].rolling(window=CR_day).sum()
+        df['cr'] = (df['h_m_sum']/df['m_l_sum'])*100
+        
+        for d in CR_madays:
+            df['cr_ma'+str(d)] = talib.MA(df['cr'],timeperiod=d)
+        
+        df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum'],inplace=True)
+        if not more_details:
+            df.drop(columns = ['cr'],inplace=True) 
     
     #=========== EMV: 简易波动指标
     """
@@ -467,20 +525,22 @@ def calc_technical(df,start,end, \
     4）求出EMV的移动平均值EMVA
     EMVA = EMV的M日移动平均值，M一般设置9日    
     """
-    df['a'] = (df['High']+df['Low'])/2
-    df['b'] = (df['High'].shift(1)+df['Low'].shift(1))/2
-    df['c'] = df['High'] - df['Low']
-    df['Amount']=df['Close']*df['Volume']
-    df['em'] = (df['a']-df['b'])*df['c']/df['Amount']
+    if technical=='EMV':
     
-    df['emv'] = df['em'].rolling(window=EMV_day).sum()
+        df['a'] = (df['High']+df['Low'])/2
+        df['b'] = (df['High'].shift(1)+df['Low'].shift(1))/2
+        df['c'] = df['High'] - df['Low']
+        df['Amount']=df[indicator]*df['Volume']
+        df['em'] = (df['a']-df['b'])*df['c']/df['Amount']
+        
+        df['emv'] = df['em'].rolling(window=EMV_day).sum()
+        
+        if not isinstance(EMV_madays,list):
+            EMV_madays=[EMV_madays]
+        for d in EMV_madays:    
+            df['emv_ma'+str(d)] = talib.MA(df['emv'],timeperiod=d)
     
-    if not isinstance(EMV_madays,list):
-        EMV_madays=[EMV_madays]
-    for d in EMV_madays:    
-        df['emv_ma'+str(d)] = talib.MA(df['emv'],timeperiod=d)
-
-    df.drop(columns = ['a','b','c','em'],inplace=True) 
+        df.drop(columns = ['a','b','c','em'],inplace=True) 
     
     #=========== BOLL: 布林线指标
     """
@@ -508,24 +568,28 @@ def calc_technical(df,start,end, \
         这条带状区的宽窄，随着股价波动幅度的大小而变化，股价涨跌幅度加大时，带状区变宽，
         涨跌幅度狭小盘整时，带状区则变窄。    
     """
-    df['upper'],df['mid'],df['lower'] = talib.BBANDS(df[indicator], \
-                timeperiod=BULL_days, \
-                nbdevup=BULL_nbdevup,nbdevdn=BULL_nbdevdn,matype=BULL_matype)                     
+    if technical=='Bollinger':
+    
+        df['upper'],df['mid'],df['lower'] = talib.BBANDS(df[indicator], \
+                    timeperiod=BULL_day, \
+                    nbdevup=BULL_nbdevup,nbdevdn=BULL_nbdevdn,matype=BULL_matype)                     
     
     #=========== TRIX：三重指数平滑移动平均指标
     """
     
     """
-    df['trix'] = talib.TRIX(df[indicator],timeperiod=TRIX_day)
-    
-    if not isinstance(TRIX_madays,list):
-        TRIX_madays=[TRIX_madays]
-    for d in TRIX_madays:    
-        df['trix_ma'+str(d)] = talib.MA(df['trix'],timeperiod=d)    
+    if technical=='TRIX':
     
-    if not more_details:
-        #不保留TRIX
-        df.drop(columns = ['trix'],inplace=True) 
+        df['trix'] = talib.TRIX(df[indicator],timeperiod=TRIX_day)
+        
+        if not isinstance(TRIX_madays,list):
+            TRIX_madays=[TRIX_madays]
+        for d in TRIX_madays:    
+            df['trix_ma'+str(d)] = talib.MA(df['trix'],timeperiod=d)    
+        
+        if not more_details:
+            #不保留TRIX
+            df.drop(columns = ['trix'],inplace=True) 
 
     #=========== DMA: 平均线差
     """
@@ -539,17 +603,19 @@ def calc_technical(df,start,end, \
     2）求DDD的10日移动平均数值
     DMA(10) = DDD(10)÷10
     """   
-    df['ma_shortperiod'] = talib.MA(df[indicator],timeperiod=DMA_fastperiod)
-    df['ma_longperiod'] = talib.MA(df[indicator],timeperiod=DMA_slowperiod)
-    df['ddd'] = df['ma_shortperiod'] - df['ma_longperiod']
-    
-    if not isinstance(DMA_madays,list):
-        DMA_madays=[DMA_madays]
-    for d in DMA_madays:    
-        df['dma'+str(d)] = talib.MA(df['ddd'],timeperiod=d)    
-    #注意：dma1似乎没有意义
+    if technical=='DMA':
     
-    df.drop(columns = ['ma_shortperiod','ma_longperiod','ddd'],inplace=True) 
+        df['ma_shortperiod'] = talib.MA(df[indicator],timeperiod=DMA_fastperiod)
+        df['ma_longperiod'] = talib.MA(df[indicator],timeperiod=DMA_slowperiod)
+        df['ddd'] = df['ma_shortperiod'] - df['ma_longperiod']
+        
+        if not isinstance(DMA_madays,list):
+            DMA_madays=[DMA_madays]
+        for d in DMA_madays:    
+            df['dma_ma'+str(d)] = talib.MA(df['ddd'],timeperiod=d)    
+        #注意：dma1似乎没有意义
+        
+        df.drop(columns = ['ma_shortperiod','ma_longperiod','ddd'],inplace=True) 
     
     #=========== BIAS: 乖离率
     """
@@ -560,25 +626,35 @@ def calc_technical(df,start,end, \
     12日BIAS＞＋6％是卖出时机；＜-5.5％,为买入时机。
     24日BIAS＞＋9％是卖出时机；＜－8％，为买入时机。
     """
-    if not isinstance(BIAS_days,list):
-        BIAS_days=[BIAS_days]
-    for d in BIAS_days:  
-        df['ma'] = talib.MA(df[indicator],timeperiod=d)
-        df['bias'+str(d)] = ((df[indicator]-df['ma'])/df['ma'])*100
+    if technical=='BIAS':
     
-    df.drop(columns = ['ma'],inplace=True) 
+        if not isinstance(BIAS_days,list):
+            BIAS_days=[BIAS_days]
+        for d in BIAS_days:  
+            df['ma'] = talib.MA(df[indicator],timeperiod=d)
+            df['bias'+str(d)] = ((df[indicator]-df['ma'])/df['ma'])*100
+        
+        df.drop(columns = ['ma'],inplace=True) 
 
     #=========== CCI: 顺势指标
     """
     计算过程：
     CCI(N日) = （TP-MA）÷MD÷0.015
     说明：TP = （最高价+最低价+收盘价）÷3；MA=最近N日收盘价的累计之和÷N；MD=最近N日（MA-收盘价）的累计之和÷N；0.015为计算系数；N为计算周期，默认为14天
-    """  
-    if not isinstance(CCI_days,list):
-        CCI_days=[CCI_days]
-    for d in CCI_days:    
-        df['cci'+str(d)] = talib.CCI(df['High'],df['Low'],df['Close'],timeperiod=d)
+    """ 
+    if technical=='CCI':
+    
+        df['cci'] = talib.CCI(df['High'],df['Low'],df[indicator],timeperiod=CCI_day)
+        
+        if not isinstance(CCI_madays,list):
+            CCI_madays=[CCI_madays]
+        for d in CCI_madays:    
+            df['cci_ma'+str(d)] = df['cci'].rolling(window=d).mean()
             
+        #需要显示CCI?
+        if not more_details:
+            #不保留指标本身
+            df.drop(columns = ['cci'],inplace=True) 
     #=========== W%R: 威廉指标   
     """
     N日W%R = [(Hn-Ct)/(Hn-Ln)]*100
@@ -593,14 +669,16 @@ def calc_technical(df,start,end, \
         2.高于80，超卖，即将见底，应伺机买进 
         3.与RSI、MTM指标配合使用，效果更好    
     """
-    if not isinstance(WR_days,list):
-        WR_days=[WR_days]
-    for d in WR_days:
-        df['h_10'] = df['High'].rolling(window=d).max()
-        df['l_10'] = df['Low'].rolling(window=d).min()
-        df['wr'+str(d)] = ((df['h_10']-df['Close'])/(df['h_10']-df['l_10']))*100
-
-    df.drop(columns = ['h_10','l_10'],inplace=True) 
+    if technical=='W%R':
+    
+        if not isinstance(WR_days,list):
+            WR_days=[WR_days]
+        for d in WR_days:
+            df['h_10'] = df['High'].rolling(window=d).max()
+            df['l_10'] = df['Low'].rolling(window=d).min()
+            df['wr'+str(d)] = ((df['h_10']-df[indicator])/(df['h_10']-df['l_10']))*100
+    
+        df.drop(columns = ['h_10','l_10'],inplace=True) 
     
     #=========== ROC: 变动速率指标
     """
@@ -612,39 +690,136 @@ def calc_technical(df,start,end, \
     ROCMA = ROC的M日数值之和÷M
     说明：M一般取值为6日    
     """
-    df['roc'] = talib.ROC(df[indicator],timeperiod=ROC_day)
-    
-    if not isinstance(ROC_madays,list):
-        ROC_madays=[ROC_madays]
-    for d in ROC_madays:    
-        df['roc_ma'+str(d)] = talib.MA(df['roc'],timeperiod=d)  
+    if technical=='ROC':
     
-    if not more_details:
-        #不保留roc
-        df.drop(columns = ['roc'],inplace=True) 
+        df['roc'] = talib.ROC(df[indicator],timeperiod=ROC_day)
+        
+        if not isinstance(ROC_madays,list):
+            ROC_madays=[ROC_madays]
+        for d in ROC_madays:    
+            df['roc_ma'+str(d)] = talib.MA(df['roc'],timeperiod=d)  
+        
+        if not more_details:
+            #不保留roc
+            df.drop(columns = ['roc'],inplace=True) 
         
     #=========== DMI: 趋向指标
     """
-
+    pdi: 正向DI
+    mdi: 负向DI
     """ 
-    if not isinstance(DMI_DIdays,list):
-        DMI_DIdays=[DMI_DIdays]
-    for d in DMI_DIdays:    
-        df['pdi'+str(d)] = talib.PLUS_DI(df['High'],df['Low'],df['Close'],timeperiod=d)
-        df['mdi'+str(d)] = talib.MINUS_DI(df['High'],df['Low'],df['Close'],timeperiod=d)
-        
-    if not isinstance(DMI_ADXdays,list):
-        DMI_ADXdays=[DMI_ADXdays]
-    for d in DMI_ADXdays:    
-        df['adx'+str(d)] = talib.ADX(df['High'],df['Low'],df['Close'],timeperiod=d)
-        df['adxr'+str(d)] = talib.ADXR(df['High'],df['Low'],df['Close'],timeperiod=d)    
-
-    #过滤日期
+    if technical=='DMI':
+    
+        if not isinstance(DMI_DIdays,list):
+            DMI_DIdays=[DMI_DIdays]
+        for d in DMI_DIdays:    
+            df['pdi'+str(d)] = talib.PLUS_DI(df['High'],df['Low'],df[indicator],timeperiod=d)
+            df['mdi'+str(d)] = talib.MINUS_DI(df['High'],df['Low'],df[indicator],timeperiod=d)
+            
+        if not isinstance(DMI_ADXdays,list):
+            DMI_ADXdays=[DMI_ADXdays]
+        for d in DMI_ADXdays:    
+            df['adx'+str(d)] = talib.ADX(df['High'],df['Low'],df[indicator],timeperiod=d)
+            df['adxr'+str(d)] = talib.ADXR(df['High'],df['Low'],df[indicator],timeperiod=d)    
+    
+    #=========== MFI：资金流动指标
+    """
+    
+    """
+    if technical=='MFI':
+    
+        df['mfi'] = talib.MFI(df['High'],df['Low'],df[indicator],df['Volume'],timeperiod=MFI_day)
+        if not isinstance(MFI_madays,list):
+            MFI_madays=[MFI_madays]
+        for d in MFI_madays:    
+            df['mfi_ma'+str(d)] = df['mfi'].rolling(window=d).mean()
+    
+        if not more_details:
+            #不保留指标本身
+            df.drop(columns = ['mfi'],inplace=True) 
+    
+    #=========== MOM：动量指标
+    """
+    
+    """
+    if technical=='MOM':
+    
+        df['mom'] = talib.MOM(df[indicator],timeperiod=MOM_day)
+        if not isinstance(MOM_madays,list):
+            MOM_madays=[MOM_madays]
+        for d in MOM_madays:    
+            df['mom_ma'+str(d)] = df['mom'].rolling(window=d).mean()   
+    
+        if not more_details:
+            #不保留指标本身
+            df.drop(columns = ['mom'],inplace=True) 
+    
+    #=========== BETA：贝塔系数
+    """
+    动态贝塔系数？
+    """
+    if technical=='BETA':
+    
+        df['beta'] = talib.BETA(df['High'],df['Low'],timeperiod=BETA_day)
+        
+        if not isinstance(BETA_madays,list):
+            BETA_madays=[BETA_madays]
+        for d in BETA_madays:    
+            df['beta_ma'+str(d)] = df['beta'].rolling(window=d).mean()   
+    
+        if not more_details:
+            #不保留指标本身
+            df.drop(columns = ['beta'],inplace=True) 
+    
+    #=========== TSF：时间序列预测
+    """
+    
+    """
+    if technical=='TSF':
+    
+        df['tsf'] = talib.TSF(df[indicator],timeperiod=TSF_day)
+        
+        if not isinstance(TSF_madays,list):
+            TSF_madays=[TSF_madays]
+        for d in TSF_madays:    
+            df['tsf_ma'+str(d)] = df['tsf'].rolling(window=d).mean()   
+    
+        if not more_details:
+            #不保留指标本身
+            df.drop(columns = ['tsf'],inplace=True) 
+    
+    #=========== AD：量价指标
+    """
+    
+    """
+    if technical=='AD':
+    
+        #df['ad'] = talib.AD(df['High'],df['Low'],df[indicator],df['Volume'],timeperiod=AD_day)
+        df['ad'] = talib.AD(df['High'],df['Low'],df[indicator],df['Volume'])
+        
+        if not isinstance(AD_madays,list):
+            AD_madays=[AD_madays]
+        for d in AD_madays:    
+            df['ad_ma'+str(d)] = df['ad'].rolling(window=d).mean()   
+    
+        if not more_details:
+            #不保留指标本身
+            df.drop(columns = ['ad'],inplace=True) 
+
+
+    
+    #过滤日期===================================================================
     _,startpd,endpd=check_period(start,end)
     df1=df[(df.index >= startpd) & (df.index <= endpd)]
     
+    #检查是否加入了计算结果的指标
+    dfcols=list(df)
+    if len(dfcols) > len(dfcols_original):
+        calculated=True
+    else:
+        calculated=False
     
-    return df1
+    return df1,calculated
 
 
 #==============================================================================
@@ -2395,52 +2570,42 @@ def security_technical(ticker,start='default',end='default', \
     return df
 
 #==============================================================================
+#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 if __name__ =="__main__":
     RSI_days=[6,24]
-    
-    OBV_days=5
-    
-    MA_days=[5,20]; MACD_fastperiod=12; MACD_slowperiod=26; MACD_signalperiod=9
-    
-    KDJ_fastk_period=5; KDJ_slowk_period=3; KDJ_slowk_matype=0; KDJ_slowd_period=3
-    KDJ_slowd_matype=0
-    
+    OBV_days=[5,10]
+    MA_days=[5,20]; EMA_days=[5,20]
+    MACD_fastperiod=12; MACD_slowperiod=26; MACD_signalperiod=9
+    KDJ_fastk_period=5; KDJ_slowk_period=3; KDJ_slowk_matype=0; KDJ_slowd_period=3; KDJ_slowd_matype=0
     VOL_fastperiod=5; VOL_slowperiod=10
-    
     PSY_days=12
-    
     ARBR_days=26
-    
     CR_day=16; CR_madays=[5,10,20]
-    
     EMV_day=14; EMV_madays=9
-    
-    BULL_days=20; BULL_nbdevup=2; BULL_nbdevdn=2; BULL_matype=0
-    
+    BULL_day=20; BULL_nbdevup=2; BULL_nbdevdn=2; BULL_matype=0
     TRIX_day=12; TRIX_madays=20
-    
     DMA_fastperiod=10; DMA_slowperiod=50; DMA_madays=10
-    
     BIAS_days=[6,12,24]
-    
-    CCI_days=14
-    
+    CCI_day=14; CCI_madays=[5,10]
     WR_days=[10,6]
-    
     ROC_day=12; ROC_madays=6
-    
     DMI_DIdays=14; DMI_ADXdays=6
+    MFI_day=14; MFI_madays=[3,5]
+    MOM_day=10; MOM_madays=[5,20]
+    SAR_day=4; SAR_madays=[5,20]
+    BETA_day=5; BETA_madays=[5,20]
+    TSF_day=14; TSF_madays=[5,10]
+    AD_day=26; AD_madays=[5,20]
     
-    ticker='AAPL';ticker_type='auto'
-    
-    start='2024-3-1'; end='2024-4-12'; ahead_days=30*3
     
-    technical='EMV'; indicator='Close'
+    ticker='002594.SZ';ticker_type='auto'
+    start='2024-5-1'; end='2024-6-13'; ahead_days=30*8
+    technical='OBV'; indicator='Close'
     
     attention_values=[0,25,50,75]
-    more_details=False
+    more_details=True
     ticker_type='auto'; source='auto'
-    ahead_days=30*4
+    ahead_days=30*8
     resample_freq='6H'; smooth=True;linewidth=1.5
     date_range=False; date_freq=False; annotate=False
     graph=['ALL']; printout=False
@@ -2448,70 +2613,111 @@ if __name__ =="__main__":
         
     facecolor=['whitesmoke','papayawhip']
     price_line_style='dotted'; price_line_color='red'; price_line_width=5; price_line_marker='.'
+    marker_sizes=[30,120,250]
     
-    
-    df=security_technical2(ticker,start,end,technical=technical,marker_sizes=[20,150,300])
+    df=security_technical2(ticker='AAPL',start='2024-5-1',end='2024-6-20', \
+                           technical='CR',more_details=True,loc1='upper left',loc2='lower right')
     
     tlist=['RSI','OBV','MACD','KDJ','VOL','PSY','ARBR','CR','EMV','Bollinger', \
            'TRIX','DMA','BIAS','CCI','W%R','ROC','DMI']
     for t in tlist:
         df=security_technical2(ticker,start,end,technical=t,loc1='lower left',loc2='lower right')
     
-def security_technical2(ticker,start='default',end='default', \
-                        technical=['MACD'],indicator='Close', \
-                        more_details=False, \
-                        attention_values=[0,25,50,75,100], \
-
-                        ticker_type='auto',source='auto', \
-                        
-                        #指标的默认参数
-                        RSI_days=[6,24], \
-                        OBV_days=5, \
-                        
-                        MA_days=[5,20], \
-                        MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
-                        
-                        KDJ_fastk_period=9,KDJ_slowk_period=5,KDJ_slowk_matype=1, \
-                        KDJ_slowd_period=5,KDJ_slowd_matype=1, \
-                        
-                        VOL_fastperiod=5,VOL_slowperiod=10, \
-                        PSY_days=12, \
-                        ARBR_days=26, \
-                        CR_day=16,CR_madays=[5,20], \
-                        EMV_day=14,EMV_madays=9, \
-                        
-                        BULL_days=20,BULL_nbdevup=2,BULL_nbdevdn=2,BULL_matype=0, \
-                        
-                        DMA_fastperiod=10,DMA_slowperiod=50,DMA_madays=10, \
-                        
-                        TRIX_day=12,TRIX_madays=20, \
-                        BIAS_days=[6,24], \
-                        CCI_days=14, \
-                        WR_days=[10,6], \
-                        ROC_day=12,ROC_madays=6, \
-                        DMI_DIdays=14,DMI_ADXdays=6, \
-                        
-                        #数据提前量    
-                        ahead_days=30*4, \
+def security_technical2(ticker,start='default',end='default',technical='MACD', \
                             
-                        #绘图参数
-                        resample_freq='6H',smooth=True,linewidth=1.5, \
-                        date_range=False,date_freq=False,annotate=False, \
-                        
-                        graph=['ALL'],printout=False, \
-                        loc1='best',loc2='best', \
-                        
-                        facecolor=['whitesmoke','papayawhip'], \
-                        #price_line_style=(0,(1,1)), \
-                        price_line_style='dotted', \
-                        price_line_color=['red','green'], \
-                        price_line_width=1,price_line_marker='o', \
-                        marker_sizes=[30,120,250], \
+        #不建议使用复权价，因为最高最低价开盘价没有复权价！    
+        indicator='Close', \
+            
+        #显示指标本身，如果原来未显示的话
+        more_details=False, \
+            
+        #显示关注值水平线，每个指标不同，可自定义多个关注值
+        attention_values=[], \
+
+        ticker_type='auto',source='auto', \
+        
+        #指标的默认参数
+        RSI_days=[6,14], \
+            
+        OBV_days=[5,10], \
+        
+        MA_days=[5,20],EMA_days=[5,20], \
+            
+        MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
+        
+        KDJ_fastk_period=9,KDJ_slowk_period=5,KDJ_slowk_matype=1,KDJ_slowd_period=5,KDJ_slowd_matype=1, \
+        
+        VOL_fastperiod=5,VOL_slowperiod=10, \
+            
+        PSY_days=[6,12], \
+            
+        ARBR_days=[26], \
+            
+        CR_day=30,CR_madays=[10,20,40,60], \
+            
+        EMV_day=14,EMV_madays=[9], \
+        
+        BULL_day=20,BULL_nbdevup=2,BULL_nbdevdn=2,BULL_matype=0, \
+        
+        DMA_fastperiod=10,DMA_slowperiod=50,DMA_madays=[10], \
+        
+        TRIX_day=12,TRIX_madays=[5,10], \
+            
+        BIAS_days=[6,12,24], \
+            
+        CCI_day=14,CCI_madays=[5,10], \
+            
+        WR_days=[13,34,89], \
+            
+        ROC_day=12,ROC_madays=[65,12,18], \
+            
+        DMI_DIdays=7,DMI_ADXdays=6, \
+        
+        #资金流：3日作为信号，5日作为确认信号
+        MFI_day=14,MFI_madays=[3,5], \
+        MOM_day=10,MOM_madays=[5,20], \
+            
+        #需要显示SAR
+        SAR_day=4,SAR_madays=[5,20], \
+            
+        #需要显示BETA
+        BETA_day=5,BETA_madays=[5,20], \
+        
+        #需要显示TSF
+        TSF_day=14,TSF_madays=[5,10], \
+            
+        #需要显示AD
+        AD_day=26,AD_madays=[5,20], \
+        
+        #数据提前量，用于前置计算指标的移动平均值   
+        ahead_days=30*8, \
+            
+        #指标线的绘图参数
+        resample_freq='2H',smooth=True,linewidth=1.5, \
+        date_range=False,date_freq=False, \
+            
+        #未启用    
+        annotate=False, \
+        
+        #除了MACD外，其他指标均应为ALL
+        graph=['ALL'], \
+        printout=False, \
+        loc1='best',loc2='best', \
+        
+        #图形上下半区的背景颜色
+        facecolor=['whitesmoke','papayawhip'], \
+            
+        #价格线的绘图参数
+        #price_line_style=(0,(1,1)), \
+        price_line_style='dotted', \
+        price_line_color=['red','green'], \
+        price_line_width=1,price_line_marker='o', \
+        marker_sizes=[30,120,250], \
                         ):
     """
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
     
-    支持的探索指标：
+    支持的技术分析指标：
     OBV、SAR、VOL、PSY、ARBR、CR、EMV、TRIX、DMA、BIAS、CCI、W%R、ROC、DMI
     支持的其他指标：不如单独的指令功能强
     MACD、RSI、KDJ、BOLL
@@ -2519,6 +2725,14 @@ def security_technical2(ticker,start='default',end='default', \
     关注的阈值：默认[0,25,50,75,100]，attention_values=[0,25,50,75,100], 可以自定义。
     收盘价折线：默认红色虚线，price_line_color='red'
     """
+    # 检查ta-lib是否安装，避免浪费后续的处理
+    try:
+        import talib  
+    except:
+        print("  #Error(security_technical2): lack of necessary package, talib")
+        talib_install_method()
+        return None
+    
     #检查证券代码
     if not isinstance(ticker,str):
         print("  #Warning(security_technical2): not a security code for",ticker)
@@ -2534,11 +2748,13 @@ def security_technical2(ticker,start='default',end='default', \
     
     #检查指标类别
     tech_list={'Bollinger':'布林带','MACD':'指数平滑异同平均', \
-                    'RSI':'相对强弱','KDJ':'随机指标','OBV':'能量潮', \
-                    'SAR':'抛物转向','VOL':'成交量','ARBR':'人气与意愿', \
-                    'CR':'能力线','EMV':'简易波动','TRIX':'三重指数平滑', \
-                    'DMA':'均线差','BIAS':'乖离率','CCI':'顺势线', \
-                    'W%R':'威廉比率','ROC':'变动速率','DMI':'趋向线','PSY':'心理线'}
+                'RSI':'相对强弱','KDJ':'随机指标','OBV':'能量潮', \
+                'SAR':'抛物转向','VOL':'成交量','ARBR':'人气与意愿', \
+                'CR':'能力线','EMV':'简易波动','TRIX':'三重指数平滑', \
+                'DMA':'均线差','BIAS':'乖离率','CCI':'顺势线', \
+                'W%R':'威廉比率','ROC':'变动速率','DMI':'趋向线','PSY':'心理线', \
+                'MFI':'资金流','MOM':'动量指标','BETA':'动态贝塔', \
+                'TSF':'时间序列预测','AD':'量价指标','MA':'移动平均','EMA':'指数移动平均'}
 
     technical1=technical
     if isinstance(technical,list):
@@ -2553,7 +2769,12 @@ def security_technical2(ticker,start='default',end='default', \
         
     #抓取抓取价格数据
     fromdate1=date_adjust(fromdate,adjust=-ahead_days)
-    price,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1, \
+    if 'Adj' in indicator.title():
+        adjust='Adj_only' #最高最低价开盘收盘价均为复权价
+    else:
+        adjust=''
+        
+    price,found=get_price_1ticker_mixed(ticker=ticker,fromdate=fromdate1,adjust=adjust, \
                                         todate=todate,ticker_type=ticker_type,fill=False,source=source)
 
     if found not in ['Found']:
@@ -2566,10 +2787,6 @@ def security_technical2(ticker,start='default',end='default', \
     
     #分位数
     import numpy as np
-    """
-    max(price['up_down_abs'])
-    min(price['up_down_abs'])
-    """
     q70=np.percentile(price['up_down_abs'],70)
     q30=np.percentile(price['up_down_abs'],30)
     
@@ -2577,57 +2794,58 @@ def security_technical2(ticker,start='default',end='default', \
     price['marker_size']=price['up_down_abs'].apply(lambda x: big_size if x>=q70 else mid_size if x>=q30 else small_size)
     
     #计算技术指标
-    df=calc_technical(price,fromdate,todate, \
-                       RSI_days=RSI_days, \
-                       OBV_days=OBV_days, \
-                           
-                       MA_days=MA_days, \
-                       MACD_fastperiod=MACD_fastperiod, \
-                       MACD_slowperiod=MACD_slowperiod, \
-                       MACD_signalperiod=MACD_signalperiod, \
-                           
-                       KDJ_fastk_period=KDJ_fastk_period, \
-                       KDJ_slowk_period=KDJ_slowk_period, \
-                       KDJ_slowk_matype=KDJ_slowk_matype, \
-                       KDJ_slowd_period=KDJ_slowd_period, \
-                       KDJ_slowd_matype=KDJ_slowd_matype, \
-                           
-                       VOL_fastperiod=VOL_fastperiod, \
-                       VOL_slowperiod=VOL_slowperiod, \
-                           
-                       PSY_days=PSY_days, \
-                       ARBR_days=ARBR_days, \
-                       CR_day=CR_day,CR_madays=CR_madays, \
-                       EMV_day=EMV_day,EMV_madays=EMV_madays, \
-                           
-                       BULL_days=BULL_days,BULL_nbdevup=BULL_nbdevup, \
-                       BULL_nbdevdn=BULL_nbdevdn,BULL_matype=BULL_matype, \
-                           
-                       DMA_fastperiod=DMA_fastperiod, \
-                       DMA_slowperiod=DMA_slowperiod,DMA_madays=DMA_madays, \
-                           
-                       TRIX_day=TRIX_day,TRIX_madays=TRIX_madays, \
-                       BIAS_days=BIAS_days, \
-                       CCI_days=CCI_days, \
-                       WR_days=WR_days, \
-                       ROC_day=ROC_day,ROC_madays=ROC_madays, \
-                       DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays, \
-                       
-                       indicator=indicator, \
-                       more_details=more_details)
-    #未安装talib
-    if df is None:
-        return None
-    
-    if len(df) == 0:
-        print("  #Warning(security_technical2): zero records calculated for",technical,"using indicator",indicator)
-        return None
+    df,calculated=calc_technical(price,fromdate,todate,technical=technical, \
+                          
+            RSI_days=RSI_days, \
+            OBV_days=OBV_days, \
+                
+            MA_days=MA_days,EMA_days=EMA_days, \
+                
+            MACD_fastperiod=MACD_fastperiod,MACD_slowperiod=MACD_slowperiod,MACD_signalperiod=MACD_signalperiod, \
+                
+            KDJ_fastk_period=KDJ_fastk_period,KDJ_slowk_period=KDJ_slowk_period, \
+            KDJ_slowk_matype=KDJ_slowk_matype,KDJ_slowd_period=KDJ_slowd_period,KDJ_slowd_matype=KDJ_slowd_matype, \
+                
+            VOL_fastperiod=VOL_fastperiod,VOL_slowperiod=VOL_slowperiod, \
+                
+            PSY_days=PSY_days, \
+            ARBR_days=ARBR_days, \
+            CR_day=CR_day,CR_madays=CR_madays, \
+            EMV_day=EMV_day,EMV_madays=EMV_madays, \
+                
+            BULL_day=BULL_day,BULL_nbdevup=BULL_nbdevup,BULL_nbdevdn=BULL_nbdevdn,BULL_matype=BULL_matype, \
+                
+            DMA_fastperiod=DMA_fastperiod,DMA_slowperiod=DMA_slowperiod,DMA_madays=DMA_madays, \
+                
+            TRIX_day=TRIX_day,TRIX_madays=TRIX_madays, \
+            BIAS_days=BIAS_days, \
+            CCI_day=CCI_day,CCI_madays=CCI_madays, \
+            WR_days=WR_days, \
+            ROC_day=ROC_day,ROC_madays=ROC_madays, \
+            DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays, \
+                
+            MFI_day=MFI_day,MFI_madays=MFI_madays, \
+            MOM_day=MOM_day,MOM_madays=MOM_madays, \
+                
+            #需要显示SAR
+            SAR_day=SAR_day,SAR_madays=SAR_madays, \
+                
+            #需要显示BETA
+            BETA_day=BETA_day,BETA_madays=BETA_madays, \
+            
+            #需要显示TSF
+            TSF_day=TSF_day,TSF_madays=TSF_madays, \
+                
+            #需要显示AD
+            AD_day=AD_day,AD_madays=AD_madays, \
+            
+            indicator=indicator, \
+            more_details=more_details)
 
     #技术指标的绘图线
     tech_line_default={'RSI':['rsi'],
                     'OBV':['obv'],
                     'MACD':['DIF','DEA'],
-                    #'KDJ':['kdj_k','kdj_d','kdj_j'],
                     'KDJ':['kdj'],
                     'SAR':['sar'],
                     'VOL':['vol'],
@@ -2642,9 +2860,23 @@ def security_technical2(ticker,start='default',end='default', \
                     'W%R':['wr'],
                     'ROC':['roc'],
                     'DMI':['pdi','mdi'],
-                    'DMA':['dma'],}
+                    'DMA':['dma'],
+                    'MFI':['mfi'],
+                    'MOM':['mom'],
+                    'BETA':['beta'],
+                    'TSF':['tsf'],
+                    'AD':['ad'],
+                    'MA':['ma'],'EMA':['ema'],
+                    }
+        
+    #检查计算结果：有问题？
+    if not calculated:
+        print("  #Warning(security_technical2): unsupported technical parameter",technical)
+        print("  Supported technical parameters:")
+        printlist(sorted(list(tech_line_default.keys())),numperline=11,beforehand='  ',separator=' ')
+        return None
     
-    #数据后处理
+    #绘图数值缩放比例，以便使指标数量级与股价更加协调
     magnitude_list={'RSI':[1,''],
                     'OBV':[1/1000000,'百万'],
                     'MACD':[1,''],
@@ -2654,15 +2886,21 @@ def security_technical2(ticker,start='default',end='default', \
                     'PSY':[1,''],
                     'ARBR':[1,''],
                     'CR':[1,''],
-                    'EMV':[1,''],
+                    'EMV':[100000000,'亿分之一'],
                     'Bollinger':[1,''],
-                    'TRIX':[1,''],
+                    'TRIX':[100,'百分之一'],
                     'BIAS':[1,''],
                     'CCI':[1,''],
                     'W%R':[1,''],
                     'ROC':[1,''],
                     'DMI':[1,''],
                     'DMA':[1,''],
+                    'MA':[1,''],'EMA':[1,''],
+                    'MFI':[1,''],
+                    'MOM':[1,''],
+                    'BETA':[1,''],
+                    'TSF':[1,''],
+                    'AD':[1/1000000,'百万'],
                     'Volume':[1/1000000,'百万']}
 
     mag_times=magnitude_list[technical1][0]
@@ -2698,27 +2936,21 @@ def security_technical2(ticker,start='default',end='default', \
     df['Volume']=df['Volume'] * magnitude_list['Volume'][0]
     
     #字段排序
-    tech_line_collist.sort()
-    df1=df[tech_line_collist+[indicator,'Volume','up_down','marker_size']]
+    #tech_line_collist.sort()
+    if 'marker_size' in tech_line_collist:
+        df1=df[tech_line_collist+[indicator,'Volume','up_down']]
+    else: 
+        df1=df[tech_line_collist+[indicator,'Volume','up_down','marker_size']]
     
     #绘图----------------------------------------------------------------------
+    print('') #距离上条信息空一行
+    
     import matplotlib.pyplot as plt
     import matplotlib.dates as mdates
     #import matplotlib.gridspec as gridspec
-    """
-    fig = plt.figure()
-    ax = fig.add_subplot(111)
-    """
-    """
-    #图ax在上方，ax3在下方
-    fig, (ax, ax3) = plt.subplots(2, sharex=True,figsize=(12,9))
     
-    #plt.gca().set_facecolor('whitesmoke')
-    fig.gca().set_facecolor(facecolor) #放在这里生效，放尾部不生效
-    """
     # 创建两行的布局，上半部分高度为4，下半部分高度为1
     fig = plt.figure(figsize=(14,9))
-    #fig.gca().set_facecolor(facecolor)
     
     if isinstance(facecolor,str):
         facecolor1=facecolor2=facecolor
@@ -2744,34 +2976,12 @@ def security_technical2(ticker,start='default',end='default', \
     except:
         ax3.set_facecolor('papayawhip')
         
-    """
-    line0=False; line30=False; line50=False; line80=False
-    for l in tech_line_collist:
-        lmax=df1[l].max(); lmin=df1[l].min()
-        if lmax * lmin < 0: line0=True
-        if 100 >= lmax >= 30 and 0 <= lmin <= 30: line30=True
-        if 100 >= lmax >= 50 and 0 <= lmin <= 50: line50=True
-        if 100 >= lmax >= 80 and 0 <= lmin <= 80: line80=True
-        
-        ax.plot(df1.index,df1[l],label=l) 
-    
-    #绘制0线
-    if line0:
-        plt.axhline(y=0,ls=":",c="black",linewidth=2)
-    #绘制30线
-    if line30:
-        plt.axhline(y=30,ls=":",c="green",linewidth=2)
-    #绘制50线
-    if line50:
-        plt.axhline(y=50,ls=":",c="black",linewidth=2)    
-    #绘制50线
-    if line80:
-        plt.axhline(y=80,ls=":",c="black",linewidth=2)
-    """
     color_list=['k','g','b','c','m','y','r']
     attention_draws=[False] * len(attention_values)
 
     for l in tech_line_collist:
+        if l == 'marker_size': continue
+        
         labeltxt=l.upper()
         if labeltxt =='DEA':
             labeltxt='慢线(DEA)'
@@ -2787,7 +2997,7 @@ def security_technical2(ticker,start='default',end='default', \
             pos=attention_values.index(al)
             
             line_al=False
-            if lmax >= al >= lmin: 
+            if (lmax >= al) and (al >= lmin): 
                 line_al=True
             
             #如果需要绘制关注线，且尚未绘制过，则绘制
@@ -2800,7 +3010,22 @@ def security_technical2(ticker,start='default',end='default', \
     if mag_label != '':
         ylabeltxt1=ylabeltxt1+'('+mag_label+')'
     ax.set_ylabel(ylabeltxt1,fontsize=ylabel_txt_size)
-    ax.legend(loc=loc1,fontsize=legend_txt_size)
+    
+    #对图例项目排序
+    # 获取图例句柄和标签
+    handles, labels = ax.get_legend_handles_labels()
+     
+    # 指定显示顺序
+    labels_sorted = sort_list_by_len(labels,reverse=False)
+    handles_sorted = []
+    for l in labels_sorted:
+        pos=labels.index(l)
+        h=handles[pos]
+        handles_sorted =handles_sorted +[h]
+     
+    # 在指定位置添加新的图例，并按照指定顺序显示
+    ax.legend(handles=handles_sorted,labels=labels_sorted,loc=loc1,fontsize=legend_txt_size)
+    #ax.legend(loc=loc1,fontsize=legend_txt_size)
     
     interval=int(len(df1)/10)+1
     ax.xaxis.set_major_locator(mdates.DayLocator(interval=interval))  # 隔interval天一个标记
@@ -2842,12 +3067,10 @@ def security_technical2(ticker,start='default',end='default', \
         if df1seg['up_down'].values[0] >=0:
             seg_color=price_line_color1
             #labeltxt=ylabeltxt2+'(当日↑)'
-            #labeltxt=ylabeltxt2+'(当日≥开盘价)'
             labeltxt=ylabeltxt2+'(当日阳线)'
         else:
             seg_color=price_line_color2
             #labeltxt=ylabeltxt2+'(当日↓)'
-            #labeltxt=ylabeltxt2+'(当日<开盘价)'
             labeltxt=ylabeltxt2+'(当日阴线)'
             
         if first_time:
@@ -2856,22 +3079,11 @@ def security_technical2(ticker,start='default',end='default', \
             second_time=False
         else:
             labeltxt=''
-        """    
-        ax2.plot(df1seg.index,df1seg[indicator],label=labeltxt, \
-                 linestyle=':',color=seg_color,lw=price_line_width,marker=price_line_marker)   
-        """
+            
         ax2.scatter(df1seg.index,df1seg[indicator], \
                     s=df1seg['marker_size'], \
                     label=labeltxt, \
                     linestyle=':',color=seg_color,lw=price_line_width,marker=price_line_marker)   
-        
-        
-    """
-    ax2.plot(df1.index,df1[indicator],label=ylabeltxt2, \
-             linestyle=price_line_style,color=price_line_color1,lw=price_line_width,marker=price_line_marker)   
-    ax2.scatter(df1down.index,df1down[indicator],label=ylabeltxt2, \
-             linestyle=price_line_style,color=price_line_color2,lw=price_line_width,marker=price_line_marker)   
-    """
     
     ax2.legend(loc=loc2,fontsize=legend_txt_size)
     
@@ -2879,11 +3091,11 @@ def security_technical2(ticker,start='default',end='default', \
     ax3.bar(df1up.index,df1up['Volume'],color=price_line_color1)
     ax3.bar(df1down.index,df1down['Volume'],color=price_line_color2)
     
-    ax3.set_ylabel("交易量(百万)",fontsize=ylabel_txt_size -4)
+    ax3.set_ylabel("交易量(百万股)",fontsize=ylabel_txt_size -4)
     
-    footnote1="\n注：快线自下而上穿过慢线为金叉，自上而下穿过慢线为死叉。"
-    footnote2="价格曲线上端点的大中小对应当日涨跌幅度三分位数的高中低部分。\n"
-    footnote3="横轴日期上的空白处为非交易日（周末或公共节假日）。"
+    footnote1="\n注："
+    footnote2="价格曲线端点大中小对应当日涨跌幅度的高中低情形。"
+    footnote3="横轴日期上的空白处为非交易日。\n"
     
     import datetime; todaydt = str(datetime.date.today())
     footnote4="数据来源：新浪/雅虎/stooq/东方财富等，"+todaydt+"统计"