siat 3.8.25__py3-none-any.whl → 3.8.26__py3-none-any.whl

siat/economy2.py

@@ -329,10 +329,15 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
     pricedf.sort_index(inplace=True)
     #pricedf.drop(columns='country',inplace=True)
     
+    # 若不绘图则直接返回数据，不进行数量单位变换，否则后期对比可能产生数量级不一致问题
+    if not graph:
+        return pricedf
+    
     erdf3=pricedf
 
     # 换算数量单位
-    ind_max=erdf3[indicator_name].max(); ind_min=erdf3[indicator_name].min()
+    ind_max=erdf3[indicator_name].max()
+    ind_min=erdf3[indicator_name].min()
     ind_median=erdf3[indicator_name].median()
 
     kilo=1000; million=kilo * 1000; billion=million * 1000
@@ -351,15 +356,16 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
     else:
         unit=''; unit_amount=1
         
-    erdf3['unit']=unit
+    erdf3['unit']=unit; erdf3['unit_amount']=unit_amount
         
     if unit != '':
         erdf3[indicator_name]=erdf3[indicator_name].apply(lambda x: round(x/unit_amount,2))
 
     # 绘图
+    """
     if not graph:
         return erdf3
-
+    """
     # 判断是否绘制零线    
     if ind_max * ind_min <0:
         zeroline=True
@@ -395,12 +401,12 @@ def economy_indicator_wb(ticker='CN',indicator='NY.GDP.MKTP.KN', \
                   facecolor=facecolor,loc=loc,maxticks=30,translate=translate)
     except Exception as e:
         # 捕获所有异常
-        print(f"Error：{e}")
-        print("Details:")
+        print(f"  #Error(economy_indicator_wb)：{e}")
+        print("  Details:")
         import traceback
         traceback.print_exc()
     
-    return erdf3
+    return pricedf
 
 
 #==============================================================
@@ -492,7 +498,7 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
             sys.stdout = self._original_stdout
 
     df=pd.DataFrame(); have_data=False
-    indicator_list=[]; unit_list=[]
+    indicator_list=[]
     for m in measures:
         print(f"  Searching indicator {m} ... ...")
 
@@ -512,9 +518,7 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
         have_data=True
         
         country=dftmp['country'].values[0]
-        unit=dftmp['unit'].values[0]
-        unit_list=unit_list+[unit]
-        dftmp.drop(columns=['country','unit'],inplace=True)
+        dftmp.drop(columns=['country'],inplace=True)
         indicator_name=list(dftmp)[0]
         
         if m in band_area:
@@ -527,7 +531,9 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
         else:
             df=pd.merge(df,dftmp,left_index=True,right_index=True)
 
-    if not graph: return df
+    # 若不绘图则直接返回数据
+    pricedf=df.copy()
+    if not graph: return pricedf
 
     if not have_data:
         #print(f"  #Error(economy_mindicators_wb): no record found on {indicator} for {ticker}")
@@ -540,25 +546,38 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
     import datetime; todaydt = datetime.date.today()
     footnote2=text_lang("数据来源：WB/IMF/FRED","Data source: World Bank")+', '+str(todaydt)
 
-    one_unit=False
-    if len(set(unit_list)) == 1: one_unit=True
-    if one_unit:
-        x_label=footnote2
-        if unit != '':
-            titletxt=titletxt+', '+unit
+    # 处理数量级问题
+    max_val=min_val=0
+    for c in list(df):
+        max_tmp=df[c].max(); min_tmp=df[c].min()
+        if max_val < max_tmp: max_val = max_tmp
+        if min_val > min_tmp: min_val = min_tmp
+    ind_median=(max_val + min_val) / 2
+    
+    kilo=1000; million=kilo * 1000; billion=million * 1000
+    trillion=billion * 1000; quadrillion=trillion * 1000
+    
+    if ind_median > quadrillion:
+        unit=text_lang('单位：千万亿','in Quadrillions'); unit_amount=quadrillion
+    elif ind_median > trillion:
+        unit=text_lang('单位：万亿','in Trillions'); unit_amount=trillion
+    elif ind_median > billion:
+        unit=text_lang('单位：十亿','in Billions'); unit_amount=billion
+    elif ind_median > million:
+        unit=text_lang('单位：百万','in Millions'); unit_amount=million
+    elif ind_median > kilo:
+        unit=text_lang('单位：千','in Thousands'); unit_amount=kilo
     else:
