siat 2.14.2__py3-none-any.whl → 3.0.0__py3-none-any.whl

siat/security_trend2.py

@@ -68,6 +68,7 @@ if __name__=='__main__':
     loc1='upper left'
     loc2='lower right'
     source='auto'
+    ticker_type='auto'
     
     df=security_trend(ticker,indicator=indicator)
     
@@ -78,7 +79,6 @@ if __name__=='__main__':
     end="2020-6-30"
     
     
-    
 def security_trend(ticker,indicator='Close', \
                    start='default',end='default', \
                        
@@ -97,7 +97,8 @@ def security_trend(ticker,indicator='Close', \
                    preprocess='none',scaling_option='start', \
                    annotate=False,annotate_value=False, \
                    printout=False,source='auto', \
-                   mark_top=1,mark_bottom=1,mark_end=False):
+                   mark_top=True,mark_bottom=True,mark_end=False, \
+                   ticker_type='auto'):
 
     """
     功能：组合指令，分析证券指标走势，支持多个证券、多个指标和多种绘图方式。
@@ -164,6 +165,7 @@ def security_trend(ticker,indicator='Close', \
     若指定雅虎财经数据源，需要拥有访问该网站的权限。
     """    
     portfolio_flag=False #标志：ticker中是否含有投资组合
+    ticker=tickers_cvt2yahoo(ticker) #支持多种形式证券代码格式
     
     # 检查证券代码
     if isinstance(ticker,str):
