siat 2.13.42__py3-none-any.whl → 2.13.43__py3-none-any.whl

siat/grafix.py

@@ -33,6 +33,7 @@ title_txt_size=16
 ylabel_txt_size=14
 xlabel_txt_size=14
 legend_txt_size=14
+annotate_size=9
 
 #设置绘图风格：网格虚线
 plt.rcParams['axes.grid']=False
@@ -1090,12 +1091,12 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             if annotate_value: #在标记曲线名称的同时标记其末端数值
                 plt.annotate(text=c+':'+str(round(y_end,2)), 
                                  xy=(x_end, y_end),
-                                 xytext=(x_end, y_end),fontsize=9)
+                                 xytext=(x_end, y_end),fontsize=annotate_size)
             else:
                 plt.annotate(text=c, 
                                  xy=(x_end, y_end),
                                 #xytext=(x_end, y_end),fontsize=9)
-                                 xytext=(x_end, y_end),fontsize=ylabel_txt_size)
+                                 xytext=(x_end, y_end),fontsize=annotate_size)
                 
         #plt.plot(df[c],label=c,linewidth=1.5,marker=mkc,markersize=3)
         #为折线加数据标签
@@ -1228,11 +1229,11 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             if annotate_value: #在标记曲线名称的同时标记其末端数值
                 plt.annotate(text=c+':'+str(round(y_end,2)), 
                              xy=(x_end, y_end),
-                             xytext=(x_end, y_end),fontsize=9)
+                             xytext=(x_end, y_end),fontsize=annotate_size)
             else:
                 plt.annotate(text=c, 
                              xy=(x_end, y_end),
-                             xytext=(x_end, y_end),fontsize=ylabel_txt_size)
+                             xytext=(x_end, y_end),fontsize=annotate_size)
             
     
     #绘制带状区域
@@ -1257,6 +1258,9 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     if not annotate:
         plt.legend(loc=loc,fontsize=legend_txt_size)
         
+    #设置绘图风格：关闭网格虚线
+    plt.rcParams['axes.grid']=False
+        
     plt.show()
     
     return    

siat/security_trend.py

