siat 3.4.1__py3-none-any.whl → 3.4.2__py3-none-any.whl

siat/security_price2.py

@@ -290,7 +290,7 @@ def get_price_mticker(ticker,fromdate,todate, \
     if ticker_num == 1:
         df,found=get_price_1ticker(ticker=ticker_list[0],fromdate=fromdate,todate=todate, \
                              adjust=adjust_list[0],source=source_list[0], \
-                             ticker_type=ticker_type_list[0])
+                             ticker_type=ticker_type_list[0],fill=fill)
 
     #多个普通证券
     if ticker_num > 1:
@@ -301,7 +301,8 @@ def get_price_mticker(ticker,fromdate,todate, \
             tt=ticker_type_list[pos]
             
             #普通单个证券
-            dft,found=get_price_1ticker(t,fromdate,todate,adjust=at,source=st,ticker_type=tt)
+            dft,found=get_price_1ticker(t,fromdate,todate,adjust=at,source=st, \
+                                        ticker_type=tt,fill=fill)
             if found=='Found':            
                 columns=create_tuple_for_columns(dft,t)
                 dft.columns=pd.MultiIndex.from_tuples(columns)
@@ -653,6 +654,9 @@ def get_price_1ticker_mixed(ticker,fromdate,todate, \
         df,found=get_price_1portfolio(ticker=ticker,fromdate=fromdate,todate=todate, \
                              ticker_type=ticker_type,source=source, \
                              adjust=adjust,fill=fill)
+        #对空缺值填充，以免影响后续计算
+        df=df.fillna(method='ffill')
+        df=df.fillna(method='bfill')
             
     return df,found
     

siat/stock.py

@@ -788,7 +788,7 @@ def stock_ret(ticker,fromdate,todate, \
         return        
 
     import datetime; todaydt = datetime.date.today()
-    footnote=text_lang("数据来源：综合新浪/东方财富/stooq/雅虎财经，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
+    footnote=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
     collabel=ectranslate(rtype)
     ylabeltxt=ectranslate(rtype)
     titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("，收益率",", Rate of Return")
@@ -927,7 +927,7 @@ def security_mindicators(ticker,measures,
     
         y_label=text_lang('证券指标',"Indicator")
         import datetime; todaydt = datetime.date.today()
-        x_label=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
+        x_label=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
     
         axhline_value=0
         axhline_label=''
@@ -1052,7 +1052,7 @@ def price_volatility2(pricedf,ticker,fromdate,todate, \
 
     titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("，价格波动风险",", Price Volatility Risk")
     import datetime; todaydt = datetime.date.today()
-    footnote=texttranslate("数据来源：综合新浪/东方财富/stooq/yahoo，")+str(todaydt)
+    footnote=texttranslate("数据来源：Sina/EM/Stooq/Yahoo，")+str(todaydt)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1171,7 +1171,7 @@ def ret_volatility2(retdf,ticker,fromdate,todate, \
 
     titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("，收益率波动风险",", Return Volatility Risk")
     import datetime; todaydt = datetime.date.today()
-    footnote=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
+    footnote=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1288,7 +1288,7 @@ def ret_lpsd2(retdf,ticker,fromdate,todate, \
 
     titletxt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker,ticker_type=ticker_type)+text_lang("波动损失风险","Volatility Loss Risk")
     import datetime; todaydt = datetime.date.today()
-    footnote=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
+    footnote=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(todaydt)
     collabel=ectranslate(rtype)
     ylabeltxt=ectranslate(rtype)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1351,7 +1351,7 @@ def comp_1security_2measures(df,measure1,measure2,twinx=False, \
     titletxt=text_lang("证券趋势分析：","Security Trend: ")+tname
     
     import datetime; todaydt = datetime.date.today()
-    footnote1=text_lang("数据来源：综合Sina/EM/Stooq/Yahoo，","Source: Sina/EM/Stooq/Yahoo, ")
+    footnote1=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Source: Sina/EM/Stooq/Yahoo, ")
     footnote=footnote1+str(todaydt)
     
     #绘图
@@ -1421,7 +1421,7 @@ def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left', \
     titletxt=titletxt1+tname1+" vs "+tname2
         
     import datetime; todaydt = datetime.date.today()
-    footnote1=text_lang("数据来源：综合/东方财富/stooq/yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")
+    footnote1=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")
     footnote=footnote1+str(todaydt)+text_lang("统计","")
 
     plot_line2(df1,ticker1,measure,label,df2,ticker2,measure,label, \
@@ -1963,7 +1963,7 @@ def compare_msecurity(tickers,measure,start,end, \
             #y_label='指标'
             y_label='指标对比'
     
-    x_label1cn="数据来源: 综合Sina/EM/Stooq/Yahoo等，"
+    x_label1cn="数据来源: Sina/EM/Stooq/Yahoo，"
     x_label1en="Source: Sina/EM/Stooq/Yahoo, "
     x_label1=text_lang(x_label1cn,x_label1en)   
     import datetime; todaydt = datetime.date.today()
@@ -2478,7 +2478,7 @@ def candlestick_demo(stkcd,fromdate,todate, \
     titletxt0=text_lang("K线图/蜡烛图演示：","Candlestick Chart Demo: ")
     titletxt=titletxt0 + ticker_name(str(stkcd),ticker_type=ticker_type)
     price_txt=text_lang('价格','Price')
-    source_txt=text_lang("数据来源: 综合新浪/Stooq/雅虎等","Data source: Sina/Stooq/Yahoo")
+    source_txt=text_lang("数据来源: Sina/EM/Stooq/Yahoo","Data source: Sina/Stooq/Yahoo")
 
     plt.title(titletxt,fontsize=title_txt_size,fontweight='bold')
     plt.ylabel(price_txt,fontsize=ylabel_txt_size)
@@ -3977,7 +3977,7 @@ def compare_mmeasure(ticker,measures,fromdate,todate, \
     y_label=''
     import datetime; today = datetime.date.today()
     
-    x_label=text_lang("数据来源: 综合新浪/Yahoo/stooq，","Data source: Sina/Yahoo/Stooq, ")+str(today)
+    x_label=text_lang("数据来源: Sina/EM/Stooq/Yahoo，","Data source: Sina/Yahoo/Stooq/EM, ")+str(today)
     title_txt=text_lang("证券趋势分析：","Security Trend: ")+ticker_name(ticker)
         
     draw_lines(df3,y_label=y_label,x_label=x_label, \

{siat-3.4.1.dist-info → siat-3.4.2.dist-info}/METADATA

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

@@ -97,7 +97,7 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 siat/sector_china.py,sha256=nP6kfYsnaQWZj8dK-zklwSDW8FDS-obZWp_zL0ec2Ig,118603
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
-siat/security_price2.py,sha256=4xvc9AzRhLKJMu6AxVzIqcn1-NrHoeCF2Ao2p9nwYjU,25978
+siat/security_price2.py,sha256=65s64L68aRZdVVK3V8UYxdPd_JHMqgJ2FBJJX5MSW-Q,26174
 siat/security_prices.py,sha256=2aLBSyVRfcZ1-5jqF_r3N02RvlaNNqssJS9GgxGidgM,106235
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
@@ -105,7 +105,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=lUMab8HilXIUPo_z9ZkztMiZ5kf3jAbbCwPPkYbQ1TI,25288
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=cKtez5i9G143rSw7rRll6rRIFTWnQ3RaHF7CVnu7qk8,152571
+siat/stock.py,sha256=uubLm3Qd1N02FI6nBnB9CvQrY_rJV8RfQI-_4zxIfog,152436
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -139,7 +139,7 @@ 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/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
-siat-3.4.1.dist-info/METADATA,sha256=0s5TpzHfnUzzwRFnFeoBNXS-3miIuEZglezF2dKX0rs,7309
-siat-3.4.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.4.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.1.dist-info/RECORD,,
+siat-3.4.2.dist-info/METADATA,sha256=f_VyzH3bJZHoBhz45fW6KnNGf2wyC6QYP5XKgSEBUQQ,7309
+siat-3.4.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.4.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.2.dist-info/RECORD,,