siat 3.0.4__py3-none-any.whl → 3.0.15__py3-none-any.whl

siat/grafix.py

@@ -101,7 +101,8 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               power=0,zeroline=False,average_value=False, \
               resample_freq='H',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-              mark_top=True,mark_bottom=True,mark_end=True):
+              mark_top=True,mark_bottom=True,mark_end=True, \
+                  facecolor='whitesmoke'):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -267,7 +268,11 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             plt.legend(loc=loc,fontsize=legend_txt_size)
 
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
+    try:
+        plt.gca().set_facecolor(facecolor) #设置画布背景颜色
+    except:
+        print("  #Warning(plot_line): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke")
     
     if '基金' in titletxt and '收盘价' in ylabeltxt:
         ylabeltxt=ylabeltxt.replace('收盘价','单位净值')
@@ -300,7 +305,7 @@ def plot_line2(df1,ticker1,colname1,label1, \
                power=0,datatag1=False,datatag2=False,yscalemax=5, \
                zeroline=False,twinx=False,yline=999,xline=999, \
                resample_freq='H',loc1='best',loc2='best', \
-               color1='red',color2='blue'):
+               color1='red',color2='blue',facecolor='whitesmoke'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -322,18 +327,18 @@ def plot_line2(df1,ticker1,colname1,label1, \
     
     if not twinx:            
         plot_line2_coaxial(df1,ticker1,colname1,label1, \
-                           df2,ticker2,colname2,label2, \
+                df2,ticker2,colname2,label2, \
                 ylabeltxt,titletxt,footnote,power,datatag1,datatag2,zeroline, \
                 yline,xline,resample_freq=resample_freq, \
-                    loc1=loc1,loc2=loc2, \
-                    color1=color1,color2=color2)
+                loc1=loc1,loc2=loc2, \
+                color1=color1,color2=color2,facecolor=facecolor)
     else:
         plot_line2_twinx(df1,ticker1,colname1,label1, \
                          df2,ticker2,colname2,label2, \
                          titletxt,footnote,power,datatag1,datatag2, \
                          resample_freq=resample_freq, \
-                             loc1=loc1,loc2=loc2, \
-                             color1=color1,color2=color2)
+                         loc1=loc1,loc2=loc2, \
+                         color1=color1,color2=color2,facecolor=facecolor)
     return
 
 
@@ -345,7 +350,7 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                zeroline=False,twinx=False,yline=999,xline=999, \
                resample_freq='H',loc1='best',loc2='best', \
                date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-               color1='red',color2='blue'):
+               color1='red',color2='blue',facecolor='whitesmoke'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -378,7 +383,7 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                 yline,xline,resample_freq=resample_freq, \
                 loc1=loc1,loc2=loc2, \
                 date_range=date_range,date_freq=date_freq,date_fmt=date_fmt, \
-                color1=color1,color2=color2)
+                color1=color1,color2=color2,facecolor=facecolor)
     else:
         plot_line2_twinx2(df1,ticker1,colname1,label1, \
                          df2,ticker2,colname2,label2, \
@@ -386,7 +391,7 @@ def plot2_line2(df1,ticker1,colname1,label1, \
                          resample_freq=resample_freq, \
                          loc1=loc1,loc2=loc2, \
                          date_range=date_range,date_freq=date_freq,date_fmt=date_fmt, \
-                         color1=color1,color2=color2)
+                         color1=color1,color2=color2,facecolor=facecolor)
     return
 
 
@@ -399,7 +404,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
                        power=0,datatag1=False,datatag2=False,zeroline=False, \
                        yline=999,xline=999,resample_freq='H', \
                        loc1='best',loc2='best', \
-                       color1='red',color2='blue', \
+                       color1='red',color2='blue',facecolor='whitesmoke', \
                        ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
@@ -526,7 +531,11 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
     # 同轴绘图时，loc1/loc2未用上！
     plt.legend(loc=loc1,fontsize=legend_txt_size)
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
+    try:
+        plt.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_coaxial): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke")
     
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
     plt.xlabel(footnote,fontsize=xlabel_txt_size)