-        #footnote1='The units of '+str(indicator_list)+' are '+str(unit_list)+' respectively'
-        footnote1=text_lang('注：','Notes: '); indicator_list_len=len(indicator_list)
-        for ind in indicator_list:
-            pos=indicator_list.index(ind)
-            footnote1=footnote1+ind+' '+unit_list[pos]
-            if (pos < indicator_list_len - 1):
-                if (pos+1) % 2 != 0:
-                    footnote1=footnote1+', '
-                else:
-                    footnote1=footnote1+'\n'
+        unit=''; unit_amount=1    
+    
+    for c in list(df):
+        df[c]=df[c].apply(lambda x: round(x/unit_amount,2) if x >= unit_amount else round(x/unit_amount,4))
+    
+    x_label=footnote2
+    if unit != '':
+        titletxt=titletxt+', '+unit
             
-        x_label=footnote1+'\n'+footnote2
+    x_label=footnote2
 
     axhline_value=0; axhline_label=''
     above_zero=0; below_zero=0
@@ -591,7 +610,7 @@ def economy_mindicators_wb(ticker='CN',indicator=['NY.GDP.MKTP.CN','NY.GDP.MKTP.
                mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor, \
                band_area=band_area,loc=loc,maxticks=maxticks,translate=translate)
 
-    return df
+    return pricedf
 
 
 #==============================================================================
@@ -701,7 +720,7 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
     #from functools import reduce
 
     dfs=pd.DataFrame(); have_data=False
-    country_list=[]; unit_list=[]
+    country_list=[]
     for t in tickers:
         print(f"  Looking for {measure} info in {t} ... ...")
         with HiddenPrints():
@@ -718,9 +737,7 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
 
         country=df_tmp['country'].values[0]
         country_list=country_list+[country]
-        unit=df_tmp['unit'].values[0]
-        unit_list=unit_list+[unit]    
-        df_tmp.drop(columns=['country','unit'],inplace=True)
+        df_tmp.drop(columns=['country'],inplace=True)
         indicator_name=list(df_tmp)[0]
         
         if DEBUG:
@@ -747,7 +764,8 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
         return None
 
     # 若不绘图则返回原始数据
-    if not graph: return dfs
+    pricedf=dfs.copy()
+    if not graph: return pricedf
 
     if not have_data:
         #print(f"  #Error(economy_mticker_wb): no record found on {indicator} for {ticker}")
@@ -761,22 +779,34 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
     import datetime; todaydt = datetime.date.today()
     footnote2=text_lang("数据来源：WB/IMF/FRED","Data source: WB/IMF/FRED")+', '+str(todaydt)
 
-    one_unit=False
-    if len(set(unit_list)) == 1: one_unit=True
-    if one_unit:
-        x_label=footnote2
+    # 处理数量级问题
+    max_val=min_val=0
+    for c in list(dfs):
+        max_tmp=dfs[c].max(); min_tmp=dfs[c].min()
+        if max_val < max_tmp: max_val = max_tmp
+        if min_val > min_tmp: min_val = min_tmp
+    ind_median=(max_val + min_val) / 2
+    
+    kilo=1000; million=kilo * 1000; billion=million * 1000
+    trillion=billion * 1000; quadrillion=trillion * 1000
+    
+    if ind_median > quadrillion:
+        unit=text_lang('单位：千万亿','in Quadrillions'); unit_amount=quadrillion
+    elif ind_median > trillion:
+        unit=text_lang('单位：万亿','in Trillions'); unit_amount=trillion
+    elif ind_median > billion:
+        unit=text_lang('单位：十亿','in Billions'); unit_amount=billion
+    elif ind_median > million:
+        unit=text_lang('单位：百万','in Millions'); unit_amount=million
+    elif ind_median > kilo:
+        unit=text_lang('单位：千','in Thousands'); unit_amount=kilo
     else:
-        footnote1=text_lang('注：','Notes: '); country_list_len=len(country_list)
-        for ind in country_list:
-            pos=country_list.index(ind)
-            footnote1=footnote1+ind+' '+unit_list[pos]
-            if (pos < country_list_len - 1):
-                if (pos+1) % 2 != 0:
-                    footnote1=footnote1+', '
-                else:
-                    footnote1=footnote1+'\n'
-            
-        x_label=footnote1+'\n'+footnote2
+        unit=''; unit_amount=1    
+    
+    for c in list(dfs):
+        dfs[c]=dfs[c].apply(lambda x: round(x/unit_amount,2) if x >= unit_amount else round(x/unit_amount,4))
+
+    x_label=footnote2
         
     if preprocess == 'scaling' and scaling_option == 'change%':
         title_txt2=text_lang("增减幅度%","Change%")
@@ -784,7 +814,7 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
         axhline_value=0
         axhline_label="零线"
     else:
-        if one_unit and unit != '' and preprocess == 'none':
+        if unit != '' and preprocess == 'none':
             titletxt=titletxt+', '+unit
 
     # 为避免出错，对空值进行插值
@@ -830,7 +860,7 @@ def economy_mtickers_wb(ticker=['CN','US','JP'],indicator='NY.GDP.MKTP.PP.CD', \
                maxticks_enable=False,maxticks=10, \
                translate=translate)
 
-    return dfs2
+    return pricedf
 
 #==============================================================================
 
@@ -1129,24 +1159,22 @@ def country_translate(country):
         
         ['France','法国','FR','FRA'],
         ['United Kingdom','英国','GB','GBR'],
-        ['Russia','俄罗斯','RU','RUS'],
+        ['Russian Federation','俄罗斯','RU','RUS'],
         ['Canada','加拿大','CA','CAN'],
         ['Australia','澳大利亚','AU','AUS'],
-        ['South Korea','韩国','KR','KOR'],
+        ['Korea, Rep.','韩国','KR','KOR'],
         
         ['Italy','意大利','IT','ITA'],
         ['Mexico','墨西哥','MX','MEX'],
         ['South Africa','南非','ZA','ZAF'],
         ['Saudi Arabia','沙特阿拉伯','SA','SAU'],
         ['Indonesia','印度尼西亚','ID','IDN'],
-        ['Turkey','土耳其','TR','TUR'],
+        ['Turkiye','土耳其','TR','TUR'],
         
         ['Argentina','阿根廷','AR','ARG'],
         ['Egypt','埃及','EG','EGY'],
         ['European Union','欧盟','EU','EUU'],
-        ['Hong Kong','中国香港','HK','HKG'],
-        ['Hong Kong, China','中国香港','HK','HKG'],
-        ['Taiwan','中国台湾','TW','TWN'],
+        ['Hong Kong SAR, China','中国香港','HK','HKG'],
         ['Taiwan, China','中国台湾','TW','TWN'],
         ['World','全球','1W','WLD'],
         

{siat-3.8.25.dist-info → siat-3.8.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.8.25
+Version: 3.8.26
 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.25.dist-info → siat-3.8.26.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=paLZWJFa5in5Pl_isyb-7qnT8EUkvLGvg0G3s-eUONE,48275
+siat/economy2.py,sha256=N0Ak2SqTggA7IqgBX2_6KMhmAzTIbgwhHuYDwRKxg8c,49422
 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=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=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.8.25.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.8.25.dist-info/METADATA,sha256=pWsYGwjmUvMD1r3g1lU0Ijl4V_Pif_RRtuBGhrcLw3A,8144
-siat-3.8.25.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-siat-3.8.25.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.8.25.dist-info/RECORD,,
+siat-3.8.26.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.8.26.dist-info/METADATA,sha256=CUxAmvmU5B0Ey8GnKHmRZ1FSRk8gtKT8XsVATp9muws,8144
+siat-3.8.26.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+siat-3.8.26.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.8.26.dist-info/RECORD,,