siat 3.0.25__py3-none-any.whl → 3.0.35__py3-none-any.whl

siat/financials_china2.py

@@ -571,8 +571,8 @@ def fs_item_analysis_1(df,ticker,fsdate,items,title_txt='',notes='',facecolor='p
         """
         
         if not math.isnan(i_value):
-            i_value_yy=round(i_value/yiyuan,2)
-            i_value_qc_yy=round(i_value_qc/yiyuan,2)
+            i_value_yy=round(i_value/yiyuan,4)
+            i_value_qc_yy=round(i_value_qc/yiyuan,4)
             i_value_chg_yy=round(i_value_yy - i_value_qc_yy,2)
             if not(i_value_qc_yy==0):
                 i_value_chg_pct=round(i_value_chg_yy/i_value_qc_yy*100,2)
@@ -599,9 +599,10 @@ def fs_item_analysis_1(df,ticker,fsdate,items,title_txt='',notes='',facecolor='p
     if title_txt=='':
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：重要项目的变动情况\n（截至"+fsdate+"）"
-    import datetime; today=datetime.date.today()
+    import datetime; todaydt=datetime.date.today()
     #footnote="*单位：亿元，数据来源：新浪财经，"+str(today) 
-    footnote="*单位：亿元，本期报表日期："+fsdate+'，数据来源：新浪财经' 
+    #footnote="*单位：亿元，本期报表日期："+fsdate+'，数据来源：新浪财经'
+    footnote="单位：亿元，数据来源：新浪财经，"+str(todaydt)
     
     if notes=='':
         foottext=footnote
@@ -647,7 +648,7 @@ def fs_item_analysis_2(df,ticker,fsdates,items,title_txt='',notes='',facecolor='
         row_list=[i]
         for fd in fsdates1:
             i_value,_,_=select_item(df,ticker,fd,i)
-            row_list=row_list+[round(i_value/yiyuan,2)]
+            row_list=row_list+[round(i_value/yiyuan,4)]
         dfp.loc[len(dfp)] = row_list
     
     last_row=[items[0]+"占比%"]
@@ -663,8 +664,8 @@ def fs_item_analysis_2(df,ticker,fsdates,items,title_txt='',notes='',facecolor='
     if title_txt=='':
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：重要项目占比的变动趋势"
-    import datetime; today=datetime.date.today()
-    footnote="*数据来源：新浪财经，"+str(today) 
+    import datetime; todaydt=datetime.date.today()
+    footnote="数据来源：新浪财经，"+str(todaydt) 
     
     if notes=='':
         foottext=footnote
@@ -705,7 +706,7 @@ def fs_item_analysis_3(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
         row_list=[i]
         for fd in fsdates1:
             i_value,_,_=select_item(df,ticker,fd,i)
-            row_list=row_list+[round(i_value/yiyuan,2)]
+            row_list=row_list+[round(i_value/yiyuan,4)]
         dfp.loc[len(dfp)] = row_list
     
     last_row=["流动比率%"]
@@ -721,8 +722,8 @@ def fs_item_analysis_3(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     if title_txt=='':
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：流动比率的变动趋势"
-    import datetime; today=datetime.date.today()
-    footnote="*数据来源：新浪财经，"+str(today) 
+    import datetime; todaydt=datetime.date.today()
+    footnote="数据来源：新浪财经，"+str(todaydt) 
     
     if notes=='':
         foottext=footnote
@@ -762,14 +763,14 @@ def fs_item_analysis_4(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     row_list=[i]
     for fd in fsdates1:
         i_value,_,_=select_item(df,ticker,fd,i)
-        row_list=row_list+[round(i_value/yiyuan,2)]
+        row_list=row_list+[round(i_value/yiyuan,4)]
     dfp.loc[len(dfp)] = row_list
     
     i='存货'
     row_list=['其中：'+i]
     for fd in fsdates1:
         i_value,_,_=select_item(df,ticker,fd,i)
-        row_list=row_list+[round(i_value/yiyuan,2)]
+        row_list=row_list+[round(i_value/yiyuan,4)]
     dfp.loc[len(dfp)] = row_list 
     
     i='速动资产合计'
@@ -783,7 +784,7 @@ def fs_item_analysis_4(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     row_list=[i]
     for fd in fsdates1:
         i_value,_,_=select_item(df,ticker,fd,i)
-        row_list=row_list+[round(i_value/yiyuan,2)]
+        row_list=row_list+[round(i_value/yiyuan,4)]
     dfp.loc[len(dfp)] = row_list
     
     last_row=["速动比率%"]
@@ -799,8 +800,8 @@ def fs_item_analysis_4(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     if title_txt=='':
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：速动比率的变动趋势"
-    import datetime; today=datetime.date.today()
-    footnote="*数据来源：新浪财经，"+str(today) 
+    import datetime; todaydt=datetime.date.today()
+    footnote="数据来源：新浪财经，"+str(todaydt) 
     
     if notes=='':
         foottext=footnote
@@ -840,7 +841,7 @@ def fs_item_analysis_5(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
         row_list=[i]
         for fd in fsdates1:
             i_value,_,_=select_item(df,ticker,fd,i)
-            row_list=row_list+[round(i_value/yiyuan,2)]
+            row_list=row_list+[round(i_value/yiyuan,4)]
         dfp.loc[len(dfp)] = row_list
     
     last_row=["资产负债率%"]
@@ -856,8 +857,8 @@ def fs_item_analysis_5(df,ticker,fsdates,title_txt='',notes='',facecolor='papaya
     if title_txt=='':
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：资产负债率的变动趋势"
-    import datetime; today=datetime.date.today()
-    footnote="*数据来源：新浪财经，"+str(today) 
+    import datetime; todaydt=datetime.date.today()
+    footnote="数据来源：新浪财经，"+str(todaydt) 
     
     if notes=='':
         foottext=footnote
@@ -902,7 +903,7 @@ def fs_item_analysis_6_original(df,ticker,fsdates,items,title_txt='',notes=''):
         row_list=[fd]
         for i in items:
             i_value,_,_=select_item(df,ticker,fd,i)
-            row_list=row_list+[round(i_value/yiyuan,2)]
+            row_list=row_list+[round(i_value/yiyuan,4)]
         dfp.loc[len(dfp)] = row_list
     
     last_row=["增幅%"]
@@ -919,8 +920,8 @@ def fs_item_analysis_6_original(df,ticker,fsdates,items,title_txt='',notes=''):
     if title_txt=='':
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：重要关联项目的增幅对比"
-    import datetime; today=datetime.date.today()
-    footnote="*数据来源：新浪财经，"+str(today) 
+    import datetime; todaydt=datetime.date.today()
+    footnote="数据来源：新浪财经，"+str(todaydt) 
     
     if notes=='':
         foottext=footnote
@@ -958,7 +959,7 @@ def fs_item_analysis_6(df,ticker,fsdates,items,title_txt='',notes='',facecolor='
         for i in items:
             i_value,_,_=select_item(df,ticker,fd,i)
             if not('%' in i) and not('(元)' in i):
-                row_list=row_list+[round(i_value/yiyuan,2)]
+                row_list=row_list+[round(i_value/yiyuan,4)]
                 yiyuan_foot=True
             else:
                 row_list=row_list+[i_value]
@@ -978,11 +979,11 @@ def fs_item_analysis_6(df,ticker,fsdates,items,title_txt='',notes='',facecolor='
     if title_txt=='':
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：重要关联项目的增幅对比"
-    import datetime; today=datetime.date.today()
+    import datetime; todaydt=datetime.date.today()
     if yiyuan_foot:
-        footnote="*单位：亿元，数据来源：新浪财经，"+str(today) 
+        footnote="单位：亿元，数据来源：新浪财经，"+str(todaydt) 
     else:
-        footnote="*数据来源：新浪财经，"+str(today)
+        footnote="数据来源：新浪财经，"+str(todaydt)
         
     if notes=='':
         foottext=footnote
@@ -1032,7 +1033,7 @@ def fs_item_analysis_7_original(df,tickers,fsdate,items,title_txt=''):
         for i in items:
             i_value,_,_=select_item(df,t,fsdate,i)
             if not('%' in i) and not('(元)' in i):
-                row_list=row_list+[round(i_value/yiyuan,2)]
+                row_list=row_list+[round(i_value/yiyuan,4)]
                 yiyuan_foot=True
             else:
                 row_list=row_list+[i_value]
@@ -1049,11 +1050,11 @@ def fs_item_analysis_7_original(df,tickers,fsdate,items,title_txt=''):
         ticker=tickers[0]
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：重要指标的同行业对比\n（截至"+fsdate+"）"
-    import datetime; today=datetime.date.today()
+    import datetime; todaydt=datetime.date.today()
     if yiyuan_foot:
-        footnote="*单位：亿元，数据来源：新浪财经，"+str(today) 
+        footnote="单位：亿元，数据来源：新浪财经，"+str(todaydt) 
     else:
-        footnote="*数据来源：新浪财经，"+str(today)
+        footnote="数据来源：新浪财经，"+str(todaydt)
     df_directprint(dfp,title_txt,footnote) 
     
     return dfp
@@ -1085,7 +1086,7 @@ def fs_item_analysis_7(df,tickers,fsdate,items,title_txt='',notes='',facecolor='
         for i in items:
             i_value,_,_=select_item(df,t,fsdate,i)
             if not('%' in i) and not('(元)' in i):
-                row_list=row_list+[round(i_value/yiyuan,2)]
+                row_list=row_list+[round(i_value/yiyuan,4)]
                 yiyuan_foot=True
             else:
                 row_list=row_list+[i_value]
@@ -1119,13 +1120,15 @@ def fs_item_analysis_7(df,tickers,fsdate,items,title_txt='',notes='',facecolor='
         ticker=tickers[0]
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：重要指标的同行业对比\n（截至"+fsdate+"）"
-    import datetime; today=datetime.date.today()
+    import datetime; todaydt=datetime.date.today()
     if yiyuan_foot:
         #footnote="*单位：亿元，数据来源：新浪财经，"+str(today) 
-        footnote="*单位：亿元，本期报表日期："+fsdate+'，数据来源：新浪财经'         
+        #footnote="*单位：亿元，本期报表日期："+fsdate+'，数据来源：新浪财经'
+        footnote="单位：亿元，数据来源：新浪财经，"+str(todaydt)       
     else:
         #footnote="*数据来源：新浪财经，"+str(today)
-        footnote="*本期报表日期："+fsdate+'，数据来源：新浪财经' 
+        #footnote="*本期报表日期："+fsdate+'，数据来源：新浪财经' 
+        footnote='数据来源：新浪财经，'+str(todaydt)
         
     if notes=='':
         foottext=footnote
@@ -1167,7 +1170,7 @@ def fs_item_analysis_8(df,tickers,fsdate,items,title_txt='',notes='',facecolor='
         for i in items:
             i_value,_,_=select_item(df,t,fsdate,i)
             if not('%' in i) and not('(元)' in i):
-                row_list=row_list+[round(i_value/yiyuan,2)]
+                row_list=row_list+[round(i_value/yiyuan,4)]
                 yiyuan_foot=True
             else:
                 row_list=row_list+[i_value]
@@ -1201,13 +1204,15 @@ def fs_item_analysis_8(df,tickers,fsdate,items,title_txt='',notes='',facecolor='
         tname=ticker_name(ticker,'stock').replace("(A股)",'')
         title_txt=tname+"财报分析：重要指标的同行业对比\n（截至"+fsdate+"）"
 
-    import datetime; today=datetime.date.today()
+    import datetime; todaydt=datetime.date.today()
     if yiyuan_foot:
         #footnote="*单位：亿元，数据来源：新浪财经，"+str(today) 
-        footnote="*单位：亿元，本期报表日期："+fsdate+'，数据来源：新浪财经'
+        #footnote="*单位：亿元，本期报表日期："+fsdate+'，数据来源：新浪财经'
+        footnote="单位：亿元，"+'数据来源：新浪财经，'+str(todaydt)
     else:
         #footnote="*数据来源：新浪财经，"+str(today)
-        footnote="*本期报表日期："+fsdate+'，数据来源：新浪财经'
+        #footnote="*本期报表日期："+fsdate+'，数据来源：新浪财经'
+        footnote='数据来源：新浪财经，'+str(todaydt)
     
     if notes=='':
         foottext=footnote
@@ -1268,9 +1273,9 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     comparator=tickers[0]
     comparee=tickers[1:]
     print("  Conducting asset-liability analysis ...")
-    print("  Comparator:",ticker_name(comparator,'stock'))
+    print("  Focus on:",ticker_name(comparator,'stock'))
     #print("  Comparee  :",ticker_name(comparee))
-    print("  Comparee  :",end='')
+    print("  Peers   :",end='')
     if comparee != []:
         print_list(ticker_name(comparee,'stock'))
     else:
@@ -1308,29 +1313,36 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
             print("  Solution: check ticker spelling and try at least 10 minutes later")
             return
     
-    title_head=ticker_name(comparator,'stock')+"资产负债分析："
+    #title_head=ticker_name(comparator,'stock')+"资产负债分析："
+    title_head=ticker_name(comparator,'stock')+"："
     
     ### 资产负债表的主要项目
     #资产变动趋势2
-    title_txt=title_head+"主要资产项目"
+    title_txt=title_head+"主要资产项目，"+fsdate
     items2=["货币资金","应收账款","存货","长期股权投资","固定资产净额","资产总计"]
-    
+    """
     notes1="注1：货币资金包括库存现金、银行存款和其他货币资金三个部分"
     notes2="注2：其他货币资金包括银行汇(本)票存款、信用证保证金存款和信用卡存款等"
     notes3="注3：长期股权投资是指企业对其子公司、合营企业及联营企业的权益性投资"
     notes4="注4：固定资产净额 = 固定资产原值 - 累计折旧 - 资产减值准备"
+    """
+    notes1="注：\n货币资金包括库存现金、银行存款和其他货币资金三个部分"
+    notes2="其他货币资金包括银行汇(本)票存款、信用证保证金存款和信用卡存款等"
+    notes3="长期股权投资是指企业对其子公司、合营企业及联营企业的权益性投资"
+    notes4="固定资产净额 = 固定资产原值 - 累计折旧 - 资产减值准备"
+    
     notes=notes1+'\n'+notes2+'\n'+notes3+'\n'+notes4
     dfp2=fs_item_analysis_1(df,ticker,fsdate,items2,title_txt,notes,facecolor=facecolor)
     
     #负债变动趋势
-    title_txt=title_head+"主要负债项目"
+    title_txt=title_head+"主要负债项目，"+fsdate
     items3=["短期借款","长期借款","应付账款","预收款项","应交税费","应付职工薪酬","负债合计"]
     dfp3=fs_item_analysis_1(df,ticker,fsdate,items3,title_txt,facecolor=facecolor)
     
     #所有者权益变动趋势
-    title_txt=title_head+"主要权益项目"
+    title_txt=title_head+"主要权益项目，"+fsdate
     items4=["实收资本(或股本)","资本公积","盈余公积","未分配利润","所有者权益合计"]
-    
+    """
     notes1="注1：实收资本(或股本，Paid-in Capital)指企业实际收到的投资人投入的资本"
     notes2="注2：资本公积是由股东投入的因故不能计入实收资本(或股本)中的那部分投入资金"
     notes3="     资本公积包括资本(股本)溢价、其他资本公积、资产评估增值、资本折算差额"
@@ -1345,6 +1357,22 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notes12="     任意盈余公积是指企业内部可自主决定比例提取的盈余公积"
     notes13="     企业提取的盈余公积可用于弥补亏损、转增资本、发放现金股利或利润等"
     notes14="注4：未分配利润是净利润经弥补亏损、提取盈余公积和向投资者分配利润后的资金"
+    """
+    notes1="注：\n实收资本(或股本，Paid-in Capital)指企业实际收到的投资人投入的资本"
+    notes2="资本公积是由股东投入的因故不能计入实收资本(或股本)中的那部分投入资金"
+    notes3="资本公积包括资本(股本)溢价、其他资本公积、资产评估增值、资本折算差额"
+    notes4="资本(股本)溢价是公司发行权益证券时价格超出票面价值的部分"
+    notes5="其他资本公积包括金融资产公允价值变动、被投资单位净利润以外的变动等"
+    notes6="资产评估增值是重估企业资产时，重估价高于资产的账面净值的部分"
+    notes7="资本折算差额是外币资本因汇率变动产生的差额"
+    notes8="盈余公积是企业按照要求从税后利润中提取的、属于留存收益范畴的资金"
+    notes9="企业从历年利润中提取的留存于企业的内部积累，包括盈余公积和未分配利润"
+    notes10="公司制企业的盈余公积包括法定盈余公积和任意盈余公积"
+    notes11="法定盈余公积是指企业按照规定比例从净利润中必须提取的盈余公积"
+    notes12="任意盈余公积是指企业内部可自主决定比例提取的盈余公积"
+    notes13="企业提取的盈余公积可用于弥补亏损、转增资本、发放现金股利或利润等"
+    notes14="未分配利润是净利润经弥补亏损、提取盈余公积和向投资者分配利润后的资金"
+    
     notesA=notes1+'\n'+notes2+'\n'+notes3+'\n'+notes4+'\n'+notes5+'\n'+notes6+'\n'+notes7
     notesB=notes8+'\n'+notes9+'\n'+notes10+'\n'+notes11+'\n'+notes12+'\n'+notes13+'\n'+notes14
     
@@ -1353,7 +1381,7 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     
     ### 货币资金与应收项目    
     #资产变动趋势1："货币资金","应收票据","应收账款"
-    title_txt=title_head+"货币资金与应收项目"
+    title_txt=title_head+"货币资金与应收项目，"+fsdate
     items1=["货币资金","应收票据","应收账款"]
     dfp1=fs_item_analysis_1(df,ticker,fsdate,items1,title_txt,facecolor=facecolor)
     
@@ -1371,7 +1399,8 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
 
     #应收账款占比同行对比
     items7=['应收账款','资产总计','应收账款占比%']
-    title_txt=title_head+"应收账款占比同行对比"
+    #title_txt=title_head+"应收账款占比同行对比"
+    title_txt="应收账款占比同行对比："+fsdate
     dfp7=fs_item_analysis_7(df,tickers,fsdate,items7,title_txt,facecolor=facecolor)        
 
     ### 存货
@@ -1390,7 +1419,8 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
 
     #存货占比与行业对比        
     items11=['存货','资产总计','存货占比%']
-    title_txt=title_head+"存货占比情况同行对比"
+    #title_txt=title_head+"存货占比情况同行对比"
+    title_txt="存货占比情况同行对比："+fsdate
     dfp11=fs_item_analysis_7(df,tickers,fsdate,items11,title_txt,facecolor=facecolor)
 
     ### 偿债能力
@@ -1407,7 +1437,8 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip'):
     dfp14=fs_item_analysis_5(df,ticker,fsdates1,title_txt,facecolor=facecolor)    
 
     #资产负债率同行比较
-    title_txt=title_head+"资产负债率同行比较"
+    #title_txt=title_head+"资产负债率同行比较"
+    title_txt="资产负债率同行比较："+fsdate
     items15=['资产总计','资产负债率%','流动比率%','速动比率%']
     dfp15=fs_item_analysis_8(df,tickers,fsdate,items15,title_txt,facecolor=facecolor)
 
@@ -1469,9 +1500,9 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
     comparator=tickers[0]
     comparee=tickers[1:]
     print("  Conducting income-cost analysis ...")
-    print("  Comparator:",ticker_name(comparator,'stock'))
+    print("  Focus on:",ticker_name(comparator,'stock'))
     #print("  Comparee  :",ticker_name(comparee))
-    print("  Comparee  :",end='')
+    print("  Peers   :",end='')
     if comparee != []:
         print_list(ticker_name(comparee,'stock'))
     else:
@@ -1490,15 +1521,15 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
             #print("  Possible reasons: no access to data source or invalid tickers")
             return
     
-    title_head=ticker_name(comparator,'stock')+"收入成本分析："
+    title_head=ticker_name(comparator,'stock')+"："
     
     #收入成本总体变动趋势
-    title_txt=title_head+"主要项目及其变动趋势"
+    title_txt=title_head+"主要利润表项目，"+fsdate
     items1=["营业总收入","营业总成本","营业成本","毛利润","营业利润","营业外收支","税前利润","所得税费用","净利润","归母净利润"]
     dfp1=fs_item_analysis_1(df,ticker,fsdate,items1,title_txt,facecolor=facecolor)
     
     #成本变动趋势
-    title_txt=title_head+"主要成本费用及其变动趋势"
+    title_txt=title_head+"主要成本费用项目，"+fsdate
     print('')
     """
     items2=["营业总成本","营业成本","营业税金及附加","销售费用","管理费用","研发费用",
@@ -1514,18 +1545,27 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
     title_txt=title_head+"营业总成本占营业总收入比例情况"
     fsdates1=fsdates[:3]
     items3=["营业总成本","营业总收入"]
-    
+    """
     notes1="注1：营业总成本包括营业成本、营业税金及附加、三大费用和资产减值损失"
     notes2="注2：营业收入=主营业务收入和其他非主营业务收入"
     notes3="注3：营业总收入=营业收入+非营业收入(投资收益、营业外收入等)"
+    """
+    notes1="注：\n营业总成本包括营业成本、营业税金及附加、三大费用和资产减值损失"
+    notes2="营业收入=主营业务收入和其他非主营业务收入"
+    notes3="营业总收入=营业收入+非营业收入(投资收益、营业外收入等)"
+    
     notes=notes1+'\n'+notes2+'\n'+notes3
     dfp3=fs_item_analysis_2(df,ticker,fsdates1,items3,title_txt,notes,facecolor=facecolor)
     #====================================================================
     title_txt=title_head+"营业成本占营业总成本比例情况"
     items4=["营业成本","营业总成本"]
-    
+    """
     notes1="注1：营业成本是经营活动中发生的可归属于产品/劳务成本等的费用"
     notes2="注2：营业总成本包括营业成本、营业税金及附加、三大费用和资产减值损失"
+    """
+    notes1="注：\n营业成本是经营活动中发生的可归属于产品/劳务成本等的费用"
+    notes2="营业总成本包括营业成本、营业税金及附加、三大费用和资产减值损失"
+    
     notes=notes1+'\n'+notes2
     dfp4=fs_item_analysis_2(df,ticker,fsdates1,items4,title_txt,notes,facecolor=facecolor)
     
@@ -1551,12 +1591,18 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
     notes="注：管理费用是行政管理部门为组织生产/经营活动发生的各种费用"
     dfp7=fs_item_analysis_2(df,ticker,fsdates1,items7,title_txt,notes,facecolor=facecolor)
     
-    title_txt=title_head+"三项费用率同行对比"
+    #title_txt=title_head+"三项费用率同行对比"
+    title_txt="三项费用率同行对比："+fsdate
     items14=['营业总收入','销售费用率%','管理费用率%','研发费用率%']
-    
+    """
     notes1="注1：销售费用率 = 销售费用 / 营业总收入"
     notes2="注2：管理费用率 = 管理费用 / 营业总收入"
     notes3="注3：研发费用率 = 研发费用 / 营业总收入"
+    """
+    notes1="注：\n销售费用率 = 销售费用 / 营业总收入"
+    notes2="管理费用率 = 管理费用 / 营业总收入"
+    notes3="研发费用率 = 研发费用 / 营业总收入"
+    
     notes=notes1+'\n'+notes2+'\n'+notes3
     
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items14,title_txt,notes,facecolor=facecolor)    
@@ -1583,7 +1629,8 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip'):
     dfp11=fs_item_analysis_6(df,ticker,fsdates2,items13,title_txt,facecolor=facecolor)
 
     #同行比较
-    title_txt=title_head+"利润率同行对比"
+    #title_txt=title_head+"利润率同行对比"
+    title_txt="利润率同行对比："+fsdate
     #items15=['营业利润','营业利润率%','税前利润率%','实际所得税率%','净利润','净利润率%']
     #items15=['毛利润率%','营业利润率%','税前利润率%','净利润率%']
     items15=['净利润率%','税前利润率%','营业利润率%','毛利润率%']
@@ -1647,8 +1694,8 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
     comparator=tickers[0]
     comparee=tickers[1:]
     print("  Conducting cash flow analysis ...")
-    print("  Comparator:",ticker_name(comparator,'stock'))
-    print("  Comparee  :",end='')
+    print("  Focus on:",ticker_name(comparator,'stock'))
+    print("  Peers   :",end='')
     if comparee != []:
         print_list(ticker_name(comparee,'stock'))
     else:
@@ -1667,10 +1714,10 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
             #print("  Possible reasons: no access to data source or invalid tickers")
             return    
     
-    title_head=ticker_name(comparator,'stock')+"现金流分析："
+    title_head=ticker_name(comparator,'stock')+"："
     
     #总体变动趋势
-    title_txt=title_head+"主要项目及其变动趋势"
+    title_txt=title_head+"主要现金流项目，"+fsdate
     items1=["经营活动现金流净额","经营活动现金流入","经营活动现金流出",
             "投资活动现金流净额","投资活动现金流入","投资活动现金流出",
             "筹资活动现金流净额","筹资活动现金流入","筹资活动现金流出",
@@ -1694,38 +1741,57 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip'):
     dfp12=fs_item_analysis_6(df,ticker,fsdates2,items12,title_txt,facecolor=facecolor)
 
     #同行比较
-    title_txt=title_head+"现金收入能力同行比较"
+    title_txt=title_head+"现金收入能力同行比较，"+fsdate
     items16=['销售现金比率%','现金购销比率%','营业现金回笼率%']
-    
+    """
     notes1="注1：销售现金比率 = 经营活动现金流入 / 营业总收入"
     notes2="注2：现金购销比率 = 经营活动现金流出 / 经营活动现金流入"
     notes3="注3：营业现金回笼率 = 经营活动现金流入 / 营业总收入"
+    """
+    notes1="注：\n销售现金比率 = 经营活动现金流入 / 营业总收入"
+    notes2="现金购销比率 = 经营活动现金流出 / 经营活动现金流入"
+    notes3="营业现金回笼率 = 经营活动现金流入 / 营业总收入"
+    
     notes=notes1+'\n'+notes2+'\n'+notes3
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items16,title_txt,notes,facecolor=facecolor)  
     
-    title_txt=title_head+"现金偿债能力同行比较"
+    title_txt=title_head+"现金偿债能力同行比较，"+fsdate
     items14=['短期现金偿债能力%','长期现金偿债能力%']
-    
+    """
     notes1="注1：短期现金偿债能力 = 经营活动现金流净额 / 流动负债合计"
     notes2="注2：长期现金偿债能力 = 经营活动现金流净额 / 负债合计"
+    """
+    notes1="注：\n短期现金偿债能力 = 经营活动现金流净额 / 流动负债合计"
+    notes2="长期现金偿债能力 = 经营活动现金流净额 / 负债合计"
+    
     notes=notes1+'\n'+notes2
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items14,title_txt,notes,facecolor=facecolor)
     
