siat 3.8.2__py3-none-any.whl → 3.8.20__py3-none-any.whl

siat/risk_adjusted_return2.py

@@ -811,6 +811,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
                          ret_type="Annual Adj Ret%",RF=0,regression_period=365, \
                              attention_value='',attention_value_area='', \
                              attention_point='',attention_point_area='', \
+                                 band_area='', \
                          graph=True,loc1='best', \
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -843,7 +844,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
         regression_period=regression_period[0]
     
     tname=ticker_name(ticker,ticker_type)
-    print("  Starting to retrieve and calculate different rar for",tname,"\b, please wait ......\n")
+    print("  Working on different rars for",tname,"\b, please wait ......\n")
 
     #预处理ticker_type
     ticker_type=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)
@@ -876,7 +877,14 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
         if df1[c].max() > axhline_value and df1[c].min() < axhline_value:
             axhline_label='零线'   
         
-        df1.rename(columns={c:ectranslate(c)},inplace=True)
+        cname=ectranslate(c)
+        df1.rename(columns={c:cname},inplace=True)
+        
+        # 将band_area中的ticker替换为tname
+        if band_area != '':
+            for index, item in enumerate(band_area):
+                if item == c:
+                    band_area[index] = cname           
     
     footnote1=text_lang("评估值基于","Note: RaR based on ")+ectranslate(ret_type)
     if RF !=0:
@@ -914,6 +922,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate, \
+                       band_area=band_area, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
             
@@ -974,6 +983,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                          ret_type="Annual Adj Ret%",RF=0,regression_period=365, \
                              attention_value='',attention_value_area='', \
                              attention_point='',attention_point_area='', \
+                                 band_area='', \
                          graph=True,loc1='best', \
                          axhline_value=0,axhline_label='', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1006,7 +1016,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         RF=RF[0]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Starting to retrieve and calculate",rar,"\b, please wait ......\n")
+    print("  Working on",rar,"ratio, please wait ......\n")
     
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)
@@ -1027,7 +1037,14 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
             continue
         else:
             dft=df_tmp[[rar]]
-            dft.rename(columns={rar:ticker_name(t,tt)},inplace=True)
+            tname=ticker_name(t,tt)
+            dft.rename(columns={rar:tname},inplace=True)
+        
+            # 将band_area中的ticker替换为tname
+            if band_area != '':
+                for index, item in enumerate(band_area):
+                    if item == t:
+                        band_area[index] = tname        
             
         if len(df)==0: #第一个
             df=dft 
@@ -1097,6 +1114,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                    title_txt=title_txt,data_label=False, \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
+                            band_area=band_area, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
@@ -1154,6 +1172,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
                          ret_type="Annual Adj Ret%",RF=0,regression_period=365, \
                             attention_value='',attention_value_area='', \
                             attention_point='',attention_point_area='', \
+                                band_area='', \
                          graph=True,loc1='best', \
                          axhline_value=0,axhline_label='', \
                          printout=True,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1184,6 +1203,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
                                  ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                     attention_value=attention_value,attention_value_area=attention_value_area, \
                                     attention_point=attention_point,attention_point_area=attention_point_area, \
+                                        band_area=band_area, \
                                  graph=graph,facecolor=facecolor, \
                                  axhline_value=axhline_value,axhline_label=axhline_label, \
                                  printout=printout,sortby=sortby, \
@@ -1361,6 +1381,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
                          RF=0,regression_period=365, \
                              attention_value='',attention_value_area='', \
                              attention_point='',attention_point_area='', \
+                                 band_area='', \
                          graph=True,loc1='best', \
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1392,7 +1413,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
         RF=RF[0]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Working on",rar,"for",ticker_name(ticker,ticker_type),"in different returns, please wait ......\n")
+    print("  Working on",rar,"ratio for",ticker_name(ticker,ticker_type),"in different return types ......\n")
         
     df=pd.DataFrame() 
     for t in ret_type:
@@ -1406,8 +1427,15 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
             break
         else:
             dft=df_tmp[[rar]]
+            tname=text_lang("基于","Based on ")+ectranslate(t)
             dft.rename(columns={rar:text_lang("基于","Based on ")+ectranslate(t)},inplace=True)
             
+            # 将band_area中的ticker替换为tname
+            if band_area != '':
+                for index, item in enumerate(band_area):
+                    if item == t:
+                        band_area[index] = tname               
+            
         if len(df)==0: #第一个
             df=dft 
         else:
@@ -1457,6 +1485,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate, \
+                       band_area=band_area, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
             
