siat 3.0.3__py3-none-any.whl → 3.0.10__py3-none-any.whl

siat/option_china.py

@@ -2316,6 +2316,7 @@ def fin_option_risk_sse2(option,maturity,exercise,trade_date, \
     #use font size 14 for the bar labels, percentages, and legend, 图例颜色
     plt.legend(fontsize=16,loc=loc)
     
+    plt.gca().set_facecolor('whitesmoke')
     plt.show
     
     return df9
@@ -2582,6 +2583,8 @@ def fin_option_exercise_risk_sse(option,maturity,trade_date, \
     
     titletxt='上交所金融期权风险：'+option+'期权，股指点位对'+ylabeltxt+'的影响'
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
+    
+    plt.gca().set_facecolor('whitesmoke')
     plt.show()
     plt.close()
     

siat/option_pricing.py

@@ -674,6 +674,8 @@ def bsm_maturity(S0,X,Dayrange,r0,sigma,Days1=0,div1=0,graph=True):
     #让横轴逆序从大到小显示，正常顺序为从小到大
     plt.gca().invert_xaxis()
     plt.legend()
+    
+    plt.gca().set_facecolor('whitesmoke')
     plt.show()    
     
     return

siat/risk_adjusted_return.py

@@ -497,6 +497,7 @@ def draw_rar_ratio(rars,portfolio,ratio_name):
     #plt.ylabel(ylabeltxt,fontsize=12)
     #plt.xticks(rotation=45,fontsize=9)
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
+    plt.gca().set_facecolor('whitesmoke')
     #plt.xticks(rotation=30,fontsize=8)
     plt.legend(loc='best') 
     
@@ -946,7 +947,10 @@ def plot_rar_monthly(portfolio,start,end,rar_type):
     titletxt="投资组合的风险调整收益"
     plt.title(titletxt)
     plt.ylabel('收益率(%)')
+    
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
+    plt.gca().set_facecolor('whitesmoke')
+    
     #plt.xticks(rotation=30)
     plt.legend(loc='best')
 
@@ -1033,7 +1037,10 @@ def plot_rar_annual(portfolio,start,end,rar_type):
     titletxt="投资组合的风险调整收益"
     plt.title(titletxt)
     plt.ylabel('收益率(%)')
+    
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
+    plt.gca().set_facecolor('whitesmoke')
+    
     #plt.xticks(rotation=45)
     plt.legend(loc='best')
     

siat/risk_adjusted_return2.py

@@ -547,7 +547,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 retrive and calculate different rar for",tname,"\b, please wait ......")
+    print("  Starting to retrive and calculate different rar for",tname,"\b, please wait ......\n")
 
     #预处理ticker_type
     ticker_type=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)
@@ -590,7 +590,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
 
     footnote3=''
     if 'treynor' in rar or 'alpha' in rar:
-        footnote3="贝塔系数基于日收益率，回归期间"+str(regression_period)+"个自然日"
+        footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
     footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
@@ -628,10 +628,11 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
         elif sortby=='trailing':
             sortby_txt='按推荐标记+短期均值走势降序排列'
         
-        title_txt='***** 风险调整收益评估：'+tname+'，'+sortby_txt+' *****'
+        #title_txt='***** 风险调整收益评估：'+tname+'，'+sortby_txt+' *****'
+        title_txt='风险调整收益评估：'+tname+'，'+sortby_txt
         
         footnote6='期间范围：'+str(start)+'至'+str(end)+"；近期范围：近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)+"。"
-        footnote7="近期趋势和星号为多项因素综合研判，最多五颗星星"
+        footnote7="近期优先趋势和星号为多项因素综合研判，最多五颗星"
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         recommenddf=descriptive_statistics2(df1,title_txt,footnotey,decimals=4, \
@@ -690,7 +691,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 retrive and calculate",rar,"\b, please wait ......")
+    print("  Starting to retrive and calculate",rar,"\b, please wait ......\n")
     
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)
@@ -736,7 +737,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         
     footnote3=''
     if rar.lower() in ['treynor','alpha']:
-        footnote3="贝塔系数基于日收益率，回归期间"+str(regression_period)+"个自然日"
+        footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
     footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
@@ -768,10 +769,11 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         elif sortby=='trailing':
             sortby_txt='按推荐标记+短期均值走势降序排列'
         
-        title_txt='***** 风险调整收益评估：基于'+ectranslate(rar)+'，'+sortby_txt+' *****'
+        #title_txt='***** 风险调整收益评估：基于'+ectranslate(rar)+'，'+sortby_txt+' *****'
+        title_txt='风险调整收益评估：基于'+ectranslate(rar)+'，'+sortby_txt
         
         footnote6='期间范围：'+str(start)+'至'+str(end)+"；近期范围：近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)
-        footnote7="近期趋势和星号为风险调整收益指标数值加趋势等多项因素综合研判，最多五颗星星"
+        footnote7="近期优先趋势和星号为风险调整收益指标数值加趋势等多项因素综合研判，最多五颗星"
         footnotey=footnote6+'\n'+footnote7+'\n'+footnotex
         
         #删除含有Nan的行，否则可能引起近期优先加权平均计算结果市场出现Nan
@@ -864,17 +866,22 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
             sortby_txt='中位数值优先'
         elif sortby=='trailing':
             sortby_txt='短期均值走势优先'
-    
-        titletxt='===风险调整收益综合对比：'+sortby_txt+'==='    
-        print("\n"+titletxt)
         
         df1=df.copy()
         df1.reset_index(drop=True,inplace=True)
         df1.index=df1.index + 1
         
-        df2= df1.style.set_properties(**{'text-align':'center'})
+        # 处理表格标题
+        #titletxt='===风险调整收益综合对比：'+sortby_txt+'==='
+        titletxt='风险调整收益综合对比：'+sortby_txt
+        #print("\n"+titletxt)
+        df2=df1.style.set_caption(titletxt).set_table_styles(
+            [{'selector':'caption',
+              'props':[('color','black'),('font-size','16px'),('font-weight','bold')]}])        
+        
+        df3= df2.set_properties(**{'text-align':'center'})
         from IPython.display import display
-        display(df2)
+        display(df3)
         
         """
         print(df1.to_string(justify='left'))
@@ -912,7 +919,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
         """
         
         #脚注
-        footnote1="注：风险调整收益基于"+ectranslate(ret_type)+"，"
+        footnote1="风险调整收益基于"+ectranslate(ret_type)+"，"
         if RF !=0:
             footnote2="年化无风险利率"+str(round(RF*100,4))+'%'
         else:
@@ -920,7 +927,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
             
         footnote3=''
         if 'treynor' in rar or 'alpha' in rar:
-            footnote3="贝塔系数基于日收益率，回归期间"+str(regression_period)+"个自然日"
+            footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
         
         import datetime; todaydt = datetime.date.today()
         footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
@@ -929,7 +936,8 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
         else:
             footnotex=footnote1+footnote2+'\n'+footnote4
     
-        print("\n"+footnotex)
+        #print("\n"+footnotex)
+        print(footnotex)
  
     return df
 
@@ -983,7 +991,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("  Starting to retrive and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different types of return, please wait ......")
+    print("  Starting to retrive and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different types of return, please wait ......\n")
         
     df=pd.DataFrame() 
     for t in ret_type:
@@ -1024,7 +1032,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
         
     footnote3=''
     if rar.lower() in ['treynor','alpha']:
-        footnote3="贝塔系数基于日收益率，回归期间"+str(regression_period)+"个自然日"
+        footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
     footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
@@ -1057,10 +1065,11 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
         elif sortby=='trailing':
             sortby_txt='按推荐标记+短期均值走势降序排列'
         
-        title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
+        #title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
+        title_txt='风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt
         
         footnote6='期间范围：'+str(start)+'至'+str(end)+"；近期范围：近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)+"。"
-        footnote7="近期趋势和星号为多项因素综合研判，最多五颗星星"
+        footnote7="近期优先趋势和星号为多项因素综合研判，最多五颗星"
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         #删除含有Nan的行
@@ -1125,7 +1134,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 retrive and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different RF, please wait ......")
+    print("  Starting to retrive and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different RF, please wait ......\n")
         
     df=pd.DataFrame() 
     for t in RF:
@@ -1163,7 +1172,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
         
     footnote3=""
     if rar.lower() in ['treynor','alpha']:
-        footnote3="贝塔系数基于日收益率，回归期间"+str(regression_period)+"个自然日"
+        footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
     footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
@@ -1196,10 +1205,11 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
         elif sortby=='trailing':
             sortby_txt='按推荐标记+短期均值走势降序排列'
         
-        title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
+        #title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
+        title_txt='风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt
         
         footnote6='期间范围：'+str(start)+'至'+str(end)+"；近期范围：近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)+"。"
-        footnote7="近期趋势和星号为多项因素综合研判，最多五颗星星"
+        footnote7="近期优先趋势和星号为多项因素综合研判，最多五颗星"
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         #删除含有Nan的行

siat/risk_evaluation.py

@@ -293,6 +293,8 @@ def series_VaR_normal_standard(ticker,shares,datelist, \
     import datetime as dt; today=dt.date.today()   
     footnote="数据来源：新浪/stooq，"+str(today)    
     plt.xlabel(footnote)
+    
+    plt.gca().set_facecolor('whitesmoke')
     plt.show()    
     
     plt.plot(result3['VaR比例%'],c='r',lw=2)  
@@ -302,6 +304,8 @@ def series_VaR_normal_standard(ticker,shares,datelist, \
     #plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
     plt.xticks(rotation=30)
     plt.xlabel(footnote)
+    
+    plt.gca().set_facecolor('whitesmoke')
     plt.show()
     
     return result2
@@ -404,6 +408,8 @@ def compare_VaR_normal_standard(tickerlist,shares,datelist, \
     source="数据来源：新浪/stooq，"+str(today)   
     footnote=notes+'\n'+source
     plt.xlabel(footnote)    
+    
+    plt.gca().set_facecolor('whitesmoke')
     plt.show() 
     
     for t in tickerlist:
@@ -431,6 +437,8 @@ def compare_VaR_normal_standard(tickerlist,shares,datelist, \
     plt.xticks(rotation=30)
     plt.legend(loc='best')
     plt.xlabel(footnote)
+    
+    plt.gca().set_facecolor('whitesmoke')
     plt.show() 
 
     return 
@@ -589,14 +597,16 @@ def series_ES_normal_standard(ticker,shares,datelist, \
     plt.ylabel('ES金额')  
     plt.xticks(rotation=30)
     
+    plt.gca().set_facecolor('whitesmoke')
     plt.show()    
     
-    plt.plot(result3['EES比例%'],c='r',lw=2)  
+    plt.plot(result3['ES比例%'],c='r',lw=2)  
     title2=ticker_name(ticker)+": ES比例的变化，持有"+str(future_days)+"天"
     plt.title(title2)
     plt.ylabel('ES比例%')  
     plt.xticks(rotation=30)
     
+    plt.gca().set_facecolor('whitesmoke')
     plt.show()
     
     return result2

siat/sector_china.py

@@ -2426,6 +2426,8 @@ def industry_correlation_sw(df,tickers,start,end, \
     
     fontxlabel={'size':corr_size}
     plt.xlabel(footnote1+footnote2+footnote3+footnote4,fontxlabel)
+    
+    plt.gca().set_facecolor('whitesmoke')
     plt.show()
     
     return df_coor

siat/stock.py

@@ -766,7 +766,8 @@ def security_mindicators(ticker,measures,fromdate,todate, \
                          date_range=False,date_freq=False, \
                          annotate=False,annotate_value=False, \
                          source='auto', \
-                         mark_top=True,mark_bottom=True,ticker_type='auto'):
+                         mark_top=True,mark_bottom=True,mark_end=True, \
+                         ticker_type='auto'):
     """
     功能：单个证券，多个指标对比
     date_range=False：指定开始结束日期绘图
@@ -836,7 +837,7 @@ def security_mindicators(ticker,measures,fromdate,todate, \
                data_label=False,resample_freq='6H',smooth=smooth, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                annotate=annotate,annotate_value=annotate_value, \
-               mark_top=mark_top,mark_bottom=mark_bottom)
+               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
 
     return df1
 
@@ -2107,7 +2108,9 @@ def candlestick_demo(stkcd,fromdate,todate, \
 
     plt.title(titletxt,fontsize=title_txt_size,fontweight='bold')
     plt.ylabel(price_txt,fontsize=ylabel_txt_size)
+    
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
+    plt.gca().set_facecolor('whitesmoke')
     #plt.xticks(rotation=30)        
     plt.legend(loc="best",fontsize=legend_txt_size)    
     plt.xlabel(source_txt+"sina/stooq/yahoo",fontsize=xlabel_txt_size)   

siat/stock_profile.py

@@ -341,6 +341,8 @@ def ploth_sustainability(sustainability,option="ESG"):
             graf=plt.barh(s.index,s['ESGscore'],facecolor='b',height=0.6,alpha=0.8)
         else:
             graf=plt.barh(s.index,s['ESGscore'],facecolor='b',alpha=0.8)  
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
 
     if option=="EP":
@@ -358,6 +360,8 @@ def ploth_sustainability(sustainability,option="ESG"):
             graf=plt.barh(s.index,s['EPscore'],facecolor='g',height=0.6,alpha=0.8)  
         else:
             graf=plt.barh(s.index,s['EPscore'],facecolor='g',alpha=0.8)
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
 
     if option=="CSR":
@@ -375,6 +379,8 @@ def ploth_sustainability(sustainability,option="ESG"):
             graf=plt.barh(s.index,s['CSRscore'],facecolor='tan',height=0.6,alpha=0.8)
         else:
             graf=plt.barh(s.index,s['CSRscore'],facecolor='tan',alpha=0.8)  
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
 
     if option=="CG":
@@ -392,6 +398,8 @@ def ploth_sustainability(sustainability,option="ESG"):
             graf=plt.barh(s.index,s['CGscore'],facecolor='y',height=0.6,alpha=0.9)
         else:
             graf=plt.barh(s.index,s['CGscore'],facecolor='y',alpha=0.9)  
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
     
     #绘制分位数图     
@@ -411,6 +419,8 @@ def ploth_sustainability(sustainability,option="ESG"):
             graf=plt.barh(s.index,s['ESGpercentile'],facecolor='b',height=0.6,alpha=0.8)
         else:
             graf=plt.barh(s.index,s['ESGpercentile'],facecolor='b',alpha=0.8)  
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
 
     if option=="EP":
@@ -428,6 +438,8 @@ def ploth_sustainability(sustainability,option="ESG"):
             graf=plt.barh(s.index,s['EPpercentile'],facecolor='g',height=0.6,alpha=0.8)
         else:
             graf=plt.barh(s.index,s['EPpercentile'],facecolor='g',alpha=0.8)  
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
 
     if option=="CSR":
@@ -445,6 +457,8 @@ def ploth_sustainability(sustainability,option="ESG"):
             graf=plt.barh(s.index,s['CSRpercentile'],facecolor='tan',height=0.6,alpha=0.8)
         else:
             graf=plt.barh(s.index,s['CSRpercentile'],facecolor='tan',alpha=0.8)  
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
 
     if option=="CG":
@@ -461,7 +475,9 @@ def ploth_sustainability(sustainability,option="ESG"):
         if n < 6:
             graf=plt.barh(s.index,s['CGpercentile'],facecolor='y',height=0.6,alpha=0.9)
         else:
-            graf=plt.barh(s.index,s['CGpercentile'],facecolor='y',alpha=0.9)         
+            graf=plt.barh(s.index,s['CGpercentile'],facecolor='y',alpha=0.9)  
+            
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
         
     return 
@@ -523,6 +539,8 @@ def plot_sustainability(sustainability,option="ESG"):
         titletxt="Corporate Sustainability Performance (ESG)"
         fonttitle={'family':'Times New Roman','weight':'normal','size':24}
         plt.title(titletxt,fonttitle) 
+        
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()
 
     if option=="EP":
@@ -545,6 +563,8 @@ def plot_sustainability(sustainability,option="ESG"):
         titletxt="Corporate Environment Protection Performance (EP)"
         fonttitle={'family':'Times New Roman','weight':'normal','size':22}
         plt.title(titletxt,fonttitle) 
+        
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()      
 
     if option=="CSR":
@@ -567,6 +587,8 @@ def plot_sustainability(sustainability,option="ESG"):
         titletxt="Corporate Social Responsibility Performance (CSR)"
         fonttitle={'family':'Times New Roman','weight':'normal','size':22}
         plt.title(titletxt,fonttitle) 
+        
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()  
 
     if option=="CG":
@@ -589,6 +611,8 @@ def plot_sustainability(sustainability,option="ESG"):
         titletxt="Corporate Governance Performance (CG)"
         fonttitle={'family':'Times New Roman','weight':'normal','size':24}
         plt.title(titletxt,fonttitle) 
+        
+        plt.gca().set_facecolor('whitesmoke')
         plt.show()  
        
     return 

siat/stock_technical.py

@@ -2444,11 +2444,16 @@ def security_technical2(ticker,start='default',end='default', \
                 technical=['MACD'],indicator='Close', \
                 graph=['ALL'],printout=False, \
                 loc1='best',loc2='best', \
-                ticker_type='auto'):
+                ticker_type='auto', \
+                    
+                facecolor='papayawhip'):
     """
+    
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
-    支持的指标：
-    RSI、OBV、MACD、KDJ、SAR、VOL、PSY、ARBR、CR、EMV、BOLL、TRIX、DMA、BIAS、CCI、W%R、ROC、DMI
+    支持的探索指标：仅供探索使用
+    OBV、SAR、VOL、PSY、ARBR、CR、EMV、TRIX、DMA、BIAS、CCI、W%R、ROC、DMI
+    支持的其他指标：不如单独的指令功能强
+    MACD、RSI、KDJ、BOLL
     """
     #检查证券代码
     if not isinstance(ticker,str):
@@ -2496,17 +2501,32 @@ def security_technical2(ticker,start='default',end='default', \
     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, \
+                       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, \
+                           
+                       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, \
@@ -2589,10 +2609,13 @@ def security_technical2(ticker,start='default',end='default', \
     tech_line_collist.sort()
     df1=df[tech_line_collist+[indicator]]
     
-    #绘图
+    #绘图----------------------------------------------------------------------
     import matplotlib.pyplot as plt
+    
     fig = plt.figure()
     ax = fig.add_subplot(111)
+    #plt.gca().set_facecolor('whitesmoke')
+    plt.gca().set_facecolor(facecolor) #放在这里生效，放尾部不生效
     
     line0=False; line30=False; line50=False; line80=False
     for l in tech_line_collist:
@@ -2631,7 +2654,9 @@ def security_technical2(ticker,start='default',end='default', \
     
     titletxt=ticker_name(ticker)+': '+tech_list[technical1]+technical1
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
+    
     plt.gcf().autofmt_xdate()
+    
     plt.show(); plt.close()
     
     return df

{siat-3.0.3.dist-info → siat-3.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.0.3
+Version: 3.0.10
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University