-    title_txt=title_head+"现金支付能力同行比较"
+    title_txt=title_head+"现金支付能力同行比较，"+fsdate
     items15=['现金支付股利能力(元)','现金综合支付能力%','支付给职工的现金比率%']
-    
+    """
     notes1="注1：现金支付股利能力 = 经营活动现金流净额 / 流通股股数"
     notes2="注2：现金综合支付能力 = 经营活动现金流净额 / 所有者权益合计"
     notes3="注3：支付给职工的现金比率 = 支付给(为)职工支付的现金 / 经营活动现金流入"
+    """
+    notes1="注：\n现金支付股利能力 = 经营活动现金流净额 / 流通股股数"
+    notes2="现金综合支付能力 = 经营活动现金流净额 / 所有者权益合计"
+    notes3="支付给职工的现金比率 = 支付给(为)职工支付的现金 / 经营活动现金流入"
+    
     notes=notes1+'\n'+notes2+'\n'+notes3
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items15,title_txt,notes,facecolor=facecolor)
 
-    title_txt=title_head+"财务指标含金量同行比较"
+    title_txt=title_head+"财务指标含金量同行比较，"+fsdate
     items17=['盈利现金比率%','现金流入流出比率%','资产现金回收率%']
-    
+    """
     notes1="注1：盈利现金比率 = 经营活动现金流净额 / 净利润"
     notes2="注2：现金流入流出比率 = 经营活动现金流入 / 经营活动现金流出"
     notes3="注3：资产现金回收率 = 经营活动现金流净额 / 资产总计"
+    """
+    notes1="注：\n盈利现金比率 = 经营活动现金流净额 / 净利润"
+    notes2="现金流入流出比率 = 经营活动现金流入 / 经营活动现金流出"
+    notes3="资产现金回收率 = 经营活动现金流净额 / 资产总计"
+    
     notes=notes1+'\n'+notes2+'\n'+notes3
     dfp12=fs_item_analysis_8(df,tickers,fsdate,items17,title_txt,notes,facecolor=facecolor)
     