@@ -562,7 +571,8 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
                        yline=999,xline=999,resample_freq='H', \
                        loc1='best',loc2='best', \
                        date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-                       color1='red',color2='blue',ticker_type='auto'):
+                       color1='red',color2='blue',facecolor='whitesmoke', \
+                       ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -710,8 +720,12 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     # 同轴绘图时，loc1/loc2未用上！
     plt.legend(loc=loc1,fontsize=legend_txt_size)
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
-    
+    try:
+        plt.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_coaxial2): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke")  
+        
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
     plt.xlabel(footnote,fontsize=xlabel_txt_size)
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
@@ -723,9 +737,10 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
 #==============================================================================
 def plot_line2_twinx(df01,ticker1,colname1,label1, \
                      df02,ticker2,colname2,label2, \
-                    titletxt,footnote,power=0,datatag1=False,datatag2=False, \
-                    resample_freq='H',loc1='upper left',loc2='lower left', \
-                    color1='red',color2='blue',ticker_type='auto'):
+                     titletxt,footnote,power=0,datatag1=False,datatag2=False, \
+                     resample_freq='H',loc1='upper left',loc2='lower left', \
+                     color1='red',color2='blue',facecolor='whitesmoke', \
+                     ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -757,6 +772,11 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
     #证券1：绘制折线图，双坐标轴
     fig = plt.figure()
     ax = fig.add_subplot(111)
+    try:
+        fig.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_twinx): color",facecolor,"is unsupported, changed to default setting")
+        fig.gca().set_facecolor("whitesmoke") 
     
     if ticker1 == '':
         label1txt=label1
@@ -859,8 +879,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
     
     #自动优化x轴标签
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
-    
+        
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
     
@@ -884,11 +903,12 @@ if __name__ =="__main__":
 
 #==============================================================================
 def plot_line2_twinx2(df01,ticker1,colname1,label1, \
-                     df02,ticker2,colname2,label2, \
-                     titletxt,footnote,power=0,datatag1=False,datatag2=False, \
-                     resample_freq='H',loc1='upper left',loc2='lower left', \
-                     date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-                     color1='red',color2='blue',ticker_type='auto'):
+                      df02,ticker2,colname2,label2, \
+                      titletxt,footnote,power=0,datatag1=False,datatag2=False, \
+                      resample_freq='H',loc1='upper left',loc2='lower left', \
+                      date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
+                      color1='red',color2='blue',facecolor='whitesmoke', \
+                      ticker_type='auto'):
     """
     功能：绘制两个证券的折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -919,8 +939,14 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
         
     #证券1：绘制折线图，双坐标轴
     fig = plt.figure()
+    try:
+        fig.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_twinx2): color",facecolor,"is unsupported, changed to default setting")
+        fig.gca().set_facecolor("whitesmoke") 
+
     ax = fig.add_subplot(111)
-    
+
     if ticker1 == '':
         label1txt=label1
     else:
@@ -1049,8 +1075,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
     #格式化时间轴标注
     #plt.gca().xaxis.set_major_formatter(mdate.DateFormatter('%y-%m-%d')) 
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
-    
+        
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
     
@@ -1060,7 +1085,8 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
 def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                data_label=True,resample_freq='H',smooth=True,linewidth=1.5, \
                loc='best',annotate=False,annotate_value=False,plus_sign=False, \
-               mark_top=False,mark_bottom=False,mark_end=False,ticker_type='auto'):
+               mark_top=False,mark_bottom=False,mark_end=False, \
+               ticker_type='auto',facecolor='whitesmoke'):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1077,6 +1103,13 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     无返回数据
     注意：需要日期类型作为df索引
     """
+    DEBUG=False
+    
+    if DEBUG:
+        print("annotate=",annotate,"annotate_value=",annotate_value)
+        print("mark_top=",mark_top,"mark_bottom=",mark_bottom)
+        print(df0)
+    
     #空值判断
     if len(df0) ==0:
         print ("  #Warning(draw_lines): no data to plot.")
