siat 3.0.42__py3-none-any.whl → 3.0.43__py3-none-any.whl

siat/financials_china.py

@@ -655,7 +655,8 @@ if __name__=='__main__':
 
 def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
                          hatchlist=['.', 'o', '\\'],printout=True,sort='PM', \
-                         facecolor='papayawhip',font_size='16px'):
+                         facecolor='papayawhip',font_size='16px',
+                         loc='best'):
     """
     功能：获得tickerlist中每只股票的杜邦分析项目，绘制柱状叠加比较图
     tickerlist：股票代码列表，建议在10只以内
@@ -724,6 +725,12 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
             }
 
     df = pd.DataFrame(raw_data,columns=[ticker,name1,name2,name3,name4,name5])
+    if len(df)==0:
+        print('')
+        print("  #Error(compare_dupont_china): no data to plot dupont identity bar chart.")
+        print("  If the stock code is correct, you may suffer from anti-spyder from data source. Try later")
+        return None
+    
     if sort=='PM':
         df.sort_values(name1,ascending=False,inplace=True)
     elif sort=='TAT':
@@ -752,6 +759,11 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
     ax1.bar(x,df[name1],width=w,label=name1,alpha=0.5,color='blue', \
             hatch=hatchlist[2], edgecolor='black',align='center')
 
+    #判断是否绘制零线
+    pm_max=df[name1].max(); pm_min=df[name1].min()
+    if pm_max * pm_min < 0:
+        plt.axhline(y=0,ls=":",c="black",linewidth=2,label='')
+    
     plt.xticks(tick_pos,df[ticker])
     plt.ylabel("杜邦分析分解项目")
     
@@ -768,8 +780,17 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
     footnote2=footnote+'\n'+footnote1+'\n'+"数据来源：sina/EM，"+str(today)
     plt.xlabel(footnote2)
     
-    plt.legend(loc='best')
-    plt.title("杜邦分析对比图")
+    plt.legend(loc=loc)
+    
+    titletxt1="杜邦分析对比图："
+    if sort=='PM':
+        titletxt2="按照"+name1+"降序排列"
+    elif sort=='TAT':
+        titletxt2="按照"+name2+"降序排列"
+    else:
+        titletxt2="按照"+name3+"降序排列"
+            
+    plt.title(titletxt1+titletxt2)
     plt.xlim([min(tick_pos)-w,max(tick_pos)+w])
     
     plt.gca().set_facecolor('whitesmoke')
@@ -794,7 +815,7 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
         print("===== 杜邦分析分项数据表 =====")
         print("*** 数据来源：sina/EM，"+str(today))
         """
-        title_txt="杜邦分析分项数据表"
+        title_txt="杜邦分析分项数据表："+titletxt2
         footnote0="1、表中各个上市公司的财报日期可能存在差异，但均为可获得(已公布)的最新财报"
         footnote1="2、表中数值基于期末数字直接计算，而非期初期末均值，可能与公告数字存在差异。"
         footnote2="*** 数据来源：sina/EM，"+str(today)

siat/financials_china2.py

@@ -1957,8 +1957,8 @@ if __name__=='__main__':
 
 def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
                       category='profile',business_period='recent', \