@@ -1514,6 +1543,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
                          ret_type="Annual Adj Ret%",RF=[0,0.02,0.05],regression_period=365, \
                             attention_value='',attention_value_area='', \
                             attention_point='',attention_point_area='', \
+                                band_area='', \
                          graph=True,loc1='best', \
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
@@ -1546,7 +1576,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
         RF=[RF]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Starting to retrieve and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different RF, please wait ......\n")
+    print("  Working on",rar,"ratio for",ticker_name(ticker,ticker_type),"in different RF levels ......\n")
         
     df=pd.DataFrame() 
     for t in RF:
@@ -1560,7 +1590,14 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
             break
         else:
             dft=df_tmp[[rar]]
-            dft.rename(columns={rar:text_lang("基于无风险利率","Based on RF=")+str(round(t*100,4))+'%'},inplace=True)
+            tname=text_lang("RF=","RF=")+str(round(t*100,4))+'%'
+            dft.rename(columns={rar:tname},inplace=True)
+            
+            # 将band_area中的ticker替换为tname
+            if band_area != '':
+                for index, item in enumerate(band_area):
+                    if item == t:
+                        band_area[index] = tname              
             
         if len(df)==0: #第一个
             df=dft 
@@ -1605,6 +1642,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \
                    annotate=annotate,annotate_value=annotate, \
+                       band_area=band_area, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
                    facecolor=facecolor,loc=loc1)
             
@@ -1679,6 +1717,7 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                          regression_period=365, \
                             attention_value='',attention_value_area='', \
                             attention_point='',attention_point_area='', \
+                                band_area='', \
                          graph=True,loc1='best', \
                          axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
@@ -1712,6 +1751,7 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                 attention_value=attention_value,attention_value_area=attention_value_area, \
                                 attention_point=attention_point,attention_point_area=attention_point_area, \
+                                    band_area=band_area, \
                             graph=graph,loc1=loc1, \
                             axhline_value=axhline_value,axhline_label=axhline_label, \
                             printout=printout, \
@@ -1722,12 +1762,13 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             ticker_type=ticker_type,facecolor=facecolor)
                 return df
                 