@@ -1168,6 +1201,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         last_line_color = lines[-1].get_color()
         
         if annotate:
+            mark_end=False
             df_end=dfg.tail(1)
             # df_end[c]必须为数值类型，否则可能出错
             y_end = df_end[c].min()    # 末端的y坐标
@@ -1236,7 +1270,6 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                          xytext=(x_end, y_end),fontsize=annotate_size,
                          color=last_line_color)
 
-
     #绘制水平辅助线
     if axhline_label !="":
         if '零线' in axhline_label:
@@ -1253,9 +1286,14 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         plt.xlabel(x_label_t,fontweight='bold',fontsize=xlabel_txt_size)
     #图示标题
     plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
-    plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
     
+    plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
+    try:
+        plt.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(draw_lines): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke") 
+        
     # 若不绘制annotate，则绘制图例
     if not annotate:
         plt.legend(loc=loc,fontsize=legend_txt_size)
@@ -1282,7 +1320,8 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                 date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
                 colorlist=[],lslist=[],lwlist=[], \
                 band_area='',loc='best',annotate=False,annotate_value=False, \
-                mark_top=False,mark_bottom=False,mark_end=False):
+                mark_top=False,mark_bottom=False,mark_end=False, \
+                facecolor='whitesmoke'):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -1447,8 +1486,12 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     #图示标题
     plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
-    
+    try:
+        plt.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(draw_lines2): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke") 
+        
     if not annotate:
         plt.legend(loc=loc,fontsize=legend_txt_size)
         
@@ -1462,7 +1505,8 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
 #==============================================================================
 def plot_barh(df,colname,titletxt,footnote,datatag=True, \
               colors=['r','g','b','c','m','y','aquamarine','dodgerblue', \
-              'deepskyblue','silver'],tag_offset=0.01,axisamp=1.3):
+              'deepskyblue','silver'],tag_offset=0.01,axisamp=1.3, \
+              facecolor='whitesmoke'):
     """
     功能：绘制水平单值柱状图，并可标注数据标签。
     输入：数据集df；列名colname；标题titletxt；脚注footnote；
@@ -1517,7 +1561,12 @@ def plot_barh(df,colname,titletxt,footnote,datatag=True, \
     yticknames=list(df.index)
     plt.yticks(df.index,yticknames)
 
-    plt.gca().set_facecolor('whitesmoke')
+    try:
+        plt.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_barh): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke") 
+        
     plt.show(); plt.close()
     
     return
@@ -1531,7 +1580,7 @@ if __name__=='__main__':
     titletxt="This is a title"
     footnote="This is a footnote"
 
-def plot_barh2(df,colname,titletxt,footnote):
+def plot_barh2(df,colname,titletxt,footnote,facecolor='whitesmoke'):
     """
     功能：绘制水平单值柱状图，并在外侧标注数据标签。
     输入：数据集df；列名colname；标题titletxt；脚注footnote；
@@ -1571,6 +1620,12 @@ def plot_barh2(df,colname,titletxt,footnote):
             'yanchor': 'top'},
         )
 
+    try:
+        fig.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_barh2): color",facecolor,"is unsupported, changed to default setting")
+        fig.gca().set_facecolor("whitesmoke")
+
     fig.show()
     
     return
@@ -1584,7 +1639,8 @@ if __name__=='__main__':
 def plot_2lines(df01,colname1,label1, \
                 df02,colname2,label2, \
                 ylabeltxt,titletxt,footnote,hline=0,vline=0,resample_freq='H', \
-                date_range=False,date_freq=False,date_fmt='%Y-%m-%d'):
+                date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
+                facecolor='whitesmoke'):
     """
     功能：绘制两个证券的折线图。如果hline=0不绘制水平虚线，vline=0不绘制垂直虚线
     假定：数据表有日期索引，且已经按照索引排序
@@ -1673,8 +1729,12 @@ def plot_2lines(df01,colname1,label1, \
     plt.legend(loc='best',fontsize=legend_txt_size)
     
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    plt.gca().set_facecolor('whitesmoke')
-    
+    try:
+        plt.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_2lines): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke")   
+        
     plt.show()
     
     return
@@ -1847,7 +1907,7 @@ if __name__=='__main__':
     sd=1
     obs_num=100
     
-def plot_norm(mu,sd,graph='pdf',obs_num=100):
+def plot_norm(mu,sd,graph='pdf',obs_num=100,facecolor='whitesmoke'):
     """
     绘制正态分布图形
     mu:均值
