siat 3.1.5__py3-none-any.whl → 3.1.6__py3-none-any.whl

siat/common.py

@@ -399,7 +399,13 @@ def date_adjust2(basedate,adjust_year=0,adjust_month=0,adjust_day=0, \
         new_year=new_year + 1
         
     #合成中间日期：新年份，新月份，原日期
-    ndym=datetime(new_year,new_month,bd_day)
+    while True:
+        try:
+            ndym=datetime(new_year,new_month,bd_day)
+            break
+        except:
+            bd_day=bd_day - 1
+            continue
         
     #调整日期
     nd=ndym + timedelta(days=adjust_day)

siat/fund_china.py

@@ -202,7 +202,7 @@ def fund_stock_holding_compare_china(fund,quarter1,quarter2,rank=10):
     print("\n*** 注：持股数为万股，持仓市值为万元，持仓比例为占基金资产净值比例%，包括A股与非A股")
     print("    数据来源：天天基金/东方财富, 期间持仓股票总计"+str(len(df_merge))+"只,",today)      
     """
-    titletxt="基金持仓分析："+name+'，'+s1+"对比"+s2+"（按后者持仓比例降序排列，"+order+str(rank)+"名成份证券）"
+    titletxt="基金持仓转移矩阵："+name+'，'+s1+"对比"+s2+"（按后者持仓比例降序排列，"+order+str(rank)+"名成份证券）"
     
     footnote1="【注】持仓数为万股，持仓市值为万元，持仓比例为占基金资产净值比例%；"
     footnote2="期间内（曾经）持仓证券数合计"+str(len(df_merge))+"只"+'\n'
@@ -373,7 +373,7 @@ def fund_stock_holding_rank_china(fund,rank=10,year_num=2):
     name=get_fund_name_china2(fund)
     
     #print("=== 基金持仓股票排行分析："+name+"，按照占净值比例高低排列 ===\n")
-    titletxt="基金持仓分析："+name+"，按照占净值比例降序排列，前"+str(rank)+"名成份证券"
+    titletxt="基金持仓转移详情："+name+"，按照占净值比例降序排列，前"+str(rank)+"名成份证券"
     import datetime; todaydt = datetime.date.today()
     #print("\n*** 注：包括A股与非A股。持股结构：股票简称(占净值比例%，持股数万股),",str(todaydt)) 
     footnote="【注】持仓结构：证券简称(占净值比例%，持仓数万股)，"+str(todaydt)+"统计"

siat/stock.py

@@ -1645,7 +1645,7 @@ def compare_msecurity(tickers,measure,start,end, \
     if (len(tickersplit) > 1) and (measure == 'Close'):
         if tickersplit[1].upper() in ['M','B']:
             #y_label='指标'
-            y_label=''
+            y_label='指标对比'
     
     x_label1cn="数据来源: 综合新浪/东方财富/stooq/yahoo等，"
     x_label1en="Source: integrating sina/stooq/yahoo, "
@@ -1653,12 +1653,18 @@ def compare_msecurity(tickers,measure,start,end, \
     import datetime; todaydt = datetime.date.today()
     x_label=x_label1+str(todaydt)  
 
-    title_txt1=text_lang("证券趋势分析：","Trend Analysis: ") 
-    title_txt=title_txt1+y_label
+    title_txt1=text_lang("证券趋势对比分析","Trend Comparative Analysis") 
+    if y_label != '':
+        title_txt=title_txt1+": "+y_label
+    else:
+        title_txt=title_txt1
+        
     if preprocess == 'scaling' and scaling_option == 'change%':
-        title_txt2=text_lang("，涨跌幅度",", Changes")
-        title_txt=title_txt+title_txt2          
-    
+        title_txt2=text_lang("涨跌幅度","Changes")
+        if ':' in title_txt:
+            title_txt=title_txt+', '+title_txt2  
+        else:
+            title_txt=title_txt+': '+title_txt2
 
     # 标准化处理
     dfs2,axhline_label,x_label,y_label,plus_sign=df_preprocess(dfs,measure, \

{siat-3.1.5.dist-info → siat-3.1.6.dist-info}/METADATA

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

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=UOI4sCz3ld7yezlARqPHvgHzfduDiGeRqNa82dDTCZ8,25849
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=kGsyiuYJX-Y8VNb2mmspSp7rNc5r8eexxEt9JiKmwHM,143250
+siat/common.py,sha256=Jjr8Fozk8JpHRMxOuK_a_BXMetV5O8QrmBNFQuGAJZA,143378
 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
@@ -52,7 +52,7 @@ siat/financials_test.py,sha256=HJ3CPo_Xckz2wXi3AEP6ZNWCF1Duc1pLi0Y10USiImc,23829
 siat/fred_test.py,sha256=KF50ssSbsfpa_kT6iuomD0vG4eXztAcOasZxg1OGX5w,1201
 siat/fund.py,sha256=wMDORsCBV8ZXfgwbtq-0bu3qqWY66dHnbqgllW0gWCo,24637
 siat/fund_china.pickle,sha256=QI3IjV46EeJ5ryO3xocmByc-6b_6_nDxgcXDhBHzop0,2380915
-siat/fund_china.py,sha256=uO2RexvO0ldclJwKAtbmdmaP9UvfkHq_uQDKOEVG5Sc,97516
+siat/fund_china.py,sha256=Sa9_s1A_dTT_sBu_pYYw2WaNZF0MIrNy-5X2FO4Lm00,97528
 siat/fund_china_test.py,sha256=-Bh6m0J0GPpIbYXx-H2vpzJoNFI6pE2C2jVPa8DazgE,6649
 siat/fund_test.py,sha256=V4ADb8Gsp8gyeFTwcgRsJBpnUih_O-Q2V1ILc5oKjK8,1116
 siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
@@ -101,7 +101,7 @@ siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2.py,sha256=4yBY3ve0Kddu95JemS02gfLbrHVN2_gl_irr5pA4F6w,24626
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=9w7LzOZzt-gAzfdVfYB8nd73DrG73wLmFpIolJKUCBc,139188
+siat/stock.py,sha256=GkGRY06uIKFuXg0Rw2rhUPFw2LY0VHIV-FMQYcpEP9Q,139380
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -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.1.5.dist-info/METADATA,sha256=DhMrJ6j9bi96HWUuNoi6ryAWc6VhMxFsXHlA1aOTpDY,1447
-siat-3.1.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.1.5.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.1.5.dist-info/RECORD,,
+siat-3.1.6.dist-info/METADATA,sha256=7I1oTuPz1RUF3cmw1c0t_zAdexvckE9P8x9U5sCp16c,1447
+siat-3.1.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.1.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.1.6.dist-info/RECORD,,