-            if rar_num >1:    #多个RAR    
+            if rar_num >1:    #多个RAR，此项的主要意图并非绘图，而是进行多指标综合推荐   
                 printout=True #否则无法运行descriptive_statistics2函数
                 df=compare_mticker_mrar(ticker=ticker,start=start,end=end,rar=rar, \
                             ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                 attention_value=attention_value,attention_value_area=attention_value_area, \
                                 attention_point=attention_point,attention_point_area=attention_point_area, \
+                                    band_area=band_area, \
                             graph=graph,loc1=loc1, \
                             axhline_value=axhline_value,axhline_label=axhline_label, \
                             printout=printout, \
@@ -1753,6 +1794,7 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                 attention_value=attention_value,attention_value_area=attention_value_area, \
                                 attention_point=attention_point,attention_point_area=attention_point_area, \
+                                    band_area=band_area, \
                             graph=graph,loc1=loc1, \
                             axhline_value=axhline_value,axhline_label=axhline_label, \
                             printout=printout,facecolor=facecolor, \
@@ -1776,6 +1818,7 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                 attention_value=attention_value,attention_value_area=attention_value_area, \
                                 attention_point=attention_point,attention_point_area=attention_point_area, \
+                                    band_area=band_area, \
                             graph=graph,loc1=loc1, \
                             axhline_value=axhline_value,axhline_label=axhline_label, \
                             printout=printout, \
@@ -1797,6 +1840,7 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                             ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                 attention_value=attention_value,attention_value_area=attention_value_area, \
                                 attention_point=attention_point,attention_point_area=attention_point_area, \
+                                    band_area=band_area, \
                             graph=graph,loc1=loc1, \
                             axhline_value=axhline_value,axhline_label=axhline_label, \
                             printout=printout,facecolor=facecolor, \

siat/risk_evaluation.py

@@ -40,7 +40,8 @@ if czxt in ['linux']: #website Jupyter
 plt.rcParams['axes.unicode_minus'] = False 
 #==============================================================================
 #统一设定绘制的图片大小：数值为英寸，1英寸=100像素
-plt.rcParams['figure.figsize']=(12.8,7.2)
+#plt.rcParams['figure.figsize']=(12.8,7.2)
+plt.rcParams['figure.figsize']=(12.8,6.4)
 plt.rcParams['figure.dpi']=300
 plt.rcParams['font.size'] = 13
 plt.rcParams['xtick.labelsize']=11 #横轴字体大小
@@ -742,7 +743,8 @@ def plot_rets_histogram(ticker,start,end,num_bins=20):
     sigma=rets.std()
     
     #绘制股票收益率直方图
-    plt.figure(figsize=(8,4))
+    #plt.figure(figsize=(8,4))
+    plt.figure(figsize=(12.8,6.4))
     n,bins,patches=plt.hist(rets,num_bins,facecolor='blue',alpha=0.5,label=ticker_name(ticker))
     
     #生成与直方图柱子对应的正态分布概率密度
@@ -789,7 +791,7 @@ def plot_rets_curve(ticker,start,end):
     import numpy as np
     x=mu+sigma*np.random.randn(1000000)    
         
-    #plt.figure(figsize=(8,4))
+    #plt.figure(figsize=(12.8,6.4))
     import seaborn as sns
     #绘制曲线：股票收益率
     sns.kdeplot(data=rets,shade=True,color='blue',legend=True,label=ticker_name(ticker),lw=2) 
@@ -1435,7 +1437,7 @@ def series_VaR_tlcp(tickerlist,today,alpha=0.99,pastyears=1,model="montecarlo"):
     #tlcpdf.reset_index(drop=True)    
     tlcpdf.set_index('Ticker',drop=True,inplace=True)
     """
-    #ax=plt.figure(figsize=(8,4))
+    #ax=plt.figure(figsize=(12.8,6.4))
     tlcpdf.plot.barh(x='Ticker',y='TLCP',color='r',grid=True)
     plt.ylabel('股票')
     titlel1="VaR全损临界点(TLCP)"
@@ -1516,7 +1518,8 @@ def plot_VaR_days_changes(ticker,shares,today,dayslist,alpha=0.99, \
 
     #绘图
     if printout == True:
-        plt.figure(figsize=(8,4))
+        #plt.figure(figsize=(8,4))
+        plt.figure(figsize=(12.8,6.4))
         #绘制曲线：ratio
         plt.plot(vardf['ratio%'],color='red',lw=2,label=ticker_name(ticker),marker=markertype)
         #设置标题、图例、坐标轴标签
@@ -1564,7 +1567,8 @@ def compare_VaR_days_changes(tickerlist,shares,today,dayslist,alpha=0.99, \
         return
     
     #依次绘图tickerlist中的各个股票
-    plt.figure(figsize=(8,4))
+    #plt.figure(figsize=(8,4))
+    plt.figure(figsize=(12.8,6.4))
     
     markerlist=['.','o','s','*','+','x','1','2']
     for t in tickerlist:

siat/sector_china.py

@@ -2729,7 +2729,8 @@ def industry_correlation_sw(df,tickers,start,end, \
     import seaborn as sns
     sns.set(font='SimHei')  # 解决Seaborn中文显示问题
 
-    fig = plt.figure(figsize=(cm2inch(12,8)))
+    #fig = plt.figure(figsize=(cm2inch(12,8)))
+    fig = plt.figure(figsize=(12.8,6.4))
     ax1 = plt.gca()
     
     #构造mask，去除重复数据显示

siat/security_trend2.py

@@ -198,7 +198,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
     注意：本参数需要特殊访问获取数据。
     
     ret_type、RF、regression_period和market_index：仅用于计算RAR指标和CAPM贝塔系数。
-    ret_type：指定计算RAR的收益率类型，支持滚动和扩展收益率，但不建议混合使用。
+    ret_type：指定计算RAR的收益率类型，支持滚动和扩展收益率，不同种类的计算结果之间不可比。
     RF：指定年化无风险利率，非百分比数值。
     regression_period：指定CAPM回归时的日期期间跨度，为日历日（自然日），默认一年。
     market_index：用于计算CAPM回归贝塔系数时的市场收益率。
@@ -523,6 +523,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                       axhline_value=axhline_value,axhline_label=axhline_label, \
                       preprocess=preprocess,linewidth=linewidth, \
                       scaling_option=scaling_option, \
+                        band_area=band_area, \
                       graph=graph,loc=loc1, \
                       annotate=annotate,annotate_value=annotate_value, \
                       smooth=smooth, \
@@ -539,11 +540,13 @@ def security_trend(ticker,indicator='Close',adjust='', \
             print("Scenario 6: indicator_group2 RAR")
             print("attention_value=",attention_value)
             print("attention_point=",attention_point)
-
+        
+        # ret_type要使用复权价
         df=compare_rar_security(ticker=tickers,start=fromdate,end=todate,rar=measures, \
                                  ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                      attention_value=attention_value,attention_value_area=attention_value_area, \
                                      attention_point=attention_point,attention_point_area=attention_point_area, \
+                                         band_area=band_area, \
                                  graph=graph,axhline_value=0,axhline_label='', \
                                  loc1=loc1, \
                                  printout=printout, \
@@ -556,11 +559,17 @@ def security_trend(ticker,indicator='Close',adjust='', \
     
     # 情形7：单个或多个证券，CAPM贝塔系数=========================================
     if indicator_group4:
+        #if 'adj' in ret_type.lower() and adjust == '':
+        if adjust == '':
+            # 使用前复权价
+            adjust='qfq'
+            
         df=compare_beta_security(ticker=tickers,start=fromdate,end=todate, \
                                  adjust=adjust, \
                                  RF=RF,regression_period=regression_period, \
                                      attention_value=attention_value,attention_value_area=attention_value_area, \
                                      attention_point=attention_point,attention_point_area=attention_point_area, \
+                                         band_area=band_area, \
                                  graph=graph,facecolor=facecolor,loc=loc1, \
                                  annotate=annotate,annotate_value=annotate_value, \
                                  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
@@ -578,6 +587,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                               graph=graph,facecolor=facecolor, \
                                      attention_value=attention_value,attention_value_area=attention_value_area, \
                                      attention_point=attention_point,attention_point_area=attention_point_area, \
+                                         band_area=band_area, \
                               annotate=annotate,annotate_value=annotate_value, \
                               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
         return df

siat/stock.py

@@ -24,7 +24,8 @@ from siat.security_price2 import *
 
 #==============================================================================
 import matplotlib.pyplot as plt
-plt.rcParams['figure.figsize']=(12.8,7.2)
+#plt.rcParams['figure.figsize']=(12.8,7.2)
+plt.rcParams['figure.figsize']=(12.8,6.4)
 plt.rcParams['figure.dpi']=300
 plt.rcParams['font.size'] = 13
 plt.rcParams['xtick.labelsize']=11 #横轴字体大小
@@ -71,7 +72,8 @@ def reset_plt():
     
     #尝试恢复绘图尺寸
     #统一设定绘制的图片大小：数值为英寸，1英寸=100像素
-    plt.rcParams['figure.figsize']=(12.8,7.2)
+    #plt.rcParams['figure.figsize']=(12.8,7.2)
+    plt.rcParams['figure.figsize']=(12.8,6.4)
     plt.rcParams['figure.dpi']=300
     plt.rcParams['font.size'] = 13
     plt.rcParams['xtick.labelsize']=11 #横轴字体大小
@@ -1963,6 +1965,7 @@ def compare_msecurity(tickers,measure,start,end, \
                       preprocess='none',linewidth=1.5, \
                       scaling_option='start', \
                       plus_sign=False, \
+                        band_area='', \
                       graph=True,loc='best',facecolor='whitesmoke', \
                       annotate=False,annotate_value=False, \
                       smooth=True, \
@@ -2046,7 +2049,16 @@ def compare_msecurity(tickers,measure,start,end, \
             continue
         
         df_tmp1=pd.DataFrame(df_tmp[measure])
-        df_tmp1.rename(columns={measure:ticker_name(t,tt)},inplace=True)     
+        
+        tname=ticker_name(t,tt)
+        df_tmp1.rename(columns={measure:tname},inplace=True) 
+        
+        # 将band_area中的ticker替换为tname
+        if band_area != '':
+            for index, item in enumerate(band_area):
+                if item == t:
+                    band_area[index] = tname        
+        
         if len(dfs)==0:
             dfs=df_tmp1
         else:
@@ -2139,6 +2151,7 @@ def compare_msecurity(tickers,measure,start,end, \
                data_label=False,resample_freq='H',smooth=smooth,linewidth=linewidth,loc=loc, \
                     attention_value=attention_value,attention_value_area=attention_value_area, \
                     attention_point=attention_point,attention_point_area=attention_point_area, \
+               band_area=band_area, \
                annotate=annotate,annotate_value=annotate_value,plus_sign=plus_sign, \
                mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor)
 
@@ -2573,7 +2586,7 @@ def candlestick_demo(stkcd,fromdate,todate, \
     
     print('')
     #specify the size of the graph
-    #fig,ax=plt.subplots(figsize=(10,6))	
+    #fig,ax=plt.subplots(figsize=(12.8,6.4))	
     fig,ax=plt.subplots()
     
     #绘制各个价格的折线图

siat/stock_profile.py

@@ -515,7 +515,8 @@ def plot_sustainability(sustainability,option="ESG"):
     else: width=round(2.9/l,2)
     #print("Firms:",s.index,", Width:",width)
 
-    fig,ax=plt.subplots(figsize=(10,6))
+    #fig,ax=plt.subplots(figsize=(10,6))
+    fig,ax=plt.subplots(figsize=(12.8,6.4))
 
     #绘制分数和分位数图     
     if option=="ESG":

siat/stock_technical.py

@@ -25,7 +25,8 @@ from siat.stock import *
 from siat.valuation import *
 #==============================================================================
 import matplotlib.pyplot as plt
-plt.rcParams['figure.figsize']=(12.8,7.2)
+#plt.rcParams['figure.figsize']=(12.8,7.2)
+plt.rcParams['figure.figsize']=(12.8,6.4)
 plt.rcParams['figure.dpi']=300
 plt.rcParams['font.size'] = 13
 plt.rcParams['xtick.labelsize']=11 #横轴字体大小

siat/translate.py

@@ -817,7 +817,7 @@ def codetranslate0(code):
         ['EBAY','易贝'],['eBay','易贝'],['META','元宇宙(脸书)'],['ZM','ZOOM'],
         ['GOOG','谷歌'],['GOOGL','谷歌'],['TWTR','X(推特)'],
         ['VIPS','唯品会'],['Vipshop','唯品会'],
-        ['PDD','拼多多'],['Pinduoduo','拼多多'],        
+        ['PDD','拼多多美股'],['Pinduoduo','拼多多'],        
         ['BABA','阿里巴巴美股'],['Alibaba','阿里巴巴美股'],
         ['JD','京东美股'],['MPNGY','美团美股'],
         ['SINA','新浪网'],['BIDU','百度'],['NTES','网易'],

siat/valuation.py

@@ -944,6 +944,7 @@ def security_valuation(tickers,indicators,start,end, \
                        graph=True,facecolor='whitesmoke', \
                             attention_value='',attention_value_area='', \
                             attention_point='',attention_point_area='', \
+                                band_area='', \
                        annotate=False,annotate_value=False, \
                        mark_top=False,mark_bottom=False,mark_end=False):
     """
@@ -974,6 +975,28 @@ def security_valuation(tickers,indicators,start,end, \
     name_num=len(names1)
     indicator_num=len(indicators1)
 
+        
+    # 将band_area中的ticker替换为tname
+    if band_area != '':
+        if name_num > 1:
+            # 假定band_area里面的是ticker
+            for index, item in enumerate(band_area):
+                tname=ticker_name(item)
+                if tname in names1:
+                    band_area[index] = tname    
+                else:
+                    band_area.remove(item)
+
+        if name_num == 1 and indicator_num > 1:
+            # 假定band_area里面的是indicator
+            for index, item in enumerate(band_area):
+                if item not in indicators1:
+                    band_area.remove(item)
+                    
+        if len(band_area) != 2:
+            band_area=''
+            print("  #Warning(security_valuation): band_area does not match ticker or indicator")
+
     import datetime
     # 绘制一条线+均值/中位数虚线
     if name_num * indicator_num == 1:
@@ -1120,6 +1143,7 @@ def security_valuation(tickers,indicators,start,end, \
                    title_txt=titletxt,data_label=False, \
                    resample_freq='D',loc=loc1, \
                    annotate=annotate,annotate_value=annotate_value, \
+                       band_area=band_area, \
                    plus_sign=plus_sign, \
                    facecolor=facecolor, \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
@@ -1167,6 +1191,7 @@ def security_valuation(tickers,indicators,start,end, \
                    title_txt=titletxt,data_label=False, \
                    resample_freq='D',loc=loc1,plus_sign=plus_sign, \
                    annotate=annotate,annotate_value=annotate_value, \
+                       band_area=band_area, \
                    facecolor=facecolor, \
                         attention_value=attention_value,attention_value_area=attention_value_area, \
                         attention_point=attention_point,attention_point_area=attention_point_area, \

{siat-3.8.2.dist-info → siat-3.8.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: siat
-Version: 3.8.2
+Version: 3.8.20
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -40,14 +40,6 @@ Requires-Dist: translators
 Requires-Dist: nbconvert
 Requires-Dist: ipywidgets
 Requires-Dist: playwright
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary
 
 
 # What is siat?