siat 3.8.35__py3-none-any.whl → 3.8.36__py3-none-any.whl

siat/economy2.py

@@ -359,10 +359,11 @@ if __name__ =="__main__":
     ticker='CN'
     indicator="NY.GDP.MKTP.KN"
     indicator="GC.XPN.TOTL.GD.ZS"
+    indicator='NE.TRD.GNFS.ZS'
     
     indicator='GC.GDP.COMP.ZS' # 自制指标
     
-    start='2010'; end='2025'; power=3
+    start='2015'; end='2025'; power=3
     
     zeroline=False
     attention_value=''; attention_value_area=''
@@ -451,12 +452,15 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
         pricetmp=pd.merge(pricetmp1,pricetmp2,how='inner',left_on=['country','year'],
                           right_on=['country','year'])
         pricetmp[indicator]=pricetmp.apply(lambda x: round(x[indtmp1]/x[indtmp2]*100,2),axis=1)
-        pricetmp['country']=pricetmp.index[0][0]
-        pricetmp['year']=pricetmp.index
-        pricetmp['year']=pricetmp['year'].apply(lambda x: x[1])
-        
-        pricedf=pricetmp[['country','year',indicator]]
-        pricedf.reset_index(drop=True,inplace=True)
+        pricedf=pricetmp
+    
+    # 分离出country和year字段
+    pricedf['country']=pricedf.index[0][0]
+    pricedf['year']=pricedf.index
+    pricedf['year']=pricedf['year'].apply(lambda x: x[1])
+    
+    pricedf=pricedf[['country','year',indicator]]
+    pricedf.reset_index(drop=True,inplace=True)
 
     # 是否返回None
     if pricedf is None:

{siat-3.8.35.dist-info → siat-3.8.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.8.35
+Version: 3.8.36
 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.8.35.dist-info → siat-3.8.36.dist-info}/RECORD

@@ -30,7 +30,7 @@ siat/cryptocurrency_test.py,sha256=3AikTNJ7j-HwLGLIYEfyXZ3bLVuLeru9mwiwHQi2SdA,2
 siat/derivative.py,sha256=qV8n09799eqLc26ojR6vN5n_X-xd7rGwdYjgq-wBih8,41483
 siat/economy-20230125.py,sha256=vxZZlPnLkh7SpGMVEPLwxjt0yYLSVmdZrO-s2NYLyoM,73848
 siat/economy.py,sha256=BFVQDxOTbuizyumpCgpZIauH6sqnwUXebpqRMmQCzys,84198
-siat/economy2.py,sha256=tdfbDXfv_rI4FjeQEgMwcKnoGNRL_1U2vkrnAPgRmAs,81019
+siat/economy2.py,sha256=inmArHl43HFnSn6O4uY-xcsQY93IyMlFet3pQ7JpsjM,81089
 siat/economy_test.py,sha256=6vjNlPz7W125pJb7simCddobSEp3jmLIMvVkLRZ7zW8,13339
 siat/esg.py,sha256=GMhaonIKtvOK83rhpQUH5aJt2OL3HQBSVfD__Yw-0oo,19040
 siat/esg_test.py,sha256=Z9m6GUt8O7oHZSEG9aDYpGdvvrv2AiRJdHTiU6jqmZ0,2944
@@ -144,8 +144,8 @@ siat/valuation_china.py,sha256=eSKIDckyjG8QkENlW_OKkqbQHno8pzDcomBO9iGNJVM,83079
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.8.35.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.8.35.dist-info/METADATA,sha256=3q8Ct67TlVKt9RRhekzd2I5JXTdrtUqT-4G62BkeH-I,8321
-siat-3.8.35.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.8.35.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.8.35.dist-info/RECORD,,
+siat-3.8.36.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.8.36.dist-info/METADATA,sha256=e4VCORGHR9rk7kDQKISHBuK7_TeZzGpi7M7ZaImKCu0,8321
+siat-3.8.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.8.36.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.8.36.dist-info/RECORD,,