siat 3.5.12__py3-none-any.whl → 3.6.1__py3-none-any.whl

siat/valuation.py

@@ -942,6 +942,8 @@ def security_valuation(tickers,indicators,start,end, \
                        preprocess='none',scaling_option='start', \
                        twinx=False,loc1='best',loc2='best', \
                        graph=True,facecolor='whitesmoke', \
+                                             attention_value='', \
+                                             attention_point='', \
                        annotate=False,annotate_value=False, \
                        mark_top=False,mark_bottom=False,mark_end=False):
     """
@@ -992,7 +994,7 @@ def security_valuation(tickers,indicators,start,end, \
         footnote1=""
         if i=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1001,7 +1003,10 @@ def security_valuation(tickers,indicators,start,end, \
         draw_lines(df2,y_label=ylabeltxt,x_label=footnote, \
                    axhline_value=0,axhline_label='', \
                    title_txt=titletxt,data_label=False, \
-                   resample_freq='D',loc=loc1,facecolor=facecolor,
+                   resample_freq='D',loc=loc1,facecolor=facecolor, \
+                                             attention_value=attention_value, \
+                                             attention_point=attention_point, \
+                    annotate=annotate,annotate_value=annotate_value, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df
@@ -1015,12 +1020,12 @@ def security_valuation(tickers,indicators,start,end, \
         df2_1.rename(columns={t:i1},inplace=True)
         df2_2.rename(columns={t:i2},inplace=True)
         
-        titletxt="证券估值走势对比："+t   
+        titletxt="证券估值走势："+t   
         
         footnote1=""
         if i1=='MV' or i2=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1037,7 +1042,11 @@ def security_valuation(tickers,indicators,start,end, \
                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
                    twinx=twinx, \
                    resample_freq='D',loc1=loc1,loc2=loc2, \
-                   color1='red',color2='blue',facecolor=facecolor)
+                   color1='red',color2='blue',facecolor=facecolor, \
+                                             yline=attention_value, \
+                                             xline=attention_point
+                 )
+            
         return df
    
     # 绘制双线: 两只证券，一个指标。twinx双轴绘图
@@ -1048,13 +1057,13 @@ def security_valuation(tickers,indicators,start,end, \
         df2_1.rename(columns={t1:i},inplace=True)
         df2_2.rename(columns={t2:i},inplace=True)
         
-        #titletxt="证券估值走势对比："+i
-        titletxt="证券估值走势对比："+ectranslate(i)
+        #titletxt="证券估值走势："+i
+        titletxt="证券估值走势："+ectranslate(i)
         
         footnote1=""
         if i=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1074,7 +1083,10 @@ def security_valuation(tickers,indicators,start,end, \
                    ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote, \
                    twinx=twinx, \
                    resample_freq='D',loc1=loc1,loc2=loc2, \
-                   color1='red',color2='blue',facecolor=facecolor)
+                   color1='red',color2='blue',facecolor=facecolor, \
+                                             yline=attention_value, \
+                                             xline=attention_point
+                 )
 
         return df                
    
@@ -1089,7 +1101,7 @@ def security_valuation(tickers,indicators,start,end, \
         footnote1=""
         if i=='MV':
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
                 
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1110,11 +1122,13 @@ def security_valuation(tickers,indicators,start,end, \
                    annotate=annotate,annotate_value=annotate_value, \
                    plus_sign=plus_sign, \
                    facecolor=facecolor, \
+                                             attention_value=attention_value, \
+                                             attention_point=attention_point, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df        
    
-    # 绘制多线：一只证券，多个指标。简单多线绘图
+    # 绘制多线：一只证券，多个指标。简单多线绘图。可能数量级差异较大，意义有限
     if name_num == 1 and indicator_num >= 2 and not twinx: 
         t=names1[0]
         df2=None
@@ -1134,7 +1148,7 @@ def security_valuation(tickers,indicators,start,end, \
         footnote1=''
         if 'MV' in indicators1:
             if preprocess=='none':
-                footnote1="注：市值金额：十亿，当地货币单位\n"
+                footnote1="注：市值金额：十亿，本币单位\n"
             
         todaydt = datetime.date.today()
         footnote9="数据来源: Baidu/Stooq/FundDB/SWHY，"+str(todaydt)
@@ -1154,6 +1168,9 @@ def security_valuation(tickers,indicators,start,end, \
                    resample_freq='D',loc=loc1,plus_sign=plus_sign, \
                    annotate=annotate,annotate_value=annotate_value, \
                    facecolor=facecolor, \
+                                             attention_value=attention_value, \
+                                             attention_point=attention_point, \
+                       
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)        
         
         return df 

{siat-3.5.12.dist-info → siat-3.6.1.dist-info}/METADATA

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

@@ -15,7 +15,7 @@ siat/bond_china.py,sha256=eYv-nMoWSS5fZ4VxnuJ29QFY9GUS6meGiIc0Xjm1fQI,3038
 siat/bond_test.py,sha256=yUOFw7ddGU-kb1rJdnsjkJWziDNgUR7OLDA7F7Ub91A,5246
 siat/bond_zh_sina.py,sha256=26BohGcS120utwqg9dJvdGm5OkuNpNu5bco80uOuQpU,4423
 siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
-siat/capm_beta2.py,sha256=lUuCPVSxebkA2yye1PXu1V2Jd2UKEwD_kIA25DCIDTs,29750
+siat/capm_beta2.py,sha256=kT1cEWs35swRECHzi0umZehLz8mEQpIHK9xSW8oG2co,31746
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
 siat/common.py,sha256=dqvWnw2gyMVo7l2dMyhJeaJZJIyUCVcTMTXC1ryHQos,160442
@@ -60,7 +60,7 @@ 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=rya9u6jzNnuw1Io4Ub6Da8h276DCzbyL3hjWpzHY0mY,87873
+siat/grafix.py,sha256=YDpAo2N-YD3G5tilMErYgPT30Fue05ogul6XI8tBebo,97976
 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
@@ -80,7 +80,7 @@ siat/markowitz_test2.py,sha256=FcVZqYU5va4567WGUVUJ7cMQdVbBGxeBAz82Y3BhCTI,2193
 siat/ml_cases.py,sha256=FYDk0O7l9hhHlbrlOVGgbH-h2DA503lhKFi9XugH1f0,86874
 siat/ml_cases_example.py,sha256=xRGb3YTQEDTOnaWNzZN_myU5umQnA2RdMNiPrxTmn9c,1673
 siat/ml_cases_example1.py,sha256=xRGb3YTQEDTOnaWNzZN_myU5umQnA2RdMNiPrxTmn9c,1673
-siat/option_china.py,sha256=0eIWy5-0L8fECVwakVoA8EUO-_5u5jGW66dVLRi1_PY,120954
+siat/option_china.py,sha256=vPALLZDN_oIOmwpaLdB5V6dH4OuA4Q4rSy1K0ADkqYI,120954
 siat/option_china_test.py,sha256=UQ-YUHUjoGBQyanLcM-yzqeEIUQP_gCQIeT0W6rnUnA,16355
 siat/option_pricing.py,sha256=VEqe7VbPkdWX8lS7fJaL1GF9cQx2HRe3UBI2XZJouBQ,73237
 siat/option_pricing_test.py,sha256=eeorV5Ja5vjlRXnP6fWJHetGU5Vb8SnLopkC6RV3GfA,2203
@@ -88,7 +88,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=oRUOagpQlGB56R1xIHZoYwAi42RqcZl0R-JCVBCKVe0,55086
-siat/risk_adjusted_return2.py,sha256=eg8TB1GBjUJK9NiE0no4JrsQWVe6J5C0ffJDaCh2FSA,81395
+siat/risk_adjusted_return2.py,sha256=r5o0tVAJZmlWvdHYiN8SlCCaShEVYCyNCdPuFzoUO-Y,83913
 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
@@ -102,10 +102,10 @@ siat/security_prices.py,sha256=Zhn6pvwLy996mbBHDorbqWQdQw9RHdr9m0yzke3ya8M,10859
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
-siat/security_trend2.py,sha256=JHrO5zDBYMLbpvotdaqaUcFrxm2di60kMVOdeom8t8A,26336
+siat/security_trend2.py,sha256=Hu2drmy7ryy1q3VNRcPQZB4_LXzvAuZEU2QJgC1jlwE,29013
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=oUPX2yHGclBoO97d5XocvdSJ8grwpDoJ8aJtOlu4oas,155637
+siat/stock.py,sha256=0HnhZjbddNg1ZOeUgsSg0gdm4bqq-VACY-s8sJUpDdo,158372
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -131,17 +131,17 @@ 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=wj9ct1j967u1KOjCJVoeopSaypWWWTxzEeJKeUACp4c,241177
+siat/translate.py,sha256=4A5uovLiv2wwfMOc71hnKpxCMp8WV6mDohkARKBdSB8,241180
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/valuation.py,sha256=WCqL5zYkZ_Y3MLeoWXTu3G1CknwGdYzhpszbT6cEoYk,49255
+siat/valuation.py,sha256=4t3tLWNC-eh5dmtefzpQiElo0I_5l6zD8vzOXizhpdg,50309
 siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=7uLAcOc8XwfYDjuLqWDiUZHfdMpEbytW7E2ayNNT3f4,20069
-siat-3.5.12.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.5.12.dist-info/METADATA,sha256=Shgl7GEqy3CgeZ7j_sOjjmX34n1dkjSUh4rhQ_JCBfg,8010
-siat-3.5.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.5.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.5.12.dist-info/RECORD,,
+siat-3.6.1.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.6.1.dist-info/METADATA,sha256=baefddzhmDzGjz9TMSNKBzecLcSYV1WywCO5yV3WTcE,8009
+siat-3.6.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.6.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.6.1.dist-info/RECORD,,