-                      printout=False,gview=False, \
-                      loc1='upper left',loc2='upper right', \
+                      sort='PM',printout=False,gview=False, \
+                      loc1='best',loc2='best', \
                       facecolor='papayawhip',font_size='16px'):
     """
     【功能】财务报表分析，仅适用于中国A股，注意不适用于港股和美股（含中概股）
@@ -2134,8 +2134,8 @@ def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
 
         # 多只股票的杜邦分析对比      
         from siat.financials_china import compare_dupont_china           
-        df_db=compare_dupont_china(tickers,fsdate=fsdates,printout=printout, \
-                                   facecolor=facecolor,font_size=font_size)
+        df_db=compare_dupont_china(tickers,fsdate=fsdates,sort=sort,printout=printout, \
+                                   facecolor=facecolor,font_size=font_size,loc=loc1)
         return        
     
     elif ('dupont' in analysis_type1) and ('decompose' in analysis_type1):

siat/risk_adjusted_return2.py

@@ -793,7 +793,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         footnotey=footnote6+'\n'+footnote7+'\n'+footnotex
         
         #删除含有Nan的行，否则可能引起近期优先加权平均计算结果市场出现Nan
-        df1.dropna(inplace=True)    
+        df1.dropna(inplace=True,axis=1)    
         recommenddf=descriptive_statistics2(df1,title_txt,footnotey,decimals=4, \
                                sortby=sortby,recommend_only=True,trailing=trailing, \
                                trend_threshhold=trend_threshhold, \

siat/translate.py

@@ -3256,6 +3256,10 @@ def ticker1_name(ticker,ticker_type='auto'):
         #查找证券名称文件：优先股票
         if tt in ['stock']:
             df1=file_position(file='stock_info.pickle',package='siat',mode='read')
+            
+            #港股
+            if '.HK' in symbol and len(symbol)==8: symbol=symbol[1:]
+            
             try:
                 tname=df1[df1['SYMBOL']==symbol]['CNAME'].values[0]
             except: pass

{siat-3.0.42.dist-info → siat-3.0.43.dist-info}/METADATA

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

{siat-3.0.42.dist-info → siat-3.0.43.dist-info}/RECORD

@@ -40,8 +40,8 @@ siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHY
 siat/financials.py,sha256=mbEZSNeHMMFcnPUryQWvdmNlWQvpnOG9eItgS7IVw3k,80458
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
 siat/financials2.py,sha256=7mnsTncKsgwFu8PP4refh5C5iMIO9P0KOMSF87ZyncY,45736
-siat/financials_china.py,sha256=IjTuQNoG70g1evz66El9xnwMpHklB5yo5YdQ3Dx1jy8,189361
-siat/financials_china2.py,sha256=ESxKyBoIETokRXLIkjkyhSjM0b1YSdXcP_rP2R5BUlU,92639
+siat/financials_china.py,sha256=HdX6YKI4tUC7VnPCTAjtdC3JxGgGepu07wdrpyykxbE,190119
+siat/financials_china2.py,sha256=mFwWtzwPbantjmXkGsr4CTEj9VRdZe5yITG3VwlJC9E,92655
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
 siat/financials_china2_test2.py,sha256=C8CuYTMHN4Mhp-sTu-Bmg0zMXRCaYV6ezGDoYartRYQ,3507
 siat/financials_china2_test3.py,sha256=UXYSA80DNSPRhHpovc2MA9JkpILWMAQaRatbWCHBNPs,3118
@@ -85,7 +85,7 @@ siat/option_sina_api_test.py,sha256=dn-k_wrQnAaNKHoROvWJEc7lqlU0bwiV2Aa4usWAFGM,
 siat/proxy_test.py,sha256=erQJrmGs2X46z8Gb1h-7GYQ0rTUcaR8dxHExWoBz2eM,2610
 siat/quandl_test.py,sha256=EcPoXnLuqzPl5dKyVEZi3j3PJZFpsnU_iNPhLWC9p-A,1552
 siat/risk_adjusted_return.py,sha256=L5FoeOFzvItT03gNBTCaIo32hUvncOJkbchtHOveSBM,54929
-siat/risk_adjusted_return2.py,sha256=M01nDhPr49RdCyNPFzCI6h9yzLS10SBTlLXelTQj73c,64331
+siat/risk_adjusted_return2.py,sha256=y9Eux9bbQgprFs_a-0J-7pC9P4yEpJHssDbcbFct0K0,64338
 siat/risk_adjusted_return_test.py,sha256=m_VHL5AtT74cJv5i7taTeTfnkX48y0AFJk5phawyYWg,3416
 siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
@@ -126,13 +126,13 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=GsxDuo02bbXzWpoULxd7nqAaRON3-y_nVdkmy9kAFRQ,214915
+siat/translate.py,sha256=dqzySnqC0A0IxFKhY1AUvBbj3RIE5_l_wRMn-ZJNJxs,215034
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=Tde2LzPDQy3Z7xOQQDw4ckQMPdROp_z0-GjFE6Z5_lI,67639
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.0.42.dist-info/METADATA,sha256=mzi8bdptIZ54rZ19MJ7S23h_LIS_vfeGH_B4dUAYEhk,1448
-siat-3.0.42.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.0.42.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.0.42.dist-info/RECORD,,
+siat-3.0.43.dist-info/METADATA,sha256=8x9wW6A3GWrxYLw-PKD4UfzcY4MPZby_RNo1socVEyw,1448
+siat-3.0.43.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.0.43.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.43.dist-info/RECORD,,