siat 2.14.2__py3-none-any.whl → 3.0.0__py3-none-any.whl

siat/risk_evaluation.py

@@ -223,7 +223,7 @@ def stock_VaR_normal_standard(ticker,shares,today, \
     
     if printout == True:
         print("\n=== 计算在险价值：标准正态模型 ===")
-        print("持有股票    :",codetranslate(ticker))
+        print("持有股票    :",ticker_name(ticker))
         print("持有股数    :",format(shares,','))
         print("持有日期    :",today)
         print("预计持有天数:",future_days)
@@ -274,7 +274,7 @@ def series_VaR_normal_standard(ticker,shares,datelist, \
     result3['VaR比例%']=round(result3['ratio']*100,2)
     result3.drop(columns=['ticker','VaR','ratio'],inplace=True)
     
-    text1="= "+codetranslate(ticker)+": VaR比例，持有"+str(future_days)+"天 ="
+    text1="= "+ticker_name(ticker)+": VaR比例，持有"+str(future_days)+"天 ="
     print(text1)    
     print(result3)
     import datetime as dt; today=dt.date.today()    
@@ -283,7 +283,7 @@ def series_VaR_normal_standard(ticker,shares,datelist, \
     #绘图    
     #VaR金额绘图    
     plt.plot(result3['VaR金额'],c='r',lw=2)  
-    title1=codetranslate(ticker)+": VaR金额的变化，持有"+str(future_days)+"天"
+    title1=ticker_name(ticker)+": VaR金额的变化，持有"+str(future_days)+"天"
     plt.title(title1)
     plt.ylabel('VaR金额')  
     #plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
@@ -295,7 +295,7 @@ def series_VaR_normal_standard(ticker,shares,datelist, \
     plt.show()    
     
     plt.plot(result3['VaR比例%'],c='r',lw=2)  
-    title2=codetranslate(ticker)+": VaR比例的变化， 持有"+str(future_days)+"天"
+    title2=ticker_name(ticker)+": VaR比例的变化， 持有"+str(future_days)+"天"
     plt.title(title2)
     plt.ylabel('VaR比例%')  
     #plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
@@ -390,7 +390,7 @@ def compare_VaR_normal_standard(tickerlist,shares,datelist, \
         rr['date']=rr['date'].apply(lambda x: pd.to_datetime(x))
         rr.set_index(['date'],inplace=True)
         
-        plt.plot(rr['VaR amount'],label=codetranslate(t),lw=2,marker=thismarker)
+        plt.plot(rr['VaR amount'],label=ticker_name(t),lw=2,marker=thismarker)
 
     title1="比较VaR金额，持有"+str(future_days)+"天"
     plt.title(title1)
@@ -422,7 +422,7 @@ def compare_VaR_normal_standard(tickerlist,shares,datelist, \
         rr.set_index(['date'],inplace=True)
 
         
-        plt.plot(rr['VaR ratio %'],label=codetranslate(t),lw=2,marker=thismarker)
+        plt.plot(rr['VaR ratio %'],label=ticker_name(t),lw=2,marker=thismarker)
 
     title2="比较VaR比例，持有"+str(future_days)+"天"
     plt.title(title2)
@@ -526,7 +526,7 @@ def stock_ES_normal_standard(ticker,shares,today, \
     
     if printout == True:
         print("\n=== 计算预期不足ES：标准正态模型 ===")
-        print("持有股票    :",codetranslate(ticker))
+        print("持有股票    :",ticker_name(ticker))
         print("持有股数    :",format(shares,','))
         print("持有日期    :",today)
         print("预计持有天数:",future_days)
@@ -574,7 +574,7 @@ def series_ES_normal_standard(ticker,shares,datelist, \
     result3['ES比例%']=round(result3['ratio']*100,2)
     result3.drop(columns=['ticker','ES','ratio'],inplace=True)
     
-    text1="=== "+codetranslate(ticker)+": ES比例，持有"+str(future_days)+"天 ==="
+    text1="=== "+ticker_name(ticker)+": ES比例，持有"+str(future_days)+"天 ==="
     print(text1)    
     print(result3)
     import datetime as dt; today=dt.date.today()    
@@ -583,7 +583,7 @@ def series_ES_normal_standard(ticker,shares,datelist, \
     #绘图    
     #VaR金额绘图    
     plt.plot(result3['ES金额'],c='r',lw=2)  
-    title1=codetranslate(ticker)+": ES金额的变化，持有"+str(future_days)+"天"
+    title1=ticker_name(ticker)+": ES金额的变化，持有"+str(future_days)+"天"
     plt.title(title1)
     plt.ylabel('ES金额')  
     plt.xticks(rotation=30)
@@ -591,7 +591,7 @@ def series_ES_normal_standard(ticker,shares,datelist, \
     plt.show()    
     
     plt.plot(result3['EES比例%'],c='r',lw=2)  
-    title2=codetranslate(ticker)+": ES比例的变化，持有"+str(future_days)+"天"
+    title2=ticker_name(ticker)+": ES比例的变化，持有"+str(future_days)+"天"
     plt.title(title2)
     plt.ylabel('ES比例%')  
     plt.xticks(rotation=30)
@@ -659,7 +659,7 @@ def compare_ES_normal_standard(tickerlist,shares,datelist, \
         rr=r.copy()
         rr['ES amount']=round(rr['ES'],2)
         rr.drop(columns=['ticker','ES','ratio'],inplace=True)        
-        plt.plot(rr['ES amount'],label=codetranslate(t),lw=2,marker=thismarker)
+        plt.plot(rr['ES amount'],label=ticker_name(t),lw=2,marker=thismarker)
 
     title1="比较ES金额，持有"+str(future_days)+"天"
     plt.title(title1)
@@ -684,7 +684,7 @@ def compare_ES_normal_standard(tickerlist,shares,datelist, \
         rr=r.copy()
         rr['ES ratio %']=round(rr['ratio']*100,2)
         rr.drop(columns=['ticker','ES','ratio'],inplace=True)        
-        plt.plot(rr['ES ratio %'],label=codetranslate(t),lw=2,marker=thismarker)
+        plt.plot(rr['ES ratio %'],label=ticker_name(t),lw=2,marker=thismarker)
 
     title2="比较ES比例，持有"+str(future_days)+"天"
     plt.title(title2)
@@ -732,7 +732,7 @@ def plot_rets_histogram(ticker,start,end,num_bins=20):
     
     #绘制股票收益率直方图
     plt.figure(figsize=(8,4))
-    n,bins,patches=plt.hist(rets,num_bins,facecolor='blue',alpha=0.5,label=codetranslate(ticker))
+    n,bins,patches=plt.hist(rets,num_bins,facecolor='blue',alpha=0.5,label=ticker_name(ticker))
     
     #生成与直方图柱子对应的正态分布概率密度
     y=normfunc(bins,mu,sigma)
@@ -740,7 +740,7 @@ def plot_rets_histogram(ticker,start,end,num_bins=20):
     plt.plot(bins,y,'r--',label='正态分布',lw=2)
     plt.ylabel('Frequency')
     plt.xlabel('Stock return')
-    titletxt="正态性检验："+codetranslate(ticker)+"股票收益率, "+start+"至"+end
+    titletxt="正态性检验："+ticker_name(ticker)+"股票收益率, "+start+"至"+end
     plt.title(titletxt)
     plt.legend(loc='best')
     
@@ -781,14 +781,14 @@ def plot_rets_curve(ticker,start,end):
     #plt.figure(figsize=(8,4))
     import seaborn as sns
     #绘制曲线：股票收益率
-    sns.kdeplot(data=rets,shade=True,color='blue',legend=True,label=codetranslate(ticker),lw=2) 
+    sns.kdeplot(data=rets,shade=True,color='blue',legend=True,label=ticker_name(ticker),lw=2) 
     #绘制曲线：对应的正态分布
     sns.kdeplot(data=x,shade=True,color='r',legend=True,label='正态分布',ls='--')
     #设置标题、图例、坐标轴标签
     plt.ylabel('',fontsize=ylabel_txt_size)
     #plt.xlabel('收益率')
     plt.legend(loc='best',fontsize=legend_txt_size)
-    titletxt="正态性检验: "+codetranslate(ticker)+"，股票收益率, "+start+"至"+end
+    titletxt="正态性检验: "+ticker_name(ticker)+"，股票收益率, "+start+"至"+end
     plt.title(titletxt,fontsize=title_txt_size)
     
     import datetime as dt; today=dt.date.today() 
@@ -822,7 +822,7 @@ def stock_ret_Normality_SW(ticker,start_date,end_date,siglevel=0.05):
     (W,p_value)=stats.shapiro(ret)
     
     print("\n= Shapiro-Wilk正态性检验: 股票收益率 =")
-    print("股票  ：",codetranslate(ticker)) 
+    print("股票  ：",ticker_name(ticker)) 
     print("期间  ：",start_date,"至",end_date)
     print("原假设： 符合正态分布")
     print("W值   ：",round(W,4))
@@ -895,7 +895,7 @@ def stock_VaR_normal_modified(ticker,shares,today, \
     
     if printout == True:
         print("\n=== 在险价值VaR： 修正正态模型 ===")
-        print("持有股票    :",codetranslate(ticker))
+        print("持有股票    :",ticker_name(ticker))
         print("持有股数    :",format(shares,','))
         print("持有日期    :",today)
         print("预计持有天数:",future_days)
@@ -940,7 +940,7 @@ def series_VaR_normal_modified(ticker,shares,datelist, \
     result3['VaR比例%']=round(result3['ratio']*100,2)
     result3.drop(columns=['ticker','VaR','ratio'],inplace=True)
     
-    text1="= "+codetranslate(ticker)+": VaR比例，持有"+str(future_days)+"天 ="
+    text1="= "+ticker_name(ticker)+": VaR比例，持有"+str(future_days)+"天 ="
     print(text1)    
     print(result3)
     import datetime as dt; today=dt.date.today()
@@ -949,7 +949,7 @@ def series_VaR_normal_modified(ticker,shares,datelist, \
     #绘图    
     #VaR金额绘图    
     plt.plot(result3['VaR金额'],c='r',lw=2)  
-    title1=codetranslate(ticker)+": VaR金额的变化，持有"+str(future_days)+"天"
+    title1=ticker_name(ticker)+": VaR金额的变化，持有"+str(future_days)+"天"
     plt.title(title1)
     plt.ylabel('VaR金额')  
     plt.xticks(rotation=30)
@@ -959,7 +959,7 @@ def series_VaR_normal_modified(ticker,shares,datelist, \
     plt.show()    
     
     plt.plot(result3['VaR比例%'],c='r',lw=2)  
-    title2=codetranslate(ticker)+": VaR比例的变化，持有"+str(future_days)+"天"
+    title2=ticker_name(ticker)+": VaR比例的变化，持有"+str(future_days)+"天"
     plt.title(title2)
     plt.ylabel('VaR比例%')  
     plt.xticks(rotation=30)
@@ -1000,7 +1000,7 @@ def compare_VaR_normal_modified(tickerlist,shares,datelist, \
         rr=r.copy()
         rr['VaR amount']=round(rr['VaR'],2)
         rr.drop(columns=['ticker','VaR','ratio'],inplace=True)        
-        plt.plot(rr['VaR amount'],label=codetranslate(t),lw=2,marker=thismarker)
+        plt.plot(rr['VaR amount'],label=ticker_name(t),lw=2,marker=thismarker)
 
     title1="比较VaR金额，持有"+str(future_days)+"天"
     plt.title(title1)
@@ -1025,7 +1025,7 @@ def compare_VaR_normal_modified(tickerlist,shares,datelist, \
         rr=r.copy()
         rr['VaR ratio %']=round(rr['ratio']*100,2)
         rr.drop(columns=['ticker','VaR','ratio'],inplace=True)        
-        plt.plot(rr['VaR ratio %'],label=codetranslate(t),lw=2,marker=thismarker)
+        plt.plot(rr['VaR ratio %'],label=ticker_name(t),lw=2,marker=thismarker)
 
     title2="比较VaR比例，持有"+str(future_days)+"天"
     plt.title(title2)
@@ -1091,7 +1091,7 @@ def stock_VaR_historical_1d(ticker,shares,today,alpha=0.99, \
 
     if printout == True:
         print("\n=== 计算在险价值VaR：历史模拟方法 ===")
-        print("持有股票    :",codetranslate(ticker))
+        print("持有股票    :",ticker_name(ticker))
         print("持有股数    :",format(shares,','))
         print("持有日期    :",today)
         future_days=1
@@ -1198,7 +1198,7 @@ def stock_VaR_historical_grouping(ticker,shares,today, \
     
     if printout == True:
         print("\n=== 在险价值VaR："+modeltxt+" ===")
-        print("持有股票    :",codetranslate(ticker))
+        print("持有股票    :",ticker_name(ticker))
         print("持有股数    :",format(shares,','))
         print("持有日期    :",today)
         print("预计持有天数:",future_days)
@@ -1273,7 +1273,7 @@ def stock_VaR_montecarlo(ticker,shares,today,future_days=1,alpha=0.99, \
     if printout == True:
         print("\n=== 在险价值VaR：蒙特卡洛模拟法 ===")
         print("持有日期    :",today)
-        print("持有股票    :",codetranslate(ticker))
+        print("持有股票    :",ticker_name(ticker))
         print("持有股数    :",format(shares,','))
         print("持有头寸    :",format(round(position,2),','))
         print("预计持有天数:",future_days)
@@ -1334,7 +1334,7 @@ def calc_VaR_tlcp(ticker,today,alpha=0.99, \
     if stop1==0:
         if printout == True:
             print("\n=== VaR的全损临界点TLCP ===")
-            print("持有股票  :",codetranslate(ticker))
+            print("持有股票  :",ticker_name(ticker))
             print("持有日期  :",today)
             print("使用的模型:",model)
             print("置信度    : ",alpha*100,'%',sep='')
@@ -1374,7 +1374,7 @@ def calc_VaR_tlcp(ticker,today,alpha=0.99, \
     
     if printout == True:
         print("\n=== VaR的全损临界点TLCP ===")
-        print("持有股票  :",codetranslate(ticker))
+        print("持有股票  :",ticker_name(ticker))
         print("持有日期  :",today)
         print("使用的模型:",model)
         print("置信度    : ",alpha*100,'%',sep='')
@@ -1507,12 +1507,12 @@ def plot_VaR_days_changes(ticker,shares,today,dayslist,alpha=0.99, \
     if printout == True:
         plt.figure(figsize=(8,4))
         #绘制曲线：ratio
-        plt.plot(vardf['ratio%'],color='red',lw=2,label=codetranslate(ticker),marker=markertype)
+        plt.plot(vardf['ratio%'],color='red',lw=2,label=ticker_name(ticker),marker=markertype)
         #设置标题、图例、坐标轴标签
         plt.ylabel('VaR比例%')
         plt.legend(loc='best')
         titlel1="持有股票期间与VaR比例的变化趋势"
-        titlel2="\n"+codetranslate(ticker)+", "+today+", 使用模型"+model
+        titlel2="\n"+ticker_name(ticker)+", "+today+", 使用模型"+model
         titletxt=titlel1+titlel2
         plt.title(titletxt)
         
@@ -1566,7 +1566,7 @@ def compare_VaR_days_changes(tickerlist,shares,today,dayslist,alpha=0.99, \
             print("Information:",t,today,pastyears,model)
             continue        
         
-        plt.plot(vardf['ratio%'],lw=2,label=codetranslate(t),marker=thismarker)
+        plt.plot(vardf['ratio%'],lw=2,label=ticker_name(t),marker=thismarker)
     
     #设置标题、图例、坐标轴标签
     plt.ylabel('VaR比例%')
@@ -1635,7 +1635,7 @@ def get_VaR_allmodels(ticker,shares,today, \
     
     print("\n==== 不同模型下VaR的计算结果 ====")
     print("持有日期    :",today)
-    print("持有股票    :",codetranslate(ticker))
+    print("持有股票    :",ticker_name(ticker))
     print("持有股数    :",format(shares,','))
     print("持有头寸    :",format(round(position,2),','))   
     print("预计持有天数:",future_days)

siat/sector_china.py

@@ -662,172 +662,6 @@ def invest_concept_china(num=10):
     return finaldf
     
     
-#==============================================================================
-#==============================================================================
-#申万行业分类：https://www.swhyresearch.com/institute_sw/allIndex/analysisIndex
-#==============================================================================
-#==============================================================================
-def industry_sw_list():
-    """
-    功能：输出申万指数代码df。静态
-    输入：
-    输出：df
-    """
-    import pandas as pd
-    industry=pd.DataFrame([
-        
-        #市场表征指数F，一级行业I，二级行业T，风格策略S
-        ['F','801001','申万50'],['F','801002','申万中小'],['F','801003','申万Ａ指'],
-        ['F','801005','申万创业'],['F','801250','申万制造'],['F','801260','申万消费'],
-        ['F','801270','申万投资'],['F','801280','申万服务'],['F','801300','申万300指数'],
-        ['I','801010','农林牧渔'],['I','801030','基础化工'],['I','801040','钢铁'],
-        ['I','801050','有色金属'],['I','801080','电子'],['I','801110','家用电器'],
-        ['I','801120','食品饮料'],['I','801130','纺织服饰'],['I','801140','轻工制造'],
-        ['I','801150','医药生物'],['I','801160','公用事业'],['I','801170','交通运输'],
-        ['I','801180','房地产'],['I','801200','商贸零售'],['I','801210','社会服务'],
-        ['I','801230','综合'],['I','801710','建筑材料'],['I','801720','建筑装饰'],
-        ['I','801730','电力设备'],['I','801740','国防军工'],['I','801750','计算机'],
-        ['I','801760','传媒'],['I','801770','通信'],['I','801780','银行'],
-        ['I','801790','非银金融'],['I','801880','汽车'],['I','801890','机械设备'],
-        ['I','801950','煤炭'],['I','801960','石油石化'],['I','801970','环保'],
-        ['I','801980','美容护理'],['T','801012','农产品加工'],['T','801014','饲料'],
-        ['T','801015','渔业'],['T','801016','种植业'],['T','801017','养殖业'],
-        ['T','801018','动物保健Ⅱ'],['T','801032','化学纤维'],['T','801033','化学原料'],
-        ['T','801034','化学制品'],['T','801036','塑料'],['T','801037','橡胶'],
-        ['T','801038','农化制品'],['T','801039','非金属材料Ⅱ'],['T','801043','冶钢原料'],
-        ['T','801044','普钢'],['T','801045','特钢Ⅱ'],['T','801051','金属新材料'],
-        ['T','801053','贵金属'],['T','801054','小金属'],['T','801055','工业金属'],
-        ['T','801056','能源金属'],['T','801072','通用设备'],['T','801074','专用设备'],
-        ['T','801076','轨交设备Ⅱ'],['T','801077','工程机械'],['T','801078','自动化设备'],
-        ['T','801081','半导体'],['T','801082','其他电子Ⅱ'],['T','801083','元件'],
-        ['T','801084','光学光电子'],['T','801085','消费电子'],['T','801086','电子化学品Ⅱ'],
-        ['T','801092','汽车服务'],['T','801093','汽车零部件'],['T','801095','乘用车'],
-        ['T','801096','商用车'],['T','801101','计算机设备'],['T','801102','通信设备'],
-        ['T','801103','IT服务Ⅱ'],['T','801104','软件开发'],['T','801111','白色家电'],
-        ['T','801112','黑色家电'],['T','801113','小家电'],['T','801114','厨卫电器'],
-        ['T','801115','照明设备Ⅱ'],['T','801116','家电零部件Ⅱ'],['T','801124','食品加工'],
-        ['T','801125','白酒Ⅱ'],['T','801126','非白酒'],['T','801127','饮料乳品'],
-        ['T','801128','休闲食品'],['T','801129','调味发酵品Ⅱ'],['T','801131','纺织制造'],
-        ['T','801132','服装家纺'],['T','801133','饰品'],['T','801141','包装印刷'],
-        ['T','801142','家居用品'],['T','801143','造纸'],['T','801145','文娱用品'],
-        ['T','801151','化学制药'],['T','801152','生物制品'],['T','801153','医疗器械'],
-        ['T','801154','医药商业'],['T','801155','中药Ⅱ'],['T','801156','医疗服务'],
-        ['T','801161','电力'],['T','801163','燃气Ⅱ'],['T','801178','物流'],
-        ['T','801179','铁路公路'],['T','801181','房地产开发'],['T','801183','房地产服务'],
-        ['T','801191','多元金融'],['T','801193','证券Ⅱ'],['T','801194','保险Ⅱ'],
-        ['T','801202','贸易Ⅱ'],['T','801203','一般零售'],['T','801204','专业连锁Ⅱ'],
-        ['T','801206','互联网电商'],['T','801218','专业服务'],['T','801219','酒店餐饮'],
-        ['T','801223','通信服务'],['T','801231','综合Ⅱ'],['T','801711','水泥'],
-        ['T','801712','玻璃玻纤'],['T','801713','装修建材'],['T','801721','房屋建设Ⅱ'],
-        ['T','801722','装修装饰Ⅱ'],['T','801723','基础建设'],['T','801724','专业工程'],
-        ['T','801726','工程咨询服务Ⅱ'],['T','801731','电机Ⅱ'],['T','801733','其他电源设备Ⅱ'],
-        ['T','801735','光伏设备'],['T','801736','风电设备'],['T','801737','电池'],
-        ['T','801738','电网设备'],['T','801741','航天装备Ⅱ'],['T','801742','航空装备Ⅱ'],
-        ['T','801743','地面兵装Ⅱ'],['T','801744','航海装备Ⅱ'],['T','801745','军工电子Ⅱ'],
-        ['T','801764','游戏Ⅱ'],['T','801765','广告营销'],['T','801766','影视院线'],
-        ['T','801767','数字媒体'],['T','801769','出版'],['T','801782','国有大型银行Ⅱ'],
-        ['T','801783','股份制银行Ⅱ'],['T','801784','城商行Ⅱ'],['T','801785','农商行Ⅱ'],
-        ['T','801881','摩托车及其他'],['T','801951','煤炭开采'],['T','801952','焦炭Ⅱ'],
-        ['T','801962','油服工程'],['T','801963','炼化及贸易'],['T','801971','环境治理'],
-        ['T','801972','环保设备Ⅱ'],['T','801981','个护用品'],['T','801982','化妆品'],
-        ['T','801991','航空机场'],['T','801992','航运港口'],['T','801993','旅游及景区'],
-        ['T','801994','教育'],['T','801995','电视广播Ⅱ'],['S','801811','大盘指数'],
-        ['S','801812','中盘指数'],['S','801813','小盘指数'],['S','801821','高市盈率指数'],
-        ['S','801822','中市盈率指数'],['S','801823','低市盈率指数'],['S','801831','高市净率指数'],
-        ['S','801832','中市净率指数'],['S','801833','低市净率指数'],['S','801841','高价股指数'],
-        ['S','801842','中价股指数'],['S','801843','低价股指数'],['S','801851','亏损股指数'],
-        ['S','801852','微利股指数'],['S','801853','绩优股指数'],['S','801863','新股指数'],
-        ['3','850111','种子'],['3','850113','其他种植业'],['3','850122','水产养殖'],
-        ['3','850142','畜禽饲料'],['3','850151','果蔬加工'],['3','850152','粮油加工'],
-        ['3','850154','其他农产品加工'],['3','850172','生猪养殖'],['3','850173','肉鸡养殖'],
-        ['3','850181','动物保健Ⅲ'],['3','850322','氯碱'],['3','850323','无机盐'],
-        ['3','850324','其他化学原料'],['3','850325','煤化工'],['3','850326','钛白粉'],
-        ['3','850335','涂料油墨'],['3','850337','民爆制品'],['3','850338','纺织化学制品'],
-        ['3','850339','其他化学制品'],['3','850382','氟化工'],['3','850372','聚氨酯'],
-        ['3','850135','食品及饲料添加剂'],['3','850136','有机硅'],['3','850341','涤纶'],
-        ['3','850343','粘胶'],['3','850351','其他塑料制品'],['3','850353','改性塑料'],
-        ['3','850354','合成树脂'],['3','850355','膜材料'],['3','850362','其他橡胶制品'],
-        ['3','850363','炭黑'],['3','850331','氮肥'],['3','850332','磷肥及磷化工'],
-        ['3','850333','农药'],['3','850381','复合肥'],['3','850523','非金属材料Ⅲ'],
-        ['3','850442','板材'],['3','850521','其他金属新材料'],['3','850522','磁性材料'],
-        ['3','850551','铝'],['3','850552','铜'],['3','850553','铅锌'],
-        ['3','850531','黄金'],['3','850544','其他小金属'],['3','850812','分立器件'],
-        ['3','850813','半导体材料'],['3','850814','数字芯片设计'],['3','850815','模拟芯片设计'],
-        ['3','850817','集成电路封测'],['3','850818','半导体设备'],['3','850822','印制电路板'],
-        ['3','850823','被动元件'],['3','850831','面板'],['3','850832','LED'],
-        ['3','850833','光学元件'],['3','850841','其他电子Ⅲ'],['3','850853','品牌消费电子'],
-        ['3','850854','消费电子零部件及组装'],['3','850861','电子化学品Ⅲ'],['3','850922','车身附件及饰件'],
-        ['3','850923','底盘与发动机系统'],['3','850924','轮胎轮毂'],['3','850925','其他汽车零部件'],
-        ['3','850926','汽车电子电气系统'],['3','850232','汽车经销商'],['3','850233','汽车综合服务'],
-        ['3','858811','其他运输设备'],['3','858812','摩托车'],['3','850952','综合乘用车'],
-        ['3','850912','商用载货车'],['3','850913','商用载客车'],['3','851112','空调'],
-        ['3','851116','冰洗'],['3','851122','其他黑色家电'],['3','851131','厨房小家电'],
-        ['3','851141','厨房电器'],['3','851151','照明设备Ⅲ'],['3','851161','家电零部件Ⅲ'],
-        ['3','851241','肉制品'],['3','851246','预加工食品'],['3','851247','保健品'],
-        ['3','851251','白酒Ⅲ'],['3','851232','啤酒'],['3','851233','其他酒类'],
-        ['3','851271','软饮料'],['3','851243','乳品'],['3','851281','零食'],
-        ['3','851282','烘焙食品'],['3','851242','调味发酵品Ⅲ'],['3','851312','棉纺'],
-        ['3','851314','印染'],['3','851315','辅料'],['3','851316','其他纺织'],
-        ['3','851325','鞋帽及其他'],['3','851326','家纺'],['3','851329','非运动服装'],
-        ['3','851331','钟表珠宝'],['3','851412','大宗用纸'],['3','851413','特种纸'],
-        ['3','851422','印刷'],['3','851423','金属包装'],['3','851424','塑料包装'],
-        ['3','851425','纸包装'],['3','851436','瓷砖地板'],['3','851437','成品家居'],
-        ['3','851438','定制家居'],['3','851439','卫浴制品'],['3','851491','其他家居用品'],
-        ['3','851452','娱乐用品'],['3','851511','原料药'],['3','851512','化学制剂'],
-        ['3','851521','中药Ⅲ'],['3','851522','血液制品'],['3','851523','疫苗'],
-        ['3','851524','其他生物制品'],['3','851542','医药流通'],['3','851543','线下药店'],
-        ['3','851532','医疗设备'],['3','851533','医疗耗材'],['3','851534','体外诊断'],
-        ['3','851563','医疗研发外包'],['3','851564','医院'],['3','851611','火力发电'],
-        ['3','851612','水力发电'],['3','851614','热力服务'],['3','851616','光伏发电'],
-        ['3','851617','风力发电'],['3','851610','电能综合服务'],['3','851631','燃气Ⅲ'],
-        ['3','851782','原材料供应链服务'],['3','851783','中间产品及消费品供应链服务'],['3','851784','快递'],
-        ['3','851785','跨境物流'],['3','851786','仓储物流'],['3','851787','公路货运'],
-        ['3','851731','高速公路'],['3','851721','公交'],['3','851771','铁路运输'],
-        ['3','851741','航空运输'],['3','851761','航运'],['3','851711','港口'],
-        ['3','851811','住宅开发'],['3','851812','商业地产'],['3','851813','产业地产'],
-        ['3','851831','物业管理'],['3','852021','贸易Ⅲ'],['3','852031','百货'],
-        ['3','852032','超市'],['3','852033','多业态零售'],['3','852034','商业物业经营'],
-        ['3','852041','专业连锁Ⅲ'],['3','852062','跨境电商'],['3','852063','电商服务'],
-        ['3','852182','检测服务'],['3','852183','会展服务'],['3','852121','酒店'],
-        ['3','852111','人工景区'],['3','852112','自然景区'],['3','852131','旅游综合'],
-        ['3','859852','培训教育'],['3','857821','国有大型银行Ⅲ'],['3','857831','股份制银行Ⅲ'],
-        ['3','857841','城商行Ⅲ'],['3','857851','农商行Ⅲ'],['3','851931','证券Ⅲ'],
-        ['3','851941','保险Ⅲ'],['3','851922','金融控股'],['3','851927','资产管理'],
-        ['3','852311','综合Ⅲ'],['3','857111','水泥制造'],['3','857112','水泥制品'],
-        ['3','857121','玻璃制造'],['3','857122','玻纤制造'],['3','850615','耐火材料'],
-        ['3','850616','管材'],['3','850614','其他建材'],['3','850623','房屋建设Ⅲ'],
-        ['3','857221','装修装饰Ⅲ'],['3','857236','基建市政工程'],['3','857251','园林工程'],
-        ['3','857241','钢结构'],['3','857242','化学工程'],['3','857243','国际工程'],
-        ['3','857244','其他专业工程'],['3','857261','工程咨询服务Ⅲ'],['3','850741','电机Ⅲ'],
-        ['3','857334','火电设备'],['3','857336','其他电源设备Ⅲ'],['3','857352','光伏电池组件'],
-        ['3','857354','光伏辅材'],['3','857355','光伏加工设备'],['3','857362','风电零部件'],
-        ['3','857371','锂电池'],['3','857372','电池化学品'],['3','857373','锂电专用设备'],
-        ['3','857375','蓄电池及其他电池'],['3','857381','输变电设备'],['3','857382','配电设备'],
-        ['3','857321','电网自动化设备'],['3','857323','电工仪器仪表'],['3','857344','线缆部件及其他'],
-        ['3','850711','机床工具'],['3','850713','磨具磨料'],['3','850715','制冷空调设备'],
-        ['3','850716','其他通用设备'],['3','850731','仪器仪表'],['3','850751','金属制品'],
-        ['3','850725','能源及重型设备'],['3','850728','楼宇设备'],['3','850721','纺织服装设备'],
-        ['3','850726','印刷包装机械'],['3','850727','其他专用设备'],['3','850936','轨交设备Ⅲ'],
-        ['3','850771','工程机械整机'],['3','850772','工程机械器件'],['3','850781','机器人'],
-        ['3','850782','工控设备'],['3','850783','激光设备'],['3','850784','其他自动化设备'],
-        ['3','857411','航天装备Ⅲ'],['3','857421','航空装备Ⅲ'],['3','857431','地面兵装Ⅲ'],
-        ['3','850935','航海装备Ⅲ'],['3','857451','军工电子Ⅲ'],['3','850702','安防设备'],
-        ['3','850703','其他计算机设备'],['3','852226','IT服务Ⅲ'],['3','851041','垂直应用软件'],
-        ['3','851042','横向通用软件'],['3','857641','游戏Ⅲ'],['3','857651','营销代理'],
-        ['3','857661','影视动漫制作'],['3','857674','门户网站'],['3','857691','教育出版'],
-        ['3','857692','大众出版'],['3','859951','电视广播Ⅲ'],['3','852213','通信工程及服务'],
-        ['3','852214','通信应用增值服务'],['3','851024','通信网络设备及器件'],['3','851025','通信线缆及配套'],
-        ['3','851026','通信终端及配件'],['3','851027','其他通信设备'],['3','859511','动力煤'],
-        ['3','859512','焦煤'],['3','859521','焦炭Ⅲ'],['3','859621','油田服务'],
-        ['3','859622','油气及炼化工程'],['3','859631','炼油化工'],['3','859632','油品石化贸易'],
-        ['3','859633','其他石化'],['3','859711','大气治理'],['3','859712','水务及水治理'],
-        ['3','859713','固废治理'],['3','859714','综合环境治理'],['3','859721','环保设备Ⅲ'],
-        ['3','859811','生活用纸'],['3','859821','化妆品制造及其他'],['3','859822','品牌化妆品'],
-        
-        #手工添加：可能重复
-        ], columns=['type','code','name'])
-
-    return industry
 #==============================================================================
 def industry_sw_list_all():
     """
@@ -1031,32 +865,6 @@ def print_industry_component_sw2(icode,numberPerLine=5,colalign='left'):
     
     return
     
-#==============================================================================
-
-
-def industry_sw_name(icode):
-    """
-    功能：将申万指数代码转换为指数名称。
-    输入：指数代码
-    输出：指数名称
-    """
-    icode=icode.split('.')[0]
-    
-    industry=industry_sw_list()
-
-    try:
-        iname=industry[industry['code']==icode]['name'].values[0]
-    except:
-        #未查到
-        if not icode.isdigit():
-            print("  #Warning(industry_sw_name): industry name not found for",icode)
-        iname=icode
-   
-    return iname
-
-if __name__=='__main__':
-    icode='801735'
-    industry_sw_name(icode)
 
 #==============================================================================
 if __name__=='__main__':
@@ -1816,7 +1624,7 @@ def compare_mindustry_sw(industry_list,measure,start,end, \
         df2=dfs1
         dfcols=list(df2)
         for c in dfcols:
-            ccn=codetranslate(c)+'('+c+')'
+            ccn=ticker_name(c)+'('+c+')'
             df2.rename(columns={c:ccn},inplace=True)
         
         if sortby=='tpw_mean':
@@ -1949,7 +1757,7 @@ def compare_mindustry_sw2(industry_list,measure,start,end, \
         df2=dfs1
         dfcols=list(df2)
         for c in dfcols:
-            cname=codetranslate(c)
+            cname=ticker_name(c)
             if cname == c:
                 ccn=c
             else:
@@ -2416,7 +2224,7 @@ def rank_msecurity_performance(tickers,start,end, \
             #修改列明为股票名称(股票代码)格式，以便与compare_mrar的结果一致
             dft_new_cols=[]
             for t in tickers:
-                c=codetranslate(t)+'('+t+')'
+                c=ticker_name(t)+'('+t+')'
                 dft_new_cols=dft_new_cols+[c]
             dft.columns=dft_new_cols