@@ -193,7 +195,7 @@ def security_trend(ticker,indicator='Close', \
     # 处理K线图=================================================================
     if kline and not kline_demo:
         if portfolio_flag:
-            print("  #Error(security_trend): ticker of or with portfolio portfolio does not support for K line")
+            print("  #Warning(security_trend): ticker of or with portfolio does not support for K line")
             return None
         
         # 跟踪
@@ -202,24 +204,24 @@ def security_trend(ticker,indicator='Close', \
             fromdate=date_adjust(todate,adjust=-60)
         if not isinstance(mav,list):
             mav=[mav]
-        df=candlestick(stkcd=tickers[0],fromdate=fromdate,todate=todate,mav=mav)
+        df=candlestick(stkcd=tickers[0],fromdate=fromdate,todate=todate,mav=mav,ticker_type=ticker_type)
         return df
 
     if kline and kline_demo:
         if portfolio_flag:
-            print("  #Error(security_trend): ticker of or with portfolio portfolio does not support for K line")
+            print("  #Warning(security_trend): ticker of or with portfolio does not support for K line")
             return None
         
         if start in ['default']:
             fromdate=date_adjust(todate,adjust=-7)
         
-        df=candlestick_demo(tickers[0],fromdate=fromdate,todate=todate)
+        df=candlestick_demo(tickers[0],fromdate=fromdate,todate=todate,ticker_type=ticker_type)
         return df
 
     # 处理股票分红和股票分拆：需要访问雅虎财经=====================================
     if stock_dividend:
         if portfolio_flag:
-            print("  #Error(security_trend): ticker of or with portfolio portfolio does not support for stock dividend")
+            print("  #Warning(security_trend): ticker of or with portfolio does not support for stock dividend")
             return None
         
         if start in ['default']:
@@ -230,7 +232,7 @@ def security_trend(ticker,indicator='Close', \
 
     if stock_split:
         if portfolio_flag:
-            print("  #Error(security_trend): ticker of or with portfolio does not support for stock split")
+            print("  #Warning(security_trend): ticker of or with portfolio does not support for stock split")
             return None
         
         if start in ['default']:
@@ -331,10 +333,11 @@ def security_trend(ticker,indicator='Close', \
         return None
     
     #检查指标是否支持投资组合：暂不支持组1/3的指标
+    """
     if portfolio_flag and (indicator_group1 or indicator_group3):
-        print("  #Error(security_trend): ticker of or with portfolio does not support indicator",list2str(measures))
+        print("  #Warning(security_trend): ticker of or with portfolio does not support indicator",list2str(measures))
         return None
-    
+    """
     # 情形1：单个证券，单个普通指标===============================================
     # 绘制横线
     zeroline=False
@@ -348,15 +351,17 @@ def security_trend(ticker,indicator='Close', \
                               zeroline=zeroline, \
                               average_value=average_value, \
                               datatag=datatag,power=power,graph=graph, \
-                              source=source, 
-                              mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
+                              source=source, \
+                              mark_top=mark_top,mark_bottom=mark_bottom, \
+                              mark_end=mark_end,ticker_type=ticker_type)
         return df
     
     # 情形2：单个证券，两个普通指标，twinx==True =================================
     if ticker_num==1 and indicator_num == 2 and indicator_group1 and twinx:
         df=compare_security(tickers=tickers[0],measures=measures[:2], \
                             fromdate=fromdate,todate=todate,twinx=twinx, \
-                            loc1=loc1,loc2=loc2,graph=graph,source=source)
+                            loc1=loc1,loc2=loc2,graph=graph,source=source, \
+                            ticker_type=ticker_type)
         return df
     
     # 情形3：单个证券，两个及以上普通指标=========================================
@@ -367,14 +372,16 @@ def security_trend(ticker,indicator='Close', \
                          date_range=date_range,date_freq=date_freq, \
                          annotate=annotate,annotate_value=annotate_value, \
                          source=source,
-                         mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
+                         mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                         ticker_type=ticker_type)
         return df
     
     # 情形4：两个证券，取第一个普通指标，twinx==True =============================
     if ticker_num==2 and indicator_group1 and twinx:
         df=compare_security(tickers=tickers,measures=measures[0], \
                             fromdate=fromdate,todate=todate,twinx=twinx, \
-                            loc1=loc1,loc2=loc2,graph=graph,source=source)
+                            loc1=loc1,loc2=loc2,graph=graph,source=source, \
+                            ticker_type=ticker_type)
         return df
 
     # 情形5：两个及以上证券，取第一个普通指标=====================================
@@ -403,7 +410,8 @@ def security_trend(ticker,indicator='Close', \
                       annotate=annotate,annotate_value=annotate_value, \
                       smooth=smooth, \
                       source=source, \
-                      mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
+                      mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                      ticker_type=ticker_type)
         return df
 
     # 情形6：单个或多个证券，单个或多个RAR指标，支持投资组合=======================
@@ -414,48 +422,21 @@ def security_trend(ticker,indicator='Close', \
                                  graph=graph,axhline_value=0,axhline_label='', \
                                  printout=printout, \
                                  sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
-                                 annotate=annotate,mktidx=market_index,source=source)  
-        """
-        df=compare_1security_mrar(ticker=tickers[0],rar_names=measures, \
-                                  start=fromdate,end=todate, \
-                        market=market,market_index=market_index,RF=RF,window=window, \
-                        axhline_value=0,axhline_label='零线',graph=graph,printout=printout, \
-                        sortby=sortby,source=source,trailing=trailing,trend_threshhold=trend_threshhold, \
-                        annotate=annotate)
-        """
+                                 annotate=annotate,mktidx=market_index,source=source, \
+                                 ticker_type=ticker_type)  
         return df
     
-    """
-    # 情形7：多个证券，取第一个RAR指标===========================================
-    # 特别注意：与收益率对比时若使用扩展收益率可能导致矛盾，要使用滚动收益率
-    if indicator_group2 and ticker_num > 1:
-        df=compare_mrar(tickers=tickers,rar_name=measures[0], \
-                        start=fromdate,end=todate, \
-                        market=market,market_index=market_index,RF=RF,window=window, \
-                        axhline_value=0,axhline_label='零线',graph=graph,printout=printout, \
-                        sortby=sortby,source=source,trailing=trailing,trend_threshhold=trend_threshhold, \
-                        annotate=annotate)
-        return df
-    """
     # 情形7：单个或多个证券，CAPM贝塔系数=========================================
     if indicator_group4:
         df=compare_beta_security(ticker=tickers,start=fromdate,end=todate, \
                                  RF=RF,regression_period=regression_period, \
                                  graph=graph,annotate=annotate, \
-                                 mktidx=market_index,source=source)
+                                 mktidx=market_index,source=source,ticker_type=ticker_type)
         
-        """
-        df=compare_mrar(tickers=tickers,rar_name=measures[0], \
-                        start=fromdate,end=todate, \
-                        market=market,market_index=market_index,RF=RF,window=window, \
-                        axhline_value=0,axhline_label='零线',graph=graph,printout=printout, \
-                        sortby=sortby,source=source,trailing=trailing,trend_threshhold=trend_threshhold, \
-                        annotate=annotate)
-        """
         return df
     
     
-    # 情形8：估值指标PE/PB/MV/ROE===============================================
+    # 情形8：估值指标PE/PB/MV/ROE，仅针对股票，无需ticker_type====================
     if indicator_group3:
         df=security_valuation(tickers=tickers,indicators=measures,start=fromdate,end=todate, \
                               preprocess=preprocess,scaling_option=scaling_option, \