@@ -145,9 +145,23 @@ def security_trend(ticker,indicator='Close', \
     else:
         validdate,fromdate=check_date2(start)
         if not validdate:
-            print("  #Warning(security_trend): invalid date for",start,"/b, set to MRM")
+            print("  #Warning(security_trend): invalid date for",start,"/b, reset to MRM")
             fromdate=date_adjust(todate,adjust=-31-16)    
 
+    # 检查窗口长度
+    if isinstance(window,str):
+        if window.lower() == "weekly":
+            window=5
+        elif window.lower() == "monthly":
+            window=21
+        elif window.lower() == "quarterly":
+            window=63
+        elif window.lower() == "annual":
+            window=252
+        else:
+            print("  #Warning(security_trend): invalid window size, reset to annual")
+            window=252
+
     # 处理K线图
     if kline and not kline_demo:
         # 跟踪

siat/stock.py

@@ -53,6 +53,10 @@ if czxt in ['linux']: #website Jupyter
 
 # 解决保存图像时'-'显示为方块的问题
 plt.rcParams['axes.unicode_minus'] = False 
+
+#设置绘图风格：关闭网格虚线
+plt.rcParams['axes.grid']=False
+
 #==============================================================================
 def reset_plt():
     """
@@ -79,7 +83,7 @@ def reset_plt():
     legend_txt_size=14
     
     #设置绘图风格：网格虚线
-    plt.rcParams['axes.grid']=True
+    plt.rcParams['axes.grid']=False
     #plt.rcParams['grid.color']='steelblue'
     #plt.rcParams['grid.linestyle']='dashed'
     #plt.rcParams['grid.linewidth']=0.5

siat/stock_technical.py

@@ -54,6 +54,9 @@ if czxt in ['linux']: #website Jupyter
 # 解决保存图像时'-'显示为方块的问题
 plt.rcParams['axes.unicode_minus'] = False 
 
+#设置绘图风格：关闭网格虚线
+plt.rcParams['axes.grid']=False
+
 #==============================================================================
 #==============================================================================
 #==============================================================================
@@ -796,6 +799,9 @@ def stock_MACD(ticker,start='default',end='default', \
         import datetime as dt; today=dt.date.today()    
         source="数据来源：sina/yahoo/stooq/fred，"+str(today)
         
+        #设置绘图风格：关闭网格虚线
+        plt.rcParams['axes.grid']=False
+        
         # 设置绘图区的背景颜色为黑色
         fig=plt.figure()
         ax=fig.add_subplot(111)
@@ -2118,7 +2124,7 @@ def security_technical(ticker,start='default',end='default', \
              boll_days=20,boll_years=7, \
              resample_freq='6H',smooth=True,linewidth=1.5, \
              loc1='best',loc2='best', \
-             graph=['ALL'],printout=True, \
+             graph=['ALL'],printout=False, \
              date_range=False,date_freq=False,annotate=False, \
              technical=['MACD'],indicator='Close'):
     

{siat-2.13.42.dist-info → siat-2.13.43.dist-info}/METADATA

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

@@ -57,7 +57,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=nVzC8u5StHV6ZiyaGXv6L4z5DNZmVjTMFiZ6bKuJGTM,70560
+siat/grafix.py,sha256=sWt4BfCiTfKb5FddcTpfxF-0yNXGi2ftlhryCnZ5MxI,70690
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=Dh4zXEw-0hnbMNorbsRS142C8mUzq4NhFjYnauWu5tc,30548
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -92,10 +92,10 @@ siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,584
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_prices.py,sha256=kGBAqHwmN_iupBZ6v3AUrRHjCSNxP09sz2nlBSVyaHs,76950
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
-siat/security_trend.py,sha256=DQ9hwAioTg0R_9XTqT5jywLWSmMK1GAvOtiPJVFQPZA,15911
+siat/security_trend.py,sha256=AjGvcWIzdDzH8gXPOM2wtffFmdzZ-KoWHD7DsdLJRpU,16361
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=ejCrOoslRzhjA7wNHsLggYw3fWiL-3r3G0PSF06OHw8,141510
+siat/stock.py,sha256=ZMr6wiB6pxKOQ-pQhi3goPjqTYKfY15UXBC5Vtud7tM,141590
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=B1hbZCxJuE5GVvGGmf_rSmQodYHmEFuyiDrUvxHhg4w,83969
@@ -106,7 +106,7 @@ siat/stock_list_china_test.py,sha256=gv14UwMMvkZqtb6G7DCTSuehIwVHuVwu7w60p6gyHoo
 siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum6s,36738
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=npinIwxgfgHeV8tpXrzLBrPUWKMZGL2-xA96ve-H2wM,25329
-siat/stock_technical.py,sha256=mlyJ5D9S4a6aSwMnQLKVs0H1BHB17AUVNiN700j2lXU,96131
+siat/stock_technical.py,sha256=v6MYSrH0jAmBWHOtZw_jl-uln4Ouxcz21jCPSd3MZ_c,96310
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -126,7 +126,7 @@ siat/valuation.py,sha256=x-3qpu_14SLAPuO2gwmT9ojPYIEZCX8KcnIbezDiFKI,47362
 siat/valuation_china.py,sha256=oEQRrktJNHiOG1mJSQN1aSSQAQrwrg-ppIHyNVjMjNg,67603
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=zB_Skk_tmzIR15l6oAW3am4HBGVIG-eZ8gJhCdXZ8Qw,14859
-siat-2.13.42.dist-info/METADATA,sha256=P5aM9gUWP3euErUQSRedm76zcfiYUaKjeK_kLesmlBI,1449
-siat-2.13.42.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-2.13.42.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-2.13.42.dist-info/RECORD,,
+siat-2.13.43.dist-info/METADATA,sha256=qVwesFD3f42XukMjYxvJbgEqG7YVaGmMbN9CdUKJJGo,1449
+siat-2.13.43.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-2.13.43.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-2.13.43.dist-info/RECORD,,