@@ -1786,7 +1852,7 @@ 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', \
-                      facecolor='whitesmoke'):
+                      facecolor='papayawhip'):
     """
     【功能】财务报表分析，仅适用于中国A股，注意不适用于港股和美股（含中概股）
     

siat/sector_china.py

@@ -760,9 +760,10 @@ if __name__=='__main__':
     
     print_industry_sw(itype='I',numberPerLine=5,colalign='right')
 
-def print_industry_sw(itype='I',numberPerLine=4,colalign='left'):
+def print_industry_sw(itype='I',numberPerLine=5,colalign='left'):
     """
-    按照类别打印申万行业列表，名称(代码)，每行5个
+    功能：按照类别打印申万行业列表，名称(代码)
+    行业分级itype：F="市场表征", I="一级行业", T="二级行业", 3="三级行业", S="风格指数"
     """
     df=industry_sw_list()
     df1=df[df['type']==itype]
@@ -776,8 +777,8 @@ def print_industry_sw(itype='I',numberPerLine=4,colalign='left'):
     ilist=list(df1['name_code'])
     print("\n*** 申万行业分类："+iname+"，共计"+str(len(ilist))+'个行业(板块)')
     
-    if itype=='3':
-        numberPerLine=4
+    if itype=='T': numberPerLine=4
+    if itype=='3': numberPerLine=3
     
     printInLine_md(ilist,numberPerLine=numberPerLine,colalign=colalign)
     
@@ -2075,9 +2076,9 @@ def industry_stock_sw(industry='801270.SW',top=5,printout=False):
             clist1=clist1+[c+'.SZ']
     """
     if printout:
-        title_txt="申万行业指数成分股排名与权重："+industry_sw_name(industry)+'('+industry+'.SW)'
+        title_txt="申万行业成分股："+industry_sw_name(industry)+'('+industry+'.SW)'
         import datetime as dt; today=str(dt.date.today())
-        footnote="*** 成分股总数："+str(cdf_total)+"，数据来源：申万宏源，"+str(today)
+        footnote="成分股总数："+str(cdf_total)+"，数据来源：申万宏源，"+str(today)
         df_directprint(cdf1,title_txt,footnote)        
     
     #return clist1,cdf1

{siat-3.0.25.dist-info → siat-3.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.0.25
+Version: 3.0.35
 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.25.dist-info → siat-3.0.35.dist-info}/RECORD

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=hta-X1iWPjNbG1YYIVlQF-YvKA8An3KuEyLmUEZ3hH8,25562
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=s9itecI3JgX5dfrodiFHKcjs5HsOihAMVW8yaETlHMQ,140584
+siat/common.py,sha256=LhJQE0aqAWiLtXIcbEBWGW3xIGwTYu3YHe5w5nVNW_o,141547
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -39,9 +39,9 @@ siat/financial_statements.py,sha256=Ek18eKHflxZ01evOIwnfH1KZ_M2g8Vr8SxkL1om-K7U,
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
 siat/financials.py,sha256=mbEZSNeHMMFcnPUryQWvdmNlWQvpnOG9eItgS7IVw3k,80458
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
-siat/financials2.py,sha256=c5-QHu4VJn6f67mzX_t4cJc99rE3PmlChHC9VCNdYwY,42332
-siat/financials_china.py,sha256=ffikW5pgL0omDq0C8_7wKih-1nYfcVX1u23UAb1bp4U,188137
-siat/financials_china2.py,sha256=fkt9JCLS3nYWGrWFeQa9co1gv1H0PPe2pEw9jdRuoeU,82492
+siat/financials2.py,sha256=CMfvR0zYoNdIE59ruX5AuwNqYil4UNhfRqhyuiC1rl8,44858
+siat/financials_china.py,sha256=eF_vLhjkp5vB29WPSNKstoL-675M7Wp40k16FngBZNo,187808
+siat/financials_china2.py,sha256=yATM_6yKT9IMAUPHXxfhDbldBoJZlGhKAjJOyToIg-A,87012
 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
@@ -91,7 +91,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=IMrbgrYgv5y_ZiVK92AbWiup6eFwcC_u_Pib1srk_z0,104462
+siat/sector_china.py,sha256=PBBRd7bajz3lJAcDRVvJGeeEniNUkgHBpfkowIG2ECE,104574
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=kuYh0V5cqclkM6MjZUd-N361fv3oxGVVerYINuTzZrE,24622
@@ -132,7 +132,7 @@ 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.25.dist-info/METADATA,sha256=AiUF8-PiZRMcVtJ3k7R-oCgYu9C5Hg1wE5WTNxOZ1qk,1448
-siat-3.0.25.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.0.25.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.0.25.dist-info/RECORD,,
+siat-3.0.35.dist-info/METADATA,sha256=KnjDpqBllQ_mZKHGNVMU3J5zze_dUBpdwktja0l88_A,1448
+siat-3.0.35.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.0.35.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.35.dist-info/RECORD,,