siat 3.2.42__py3-none-any.whl → 3.2.45__py3-none-any.whl

siat/grafix.py

@@ -71,8 +71,8 @@ if czxt in ['win32','win64']:
     plt.rcParams['font.sans-serif'] = ['SimHei']  # 设置默认字体
     mpfrc={'font.family': 'SimHei'}
     """
-    plt.rcParams['font.sans-serif'] = ['SimSun']  # 设置默认字体
-    mpfrc={'font.family': 'SimSun'}
+    plt.rcParams['font.sans-serif'] = ['SimHei']  # 设置默认字体
+    mpfrc={'font.family': 'SimHei'}
     
     if check_language() == "English":
         #设置英文字体

siat/market_china.py

@@ -907,6 +907,8 @@ def market_detail_china2table(df,titletxt,firstColSpecial=True,leftColAlign='l',
 #==============================================================================
 if __name__=='__main__':
     category='price'
+    category='volume'
+    category='return'
     category='valuation'
     
     facecolor='papayawhip'
@@ -975,25 +977,40 @@ def market_detail_china2(category='price',
     
     # 前置空格个数
     heading=' '*1
+    df.rename(columns={'项目':'Item','上海证券交易所':'Shanghai SE','深圳证券交易所':'Shenzhen SE','北京证券交易所':'Beijing SE'},inplace=True)
     
     if category1=='PRICE':
-        titletxt="中国三大股票交易所横向对比：股价与涨跌"
+        titletxt=text_lang("中国三大股票交易所横向对比：股价与涨跌","China Stock Exchanges: Differences in Price")
         
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注释：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆昨日指的是上一个交易日\n"
-        ft4=heading+"☆涨速：平均每分钟股价变化率，表示股价变化速度\n"
-        ft5=heading+"☆5分钟涨跌：最新5分钟内股价的涨跌幅度\n"
-        ft6=heading+"☆振幅：最高最低价差绝对值/昨收，表示股价变化活跃程度\n"
-        ft7=heading+"☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n"
-        ft8=heading+"☆涨跌额：最新价-昨收，表示相对昨日的变化金额\n"
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注释：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆昨日指的是上一个交易日\n","*Prev: refers to previous trading day\n")
+        ft4=heading+text_lang("☆涨速：平均每分钟股价变化率，表示股价变化速度\n","*Changing speed(涨速): rate of changes per minute\n")
+        ft5=heading+text_lang("☆5分钟涨跌：最新5分钟内股价的涨跌幅度\n","*5 min up-down(5分钟涨跌): changes recent 5 minutes\n")
+        ft6=heading+text_lang("☆振幅：最高最低价差绝对值/昨收，表示股价变化活跃程度\n","*Amplitude(振幅): (High - Low)/Prev Close\n")
+        ft7=heading+text_lang("☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n","*Change%(涨跌幅): (Current Price/Prev Close - 1\n")
+        ft8=heading+text_lang("☆涨跌额：最新价-昨收，表示相对昨日的变化金额\n","*Change(涨跌额): Current Price - Prev Close\n")
         
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非交易日或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非交易日或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6+ft7+ft8+ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'Stock Price Level',
+         '.....Prev close mean',
+         '.....Today open mean',
+         '.....Current price mean',
+         'Stock Price Up-down',
+         '.....Current change%',
+         '.....Last 5 min change%',
+         'Today vs. Prev',
+         '.....Amplitude%',
+         '.....Change% mean',
+         '.....Change mean(RMB)']
+        df['Item']=itme_list
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \
@@ -1003,21 +1020,30 @@ def market_detail_china2(category='price',
         
     
     if category1=='VOLUME':
-        titletxt="中国三大股票交易所横向对比：成交状况"
-
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆成交量：当前成交股数，表示交易活跃度\n"
-        ft4=heading+"☆成交额：当前开市后的累计成交金额\n"
-        ft5=heading+"☆换手率：成交量/流通股数，表示成交量占比\n"
-        ft6=heading+"☆量比：当前每分钟成交量/过去5个交易日均值，表示成交量变化\n"
+        titletxt=text_lang("中国三大股票交易所横向对比：成交状况","China Stock Exchanges: Differences in Volume")
+
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆成交量：当前成交股数，表示交易活跃度\n","*Volume(成交量): traded number of shares since open today\n")
+        ft4=heading+text_lang("☆成交额：当前开市后的累计成交金额\n","*Amount(成交额): traded dollar amount since open today\n")
+        ft5=heading+text_lang("☆换手率：成交量/流通股数，表示成交量占比\n","*Turnover rate(换手率): volume/outstanding shares\n")
+        ft6=heading+text_lang("☆量比：当前每分钟成交量/过去5个交易日均值，表示成交量变化\n","*Volume ratio(量比): current turnover per min/prev 5 mean\n")
         
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6 + ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'Volume Level Today',
+         '.....Volume mean(million)',
+         '.....Amount mean(100 millions)',
+         '.....Turnover rate mean %',
+         'Today vs. Prev',
+         '.....Volume ratio(times)']
+        df['Item']=itme_list        
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \
@@ -1027,19 +1053,32 @@ def market_detail_china2(category='price',
         
     
     if category1=='RETURN':
-        titletxt="中国三大股票交易所横向对比：投资回报"
+        titletxt=text_lang("中国三大股票交易所横向对比：投资回报","China Stock Exchanges: Differences in Return")
         
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆MRQ：最近一个季度的滚动数据\n"
-        ft4=heading+"☆YTD：今年以来的累计情况\n"
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆MRQ：最近一个季度的滚动数据\n","*MRQ: most recent quarter\n")
+        ft4=heading+text_lang("☆YTD：今年以来的累计情况\n","*YTD: year to today\n")
         
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
 
         footnote=ft0+ft1+ft2+ft3+ft4 + ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'MRQ Investment Return',
+         '.....MRQ change% mean',
+         '.....MRQ change% median',
+         '.....MRQ change% std',
+         '.....MRQ rising stock%',
+         'YTD Investment Return',
+         '.....YTD change% mean',
+         '.....YTD change% median',
+         '.....YTD change% std',
+         '.....YTD rising stock%']
+        df['Item']=itme_list 
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \
@@ -1049,20 +1088,44 @@ def market_detail_china2(category='price',
         
     
     if category1=='VALUATION':
-        titletxt="中国三大股票交易所横向对比：市值与估值"
+        titletxt=text_lang("中国三大股票交易所横向对比：市值与估值","China Stock Exchanges: Differences in Valuation")
         
-        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
-        ft1=heading+"注：\n"
-        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
-        ft3=heading+"☆市盈率：这里为动态市盈率，即市盈率TTM，过去12个月的连续变化\n"
-        ft4=heading+"☆市净率：这里为静态市净率\n"
-        ft5=heading+"☆标准差/均值=标准差(数值)/均值，提升可比性\n"
+        ft0=heading+text_lang("信息来源：东方财富，统计时间:","Data source: EM, updated ")+nowstr+"\n"
+        ft1=heading+text_lang("注：\n","Notes:\n")
+        ft2=heading+text_lang("☆可交易股票数量：将随着股票停复牌情况变化\n","*Tradeable stocks: vary with suspension/resumption\n")
+        ft3=heading+text_lang("☆市盈率：这里为动态市盈率，即市盈率TTM，过去12个月的连续变化\n","*P/E: price/earnings per share, TTM\n")
+        ft4=heading+text_lang("☆市净率：这里为静态市净率\n","*P/B: price/net asset per share, stationary\n")
+        ft5=heading+text_lang("☆标准差/均值=标准差(数值)/均值，提升可比性\n","*std/mean: degree of variation, better comparability\n")
        
-        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
-        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")
+        ft10=heading+text_lang("☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n","*Missing data may happen around non-trading time\n")
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5 + ft9+ft10
         
+        itme_list=['Tradeable stocks',
+         'Total Market Cap (TMC)',
+         '.....Whole Market TMC(trillion)',
+         '.....Stock TMC mean(billion)',
+         '.....Stock TMC median(billion)',
+         '.....Stock TMC std/mean',
+         'Outstanding Market Cap (OMC)',
+         '.....Whole Market OMC(trillion)',
+         '.....Whole Market outstanding %',
+         '.....Stock OMC mean(billion)',
+         '.....Stock OMC median(billion)',
+         '.....Stock OMC std/mean',
+         'Valuation: P/E',
+         '.....Stock P/E mean',
+         '.....Stock P/E median',
+         '.....Stock P/E std/mean',
+         'Valuation: P/B',
+         '.....Stock P/B mean',
+         '.....Stock P/B median',
+         '.....Stock P/B std/mean']
+
+        df['Item']=itme_list 
+
+        
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
                            last_col_align='right',other_col_align='right', \

{siat-3.2.42.dist-info → siat-3.2.45.dist-info}/METADATA

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

@@ -60,13 +60,13 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=yQF04A_a0I5D14hj3UjpsK-9pc48474OpN5n7MSBaY0,87137
+siat/grafix.py,sha256=W5I4IdOm9q7CdDHFSv6xFmfk9sPZXItXC4cCvp2q6mU,87137
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
 siat/local_debug_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/luchy_draw.py,sha256=CESMhLYcsC6UtYfTZOfYnVQ84zz1MnXRN81P7OZHEgE,20516
-siat/market_china.py,sha256=hKoTLUyHuzsuG2L3_IuLx_utTKqS-__mZ63wrElh65U,45943
+siat/market_china.py,sha256=EOO-RvdnzJThTrgNHWW3TlWhx4k4rfdjbooOnQsYdQU,50299
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
 siat/markowitz2.py,sha256=csHIjqTbIsHMYQ_LEur9K0Jg8pOm8deEVdQfAGCOG5o,111461
@@ -138,7 +138,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
-siat-3.2.42.dist-info/METADATA,sha256=o8tnZNRpv0vMzDbsUAvLEyrFxLcFSWk_sOZhxEhV49w,7283
-siat-3.2.42.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.42.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.42.dist-info/RECORD,,
+siat-3.2.45.dist-info/METADATA,sha256=a1zRvc3eoGiRhfDYBCgHd6iE9YgNmlj83jV1Alrq7Cc,7283
+siat-3.2.45.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.45.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.45.dist-info/RECORD,,