siat 3.6.6__py3-none-any.whl → 3.6.7__py3-none-any.whl

siat/grafix.py

@@ -362,7 +362,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
-    plt.legend()
+    plt.legend(loc=loc,fontsize=legend_txt_size)
     plt.show()
     plt.close()
     

siat/security_trend2.py

@@ -418,7 +418,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                                     attention_value=attention_value,attention_value_area=attention_value_area, \
                                     attention_point=attention_point,attention_point_area=attention_point_area, \
                               datatag=datatag,power=power,graph=graph, \
-                              source=source, \
+                              source=source,loc=loc1, \
                               mark_top=mark_top,mark_bottom=mark_bottom, \
                               mark_end=mark_end,ticker_type=ticker_type, \
                               facecolor=facecolor)

siat/stock.py

@@ -635,7 +635,7 @@ def security_indicator(ticker,indicator, \
                        average_value=False, \
                        datatag=False,power=0,graph=True,source='auto', \
                        mark_top=True,mark_bottom=True,mark_end=True, \
-                       ticker_type='auto',facecolor='whitesmoke'):
+                       ticker_type='auto',facecolor='whitesmoke',loc='best'):
     """
     功能：单只证券的全部指标
     """
@@ -746,7 +746,7 @@ def security_indicator(ticker,indicator, \
                   attention_value=attention_value,attention_value_area=attention_value_area, \
                   attention_point=attention_point,attention_point_area=attention_point_area, \
               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
-              facecolor=facecolor)
+              facecolor=facecolor,loc=loc)
     
     return erdf3
     

siat/translate.py

@@ -1089,11 +1089,11 @@ def codetranslate0(code):
         ['^SMI','瑞士SMI指数'],['^MOEX','俄罗斯莫斯科指数(卢布计价)'],
         ['^UX','乌克兰UX指数'],['^RTS','俄罗斯市值加权指数(美元计价)'],
         ['^AEX','荷兰阿姆斯特丹指数'],['^ATH','希腊雅典综合指数'],
-        ['^BEL20','比利时20指数'],['^BVP','巴西BVP指数'],
-        ['^IPC','墨西哥IPC指数'],['^IPSA','智利IPSA指数'],
+        ['^BEL20','比利时20指数'],['^BVSP','巴西圣保罗指数'],
+        ['^MXX','墨西哥IPC指数'],['^IPSA','智利IPSA指数'],
         ['^JCI','印尼雅加达指数'],['^KOSPI','韩国综合指数'],
         ['^KLCI','马来西亚吉隆坡指数'],
-        ['^MRV','阿根廷MERVAL指数'],['M.BA','阿根廷MERVAL指数'],
+        ['^MRV','阿根廷MERVAL指数'],['^MERV','阿根廷MERVAL指数'],['M.BA','阿根廷MERVAL指数'],
         ['^MT30','沙特TASI指数'],['^NZ50','新西兰50指数'],
         ['^PSI20','葡萄牙PSI20指数'],['^PSEI','菲律宾PSEi指数'],
         ['^SET','泰国SET指数'],['^STI','新加坡海峡时报指数'],
@@ -1268,6 +1268,8 @@ def codetranslate0(code):
 
         #期货==================================================================
         ["HG=F",'COMEX铜矿石期货'],["CL=F",'NYM原油期货'],
+        ["NG=F",'NYM天然气期货'],["MTF=F",'NYM煤炭期货'],
+        ["GC=F",'COMEX黄金期货'],["MGC=F",'COMEX微型黄金期货'],
         ["6B=F",'CME英镑兑美元期货'],
         ["S=F",'CBT大豆期货'],["C=F",'CBT玉米期货'],
         ["ES=F",'CME标普500指数期货'],["YM=F",'CBT道指期货'],

{siat-3.6.6.dist-info → siat-3.6.7.dist-info}/METADATA

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

@@ -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=4zxsXkN0GsygiXx7dDSV502GXPRtK__25Iv12QoJQAQ,107580
+siat/grafix.py,sha256=yhWxVk0b-u5ZbP_DS32tZLudl5rwFlUBquiF4JrhXq8,107612
 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
@@ -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=301cQzTM7O70IinkhQvj458WXcOo8zQwyKjM62HI5g0,29747
+siat/security_trend2.py,sha256=mamJtFAbXC1orGgMEmp0taPk-yUqWm-jdGf64bjhn2Q,29756
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=hn5FfpnUWWLiy7m2c81ND0_kUXMn5kuL9qHjq7IqwLg,158594
+siat/stock.py,sha256=sDYEXGE9XYnzRYzxv1AUJqMqAu6ISZx7skiu82L1Z7Y,158613
 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,7 +131,7 @@ 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=4A5uovLiv2wwfMOc71hnKpxCMp8WV6mDohkARKBdSB8,241180
+siat/translate.py,sha256=aAWk9museEsdxDstXjEy_SXiEzvKD_6fDi0W4TrBiwI,241364
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
@@ -140,8 +140,8 @@ 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.6.6.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.6.6.dist-info/METADATA,sha256=BFr_n9-q56P9IzFDo6bD84AmcsOMmdKLElMes4mtUjM,8009
-siat-3.6.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.6.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.6.6.dist-info/RECORD,,
+siat-3.6.7.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.6.7.dist-info/METADATA,sha256=vhM0Z4lhSt8gGEQbaP8AvVOSR-k63r5nc-5YnBXjts8,8009
+siat-3.6.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.6.7.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.6.7.dist-info/RECORD,,