@@ -1914,8 +1974,12 @@ def plot_norm(mu,sd,graph='pdf',obs_num=100):
     #plt.grid() #网格
     plt.legend(loc='best',fontsize=legend_txt_size)
     
-    plt.gca().set_facecolor('whitesmoke')
-    
+    try:
+        plt.gca().set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_norm): color",facecolor,"is unsupported, changed to default setting")
+        plt.gca().set_facecolor("whitesmoke")  
+        
     plt.show() #显示图形
     
     return

siat/markowitz.py

@@ -225,10 +225,13 @@ def portfolio_hpr(portfolio,thedate,pastyears=1, \
 
 #==============================================================================
 if __name__=='__main__':
+    Market={'Market':('US','^GSPC')}
     Market={'Market':('US','^GSPC','我的组合001')}
     Stocks1={'AAPL':.3,'MSFT':.15,'AMZN':.15,'FB':.01,'GOOG':.01}
     Stocks2={'XOM':.02,'JNJ':.02,'JPM':.01,'TSLA':.3,'SBUX':.03}
     portfolio=dict(Market,**Stocks1,**Stocks2)
+
+    ticker_name(portfolio)
     
     thedate='2023-2-17'
     pastyears=1
@@ -241,7 +244,7 @@ def portfolio_cumret(portfolio,thedate,pastyears=1, \
                      rate_period='1Y',rate_type='shibor',RF=False, \
                          printout=True,graph=True):
     """
-    功能：绘制投资组合的累计收益率趋势图，并与等权和期间内资金量加权组合比较
+    功能：绘制投资组合的累计收益率趋势图，并与等权和期间内交易额加权组合比较
     注意：中国部分历史区段的treasury历史可能无法取得；
     无论是shibor还是treasury的近期利率均可能空缺，只能以最近期的数值填补
     """
@@ -384,7 +387,7 @@ def portfolio_cumret(portfolio,thedate,pastyears=1, \
     StockReturns['Portfolio_EW']=stock_return.mul(portfolio_weights_ew,axis=1).sum(axis=1)
     #..........................................................................
     
-    # 创建资金量加权组合：按照成交金额计算期间内资金量均值
+    # 创建交易额加权组合：按照成交金额计算期间内交易额均值
     tamount=prices['Close']*prices['Volume']
     tamountlist=tamount.mean(axis=0)    #求列的均值
     tamountlist_array = np.array(tamountlist)
@@ -397,7 +400,7 @@ def portfolio_cumret(portfolio,thedate,pastyears=1, \
     if lang == 'Chinese':
         title_txt="投资组合策略：业绩对比"
         Portfolio_EW_txt="等权重策略"
-        Portfolio_LW_txt="资金量加权策略"
+        Portfolio_LW_txt="交易额加权策略"
     else:
         title_txt="Investment Portfolio Strategies: Performance Comparison"
         Portfolio_EW_txt="Equal-weight"
@@ -443,7 +446,7 @@ if __name__=='__main__':
 def portfolio_expret(portfolio,today,pastyears=1, \
                      rate_period='1Y',rate_type='shibor',RF=False,printout=True,graph=True):
     """
-    功能：绘制投资组合的持有期收益率趋势图，并与等权和期间内资金量加权组合比较
+    功能：绘制投资组合的持有期收益率趋势图，并与等权和期间内交易额加权组合比较
     套壳原来的portfolio_cumret函数，以维持兼容性
     expret: expanding return，以维持与前述章节名词的一致性
     hpr: holding period return, 持有（期）收益率
@@ -994,22 +997,26 @@ def portfolio_es(pf_info,simulation=50000):
     
     import datetime as dt; stoday=dt.date.today()
     lang = check_language()
-    if lang == 'Chinese':    
+    if lang == 'Chinese':  
+        if pname == '': pname='投资组合'
+        
         plt.colorbar(label='收益率/标准差')
-        plt.title("投资组合: 马科维茨可行(有效)集",fontsize=title_txt_size)
+        plt.title(pname+": 马科维茨可行(有效)集",fontsize=title_txt_size)
         plt.ylabel("年化收益率",fontsize=ylabel_txt_size)
         
         footnote1="年化收益率标准差-->"
-        footnote2="\n\n基于"+pname+"之成份股构造"+str(simulation)+"个投资组合"
+        footnote2="\n\n基于给定的成份证券构造"+str(simulation)+"个投资组合"
         footnote3="\n观察期间："+hstart+"至"+hend
         footnote4="\n来源: Sina/EM/stooq, "+str(stoday)
     else:
+        if pname == '': pname='Investment Portfolio'
+        
         plt.colorbar(label='Return/Std')
-        plt.title("Investment Portfolio: Efficient Set",fontsize=title_txt_size)
+        plt.title(pname+": Efficient Set",fontsize=title_txt_size)
         plt.ylabel("Annualized Return",fontsize=ylabel_txt_size)
         
         footnote1="Annualized Std -->\n\n"
-        footnote2="Based on "+pname+"\'s stocks, constructed "+str(simulation)+" portfolios\n"
+        footnote2="Based on given component securities, constructed "+str(simulation)+" portfolios\n"
         footnote3="Period of observation: "+hstart+" to "+hend
         footnote4="\nSource: sina/eastmoney/stooq, "+str(stoday)
     
@@ -1465,21 +1472,25 @@ def RandomPortfolios_plot(RandomPortfolios,col_x,col_y,colorbartxt,title_ext, \
 
     lang = check_language()
     if lang == 'Chinese':
-        plt.title("投资组合: 马科维茨有效(可行)集，基于"+title_ext,fontsize=title_txt_size)
+        if pname == '': pname='投资组合'
+        
+        plt.title(pname+": 马科维茨有效(可行)集，基于"+title_ext,fontsize=title_txt_size)
         plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
         
         import datetime as dt; stoday=dt.date.today()
         footnote1=x_axis_name+" -->\n\n"
-        footnote2="基于"+pname+"之成份股构造"+str(simulation)+"个投资组合"
+        footnote2="基于设定的成份证券构造"+str(simulation)+"个投资组合"
         footnote3="\n观察期间："+hstart+"至"+hend
         footnote4="\n来源: Sina/EM/stooq/FRED, "+str(stoday)
     else:
-        plt.title("Portfolio: Efficient Set, Based on "+title_ext,fontsize=title_txt_size)
+        if pname == '': pname='Investment Portfolio'
+        
+        plt.title(pname+": Efficient Set, Based on "+title_ext,fontsize=title_txt_size)
         plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
         
         import datetime as dt; stoday=dt.date.today()
         footnote1=x_axis_name+" -->\n\n"
-        footnote2="Based on "+pname+"\'s stocks, constructed "+str(simulation)+" portfolios"
+        footnote2="Based on given component securities, constructed "+str(simulation)+" portfolios"
         footnote3="\nPeriod of observation: "+hstart+" to "+hend
         footnote4="\nSource: sina/eastmoney/stooq/FRED, "+str(stoday)
     
@@ -1514,7 +1525,7 @@ def cvt_portfolio_name(pname,portfolio_returns):
 
     lang=check_language()
     if lang == "Chinese":
-        pclist=[pname,'等权重组合','资金量加权组合','MSR组合','GMVS组合','MSO组合','GML组合', \
+        pclist=[pname,'等权重组合','交易额加权组合','MSR组合','GMVS组合','MSO组合','GML组合', \
                 'MAR组合','GMBA组合', 'MTR组合','GMBT组合']
     else:
         pclist=[pname,'Equal-weight','Amount-weight','MSR','GMVS','MSO','GML', \