siat 3.3.12__py3-none-any.whl → 3.4.1__py3-none-any.whl

siat/markowitz2.py

@@ -819,10 +819,13 @@ def portfolio_ranks_cn(portfolio_returns,pname,facecolor='papayawhip'):
     #临时保存，避免影响原值
     pr=portfolio_returns.copy()
     
+    #统一核定小数位数
+    ndecimals=2
+    
     #以pname组合作为基准
     import numpy as np
     mean_return_pname=pr[pname].mean(axis=0)
-    annual_return_pname=round(((1 + mean_return_pname)**252 - 1)*100,4)
+    annual_return_pname=round(((1 + mean_return_pname)**252 - 1)*100,ndecimals)
     """
     if annual_return_pname > 0:
         pct_style=True  #百分比模式
@@ -832,7 +835,7 @@ def portfolio_ranks_cn(portfolio_returns,pname,facecolor='papayawhip'):
     pct_style=False
     
     std_return_pname=pr[pname].std(axis=0)
-    annual_std_pname= round((std_return_pname*np.sqrt(252))*100,4)
+    annual_std_pname= round((std_return_pname*np.sqrt(252))*100,ndecimals)
     
     import pandas as pd  
     #prr=pd.DataFrame(columns=["名称","年化收益率","收益率变化","年化标准差","标准差变化","收益/风险"])    
@@ -843,12 +846,12 @@ def portfolio_ranks_cn(portfolio_returns,pname,facecolor='papayawhip'):
         
         #年化收益率：按列求均值
         mean_return=pr[c].mean(axis=0)
-        annual_return = round(((1 + mean_return)**252 - 1)*100,4)
+        annual_return = round(((1 + mean_return)**252 - 1)*100,ndecimals)
         
         if pct_style:
-            return_chg=round((annual_return - annual_return_pname) / annual_return_pname * 100,4)
+            return_chg=round((annual_return - annual_return_pname) / annual_return_pname * 100,ndecimals)
         else:
-            return_chg=round((annual_return - annual_return_pname),4)
+            return_chg=round((annual_return - annual_return_pname),ndecimals)
         
         #收益率变化    
         if return_chg==0:
@@ -866,15 +869,15 @@ def portfolio_ranks_cn(portfolio_returns,pname,facecolor='papayawhip'):
     
         #年化标准差
         std_return=pr[c].std(axis=0)
-        annual_std = round((std_return*np.sqrt(252))*100,4)
+        annual_std = round((std_return*np.sqrt(252))*100,ndecimals)
         
         #sharpe_ratio=round(annual_return / annual_std,2)
-        sharpe_ratio=round((annual_return) / annual_std,4)
+        sharpe_ratio=round((annual_return) / annual_std,ndecimals)
         
         if pct_style:
-            std_chg=round((annual_std - annual_std_pname) / annual_std_pname * 100,4)
+            std_chg=round((annual_std - annual_std_pname) / annual_std_pname * 100,ndecimals)
         else:
-            std_chg=round((annual_std - annual_std_pname),4)
+            std_chg=round((annual_std - annual_std_pname),ndecimals)
         
         #标准差变化
         if std_chg==0:
@@ -953,19 +956,32 @@ def portfolio_ranks_cn(portfolio_returns,pname,facecolor='papayawhip'):
     
     prr2.rename(columns={"投资组合名称/策略":text_lang("投资组合名称/策略","Strategy"), \
                          "收益排名":text_lang("收益排名","Return#"), \
-                         "年化收益率%":text_lang("年化收益率%","Annual Return%"), \
+                         "年化收益率%":text_lang("年化收益率%","pa Return%"), \
                          "收益率变化":text_lang("收益率变化","Return%+/-"), \
                          "风险排名":text_lang("风险排名","Risk#"), \
-                         "年化标准差%":text_lang("年化标准差%","Annual Std%"), \
+                         "年化标准差%":text_lang("年化标准差%","pa Std%"), \
                          "标准差变化":text_lang("标准差变化","Std%+/-"), \
                          "收益率/标准差":text_lang("收益率/标准差","Return/Std")}, \
                 inplace=True)
     
-    df_display_CSS(prr2,titletxt=titletxt,footnote='',facecolor='papayawhip',decimals=2, \
+    #重新排名：相同的值赋予相同的序号
+    prr2["pa Return%"]=prr2["pa Return%"].apply(lambda x: round(float(x),ndecimals))
+    prr2["Return#"]=prr2["pa Return%"].rank(ascending=False,method='dense')
+    prr2["Return#"]=prr2["Return#"].apply(lambda x: int(x))
+    
+    prr2["pa Std%"]=prr2["pa Std%"].apply(lambda x: round(float(x),ndecimals))
+    prr2["Risk#"]=prr2["pa Std%"].rank(ascending=False,method='dense')
+    prr2["Risk#"]=prr2["Risk#"].apply(lambda x: int(x))
+    
+    prr2["Return/Std"]=prr2["Return/Std"].apply(lambda x: round(float(x),ndecimals))
+    prr2["Ret/Std#"]=prr2["Return/Std"].rank(ascending=False,method='dense')
+    prr2["Ret/Std#"]=prr2["Ret/Std#"].apply(lambda x: int(x))
+    
+    df_display_CSS(prr2,titletxt=titletxt,footnote='',facecolor='papayawhip',decimals=ndecimals, \
                        first_col_align='left',second_col_align='center', \
-                       last_col_align='right',other_col_align='right', \
-                       titile_font_size='16px',heading_font_size='15px', \
-                       data_font_size='15px')
+                       last_col_align='center',other_col_align='center', \
+                       titile_font_size='15px',heading_font_size='14px', \
+                       data_font_size='14px')
     
     """
     print(' ') #空一行
@@ -1110,23 +1126,37 @@ def portfolio_ranks_en(portfolio_returns,pname):
 
 #==============================================================================
 if __name__=='__main__':
-    simulation=1000
+    #Define market information and name of the portfolio: Banking #1
+    Market={'Market':('China','000300.SS','Banking #1')}
+    #First batch of component stocks
+    Stocks1={'601939.SS':.3,#CCB Bank
+             '600000.SS':.3, #SPDB Bank
+             '600036.SS':.2, #CMB Bank
+             '601166.SS':.2,#Industrial Bank
+            }
+    portfolio=dict(Market,**Stocks1)    
+    
+    pf_info=portfolio_build(portfolio,thedate='2024-7-17')
+    
     simulation=50000
+    convex_hull=True; frontier="both"; facecolor='papayawhip'
     
     portfolio_eset(pf_info,simulation=50000)
 
-def portfolio_feset(pf_info,simulation=50000,convex_hull=True,facecolor='papayawhip'):
+def portfolio_feset(pf_info,simulation=50000,convex_hull=True,frontier="both",facecolor='papayawhip'):
     
-    results=portfolio_eset(pf_info,simulation=simulation,convex_hull=convex_hull,facecolor=facecolor)
+    results=portfolio_eset(pf_info,simulation=simulation,convex_hull=convex_hull,frontier=frontier,facecolor=facecolor)
     
     return results
 
 
-def portfolio_eset(pf_info,simulation=50000,convex_hull=False,facecolor='papayawhip'):
+def portfolio_eset(pf_info,simulation=50000,convex_hull=False,frontier="both",facecolor='papayawhip'):
     """
     功能：基于随机数，生成大量可能的投资组合，计算各个投资组合的年均收益率和标准差，绘制投资组合的可行集
     默认绘制散点图凸包：convex_hull=True
     """
+    DEBUG=True; MORE_DETAIL=False
+    
     [[portfolio,thedate,stock_return,_,_],_]=pf_info
     pname=portfolio_name(portfolio)
     _,_,tickerlist,_,ticker_type=decompose_portfolio(portfolio)
@@ -1176,7 +1206,6 @@ def portfolio_eset(pf_info,simulation=50000,convex_hull=False,facecolor='papayaw
                          + ['Returns', 'Volatility']
 
     # 绘制散点图
-    print('')
     """
     RandomPortfolios.plot('Volatility','Returns',kind='scatter',color='y',edgecolors='k')
     """
@@ -1193,6 +1222,8 @@ def portfolio_eset(pf_info,simulation=50000,convex_hull=False,facecolor='papayaw
     
     #绘制散点图轮廓线凸包（convex hull）
     if convex_hull:
+        print("  Calculating convex hull ...")
+        
         from scipy.spatial import ConvexHull
         
         #构造散点对的列表
@@ -1204,29 +1235,85 @@ def portfolio_eset(pf_info,simulation=50000,convex_hull=False,facecolor='papayaw
             y=pf_returns_list[pos]
             points=points+[[x,y]]
         
+        #寻找最左侧的坐标：在x最小的同时，y要最大
+        points_df = pd.DataFrame(points, columns=['x', 'y'])
+        points_df.sort_values(by=['x','y'],ascending=[True,False],inplace=True)
+        x1,y1=points_df.head(1).values[0]
+        if DEBUG and MORE_DETAIL:
+            print("\n*** Leftmost point (x1,y1):",x1,y1)
+        
+        #寻找最高点的坐标：在y最大的同时，x要最小
+        points_df.sort_values(by=['y','x'],ascending=[False,True],inplace=True)
+        x2,y2=points_df.head(1).values[0]
+        if DEBUG and MORE_DETAIL:
+            print("*** Highest point (x2,y2):",x2,y2)
+        
+        if DEBUG:
+            plt.plot([x1,x2],[y1,y2],ls=':',lw=2,alpha=0.5)
+        
+        #建立最左侧和最高点之间的拟合直线方程y=a+bx
+        a=(x1*y2-x2*y1)/(x1-x2); b=(y1-y2)/(x1-x2)
+        def y_bar(x_bar):
+            return a+b*x_bar
+        
         # 计算散点集的外轮廓
-        hull = ConvexHull(points)    
+        hull = ConvexHull(points)  
+        
         # 绘制外轮廓线
+        firsttime_efficient=True; firsttime_inefficient=True
         for simplex in hull.simplices:
+            #p1中是一条线段起点和终点的横坐标
+            p1=[points[simplex[0]][0], points[simplex[1]][0]]
+            px1=p1[0];px2=p1[1]
+            #p2中是一条线段起点和终点的纵坐标
+            p2=[points[simplex[0]][1], points[simplex[1]][1]]
+            py1=p2[0]; py2=p2[1]
+            
+            if DEBUG and MORE_DETAIL:
+                print("\n*** Hull line start (px1,py1):",px1,py1)
+                print("*** Hull line end (px2,py2):",px2,py2)
+
+            """
             plt.plot([points[simplex[0]][0], points[simplex[1]][0]],
                      [points[simplex[0]][1], points[simplex[1]][1]], 'k-.')   
-    
-    """
-    #滚动法寻找上边沿
-    points_sorted=points
-    points_sorted.sort(key=lambda x: x[0])
-    points_df=pd.DataFrame(points_sorted,columns=['x','y'])
-    
-    window=100
-    nwindow=int(len(points_df)/window)
-    upper_points=[]
-    for n in range(nwindow):
-        tmp_df=points_df[n*window:n*window+window]
-        max_y=max(tmp_df['y'])
-        max_x=tmp_df[tmp_df['y']==max_y]['x'].values[0]
-        
-        upper_points=upper_points+[[max_x,max_y]]
-    """    
+            """
+            
+            #线段起点：px1,py1；线段终点：px2,py2
+            if DEBUG and MORE_DETAIL:
+                is_efficient=(py1>=y_bar(px1) or py1==y1) and (py2>=y_bar(px2) or py2==y2)
+                print("\n*** is_efficient:",is_efficient)
+                print("py1=",py1,"y_bar1",y_bar(px1),"y1=",y1,"py2=",py2,"ybar2=",y_bar(px2),"y2=",y2)
+                if px1==x1 and py1==y1:
+                    print("====== This is the least risk point !")
+                if px2==x2 and py2==y2:
+                    print("====== This is the highest return point !")
+            
+            #坐标对[px1,py1]既可能作为开始点，也可能作为结束点，[px2,py2]同样
+            if ((py1>=y_bar(px1) or py1==y1) and (py2>=y_bar(px2) or py2==y2)) or \
+               ((py1>=y_bar(px2) or py1==y2) and (py2>=y_bar(px1) or py2==y1)):
+                   
+                #有效边界
+                if frontier.lower() in ['both','efficient']:
+                    if firsttime_efficient:
+                        plt.plot(p1,p2, 'r--',label=text_lang("有效边界","Efficient Frontier"),lw=3,alpha=0.5)   
+                        firsttime_efficient=False
+                    else:
+                        plt.plot(p1,p2, 'r--',lw=3,alpha=0.5)   
+                else:
+                    pass
+            else:
+                #其余边沿
+                if frontier.lower() in ['both','inefficient']:
+                    if firsttime_inefficient:
+                        plt.plot(p1,p2, 'k-.',label=text_lang("无效边界","Inefficient Frontier"),alpha=0.5)
+                        firsttime_inefficient=False
+                    else:
+                        plt.plot(p1,p2, 'k-.',alpha=0.5)
+                else:
+                    pass
+    else:
+        print('')
+      
     
     import datetime as dt; stoday=dt.date.today()
     lang = check_language()
@@ -1256,6 +1343,7 @@ def portfolio_eset(pf_info,simulation=50000,convex_hull=False,facecolor='papayaw
     plt.xlabel(footnote1+footnote2+footnote3+footnote4,fontsize=xlabel_txt_size)
     
     plt.gca().set_facecolor(facecolor)
+    plt.legend(loc='best')
     plt.show()
 
     return [pf_info,RandomPortfolios]
@@ -1698,7 +1786,7 @@ if __name__=='__main__':
 #==============================================================================
 def RandomPortfolios_plot(RandomPortfolios,col_x,col_y,colorbartxt,title_ext, \
                           ylabeltxt,x_axis_name,pname,simulation,hstart,hend, \
-                          hiret_point,lorisk_point,convex_hull=True, \
+                          hiret_point,lorisk_point,convex_hull=True,frontier='efficient', \
                           facecolor="papayawhip"):
     """
     功能：将生成的马科维茨可行集RandomPortfolios绘制成彩色散点图
@@ -1726,7 +1814,8 @@ def RandomPortfolios_plot(RandomPortfolios,col_x,col_y,colorbartxt,title_ext, \
     plt.xlabel(footnote1+footnote2+footnote3+footnote4)
     plt.show()
     """    
-    print('')
+    DEBUG=False
+    
     #RandomPortfolios.plot(col_x,col_y,kind='scatter',color='y',edgecolors='k')
     
     pf_ratio = np.array(RandomPortfolios[col_y] / RandomPortfolios[col_x])
@@ -1739,6 +1828,7 @@ def RandomPortfolios_plot(RandomPortfolios,col_x,col_y,colorbartxt,title_ext, \
 
     #绘制散点图轮廓线凸包（convex hull）
     if convex_hull:
+        print("  Calculating convex hull ...")
         from scipy.spatial import ConvexHull
         
         #构造散点对的列表
@@ -1750,13 +1840,65 @@ def RandomPortfolios_plot(RandomPortfolios,col_x,col_y,colorbartxt,title_ext, \
             y=pf_returns_list[pos]
             points=points+[[x,y]]
         
+        #寻找最左侧的坐标：在x最小的同时，y要最大
+        points_df = pd.DataFrame(points, columns=['x', 'y'])
+        points_df.sort_values(by=['x','y'],ascending=[True,False],inplace=True)
+        x1,y1=points_df.head(1).values[0]
+        
+        #寻找最高点的坐标：在y最大的同时，x要最小
+        points_df.sort_values(by=['y','x'],ascending=[False,True],inplace=True)
+        x2,y2=points_df.head(1).values[0]
+        
+        if DEBUG:
+            plt.plot([x1,x2],[y1,y2],ls=':',lw=2,alpha=0.5)
+        
+        #建立最左侧和最高点之间的拟合直线方程y=a+bx
+        a=(x1*y2-x2*y1)/(x1-x2); b=(y1-y2)/(x1-x2)
+        def y_bar(x_bar):
+            return a+b*x_bar
+        
         # 计算散点集的外轮廓
-        hull = ConvexHull(points)    
+        hull = ConvexHull(points)  
+        
         # 绘制外轮廓线
+        firsttime_efficient=True; firsttime_inefficient=True
         for simplex in hull.simplices:
+            #p1中是一条线段起点和终点的横坐标
+            p1=[points[simplex[0]][0], points[simplex[1]][0]]
+            px1=p1[0];px2=p1[1]
+            #p2中是一条线段起点和终点的纵坐标
+            p2=[points[simplex[0]][1], points[simplex[1]][1]]
+            py1=p2[0]; py2=p2[1]
+
+            """
             plt.plot([points[simplex[0]][0], points[simplex[1]][0]],
                      [points[simplex[0]][1], points[simplex[1]][1]], 'k-.')   
-
+            """
+            #线段起点：px1,py1；线段终点：px2,py2。但也可能互换起点和终点
+            if ((py1>=y_bar(px1) or py1==y1) and (py2>=y_bar(px2) or py2==y2)) or \
+               ((py1>=y_bar(px2) or py1==y2) and (py2>=y_bar(px1) or py2==y1)) :
+                #有效边界
+                if frontier.lower() in ['both','efficient']:
+                    if firsttime_efficient:
+                        plt.plot(p1,p2, 'r--',label=text_lang("有效边界","Efficient Frontier"),lw=3,alpha=0.5)   
+                        firsttime_efficient=False
+                    else:
+                        plt.plot(p1,p2, 'r--',lw=3,alpha=0.5)   
+                else:
+                    pass
+            else:
+                #其余边沿
+                if frontier.lower() in ['both','inefficient']:
+                    if firsttime_inefficient:
+                        plt.plot(p1,p2, 'k-.',label=text_lang("无效边界","Inefficient Frontier"),alpha=0.5)
+                        firsttime_inefficient=False
+                    else:
+                        plt.plot(p1,p2, 'k-.',alpha=0.5)
+                else:
+                    pass
+    else:
+        #无convex hull
+        print('')
 
     lang = check_language()
     if lang == 'Chinese':
@@ -1787,11 +1929,11 @@ def RandomPortfolios_plot(RandomPortfolios,col_x,col_y,colorbartxt,title_ext, \
     #解析最大比率点和最低风险点信息，并绘点
     [hiret_x,hiret_y,name_hiret]=hiret_point
     #plt.scatter(hiret_x, hiret_y, color='red',marker='*',s=150,label=name_hiret)
-    plt.scatter(hiret_x, hiret_y, color='blue',marker='*',s=200,label=name_hiret)
+    plt.scatter(hiret_x, hiret_y, color='red',marker='*',s=300,label=name_hiret,alpha=0.5)
     
     [lorisk_x,lorisk_y,name_lorisk]=lorisk_point
     #plt.scatter(lorisk_x, lorisk_y, color='m',marker='8',s=100,label=name_lorisk)
-    plt.scatter(lorisk_x, lorisk_y, color='red',marker='8',s=150,label=name_lorisk)
+    plt.scatter(lorisk_x, lorisk_y, color='blue',marker='8',s=150,label=name_lorisk,alpha=0.5)
     
     plt.legend(loc='best')
     
@@ -1873,7 +2015,7 @@ def cvt_portfolio_name(pname,portfolio_returns):
 
 #==============================================================================
 
-def portfolio_optimize_sharpe(es_info,graph=True,convex_hull=False,facecolor='papayawhip'):
+def portfolio_optimize_sharpe(es_info,graph=True,convex_hull=False,frontier='efficient',facecolor='papayawhip'):
     """
     功能：计算投资组合的最高夏普比率组合，并绘图
     MSR: Maximium Sharpe Rate, 最高夏普指数方案
@@ -1927,7 +2069,7 @@ def portfolio_optimize_sharpe(es_info,graph=True,convex_hull=False,facecolor='pa
     hiret_weights,lorisk_weights,portfolio_returns = \
         portfolio_optimize_rar(es_info,col_ratio,col_y,col_x,name_hiret,name_lorisk, \
                            colorbartxt,title_ext,ylabeltxt,x_axis_name,graph=graph, \
-                           convex_hull=convex_hull,facecolor=facecolor)
+                           convex_hull=convex_hull,frontier=frontier,facecolor=facecolor)
 
     print(text_lang("【注释】","[Notes]"))
     print("★MSR ：Maximized Sharpe Ratio"+text_lang("，最大夏普比率点",''))
@@ -1950,7 +2092,7 @@ if __name__=='__main__':
 
 #==============================================================================
 
-def portfolio_optimize_sortino(es_info,graph=True,convex_hull=False,facecolor="papayawhip"):
+def portfolio_optimize_sortino(es_info,graph=True,convex_hull=False,frontier='efficient',facecolor="papayawhip"):
     """
     功能：计算投资组合的最高索替诺比率组合，并绘图
     MSO: Maximium Sortino ratio, 最高索替诺比率方案
@@ -1968,7 +2110,7 @@ def portfolio_optimize_sortino(es_info,graph=True,convex_hull=False,facecolor="p
     title_ext=text_lang("索替诺比率","Sortino Ratio")   #用于标题区别
     colorbartxt=text_lang("索替诺比率","Sortino Ratio") #用于彩色棒标签
     ylabeltxt=text_lang("年化风险溢价","Annualized Risk Premium") #用于纵轴名称
-    x_axis_name=text_lang("年化风险溢价之下偏标准差","Annualized Std of Risk Premium")   #用于横轴名称 
+    x_axis_name=text_lang("年化风险溢价之下偏标准差","Annualized Risk Premium LPSD")   #用于横轴名称 
 
     #定制部分结束...............................................................
     
@@ -1976,7 +2118,7 @@ def portfolio_optimize_sortino(es_info,graph=True,convex_hull=False,facecolor="p
     hiret_weights,lorisk_weights,portfolio_returns = \
         portfolio_optimize_rar(es_info,col_ratio,col_y,col_x,name_hiret,name_lorisk, \
                            colorbartxt,title_ext,ylabeltxt,x_axis_name,graph=graph, \
-                           convex_hull=convex_hull,facecolor=facecolor)
+                           convex_hull=convex_hull,frontier=frontier,facecolor=facecolor)
 
     print(text_lang("【注释】","[Notes]"))
     print("★MSO：Maximum SOrtino ratio"+text_lang("，最大索替诺比率点",''))
@@ -2001,7 +2143,7 @@ if __name__=='__main__':
 if __name__=='__main__':
     graph=True; convex_hull=False
     
-def portfolio_optimize_alpha(es_info,graph=True,convex_hull=False,facecolor='papayawhip'):
+def portfolio_optimize_alpha(es_info,graph=True,convex_hull=False,frontier='efficient',facecolor='papayawhip'):
     """
     功能：计算投资组合的最高詹森阿尔法组合，并绘图
     MAR: Maximium Alpha Ratio, 最高阿尔法指数方案
@@ -2026,7 +2168,7 @@ def portfolio_optimize_alpha(es_info,graph=True,convex_hull=False,facecolor='pap
     hiret_weights,lorisk_weights,portfolio_returns = \
         portfolio_optimize_rar(es_info,col_ratio,col_y,col_x,name_hiret,name_lorisk, \
                            colorbartxt,title_ext,ylabeltxt,x_axis_name,graph=graph, \
-                           convex_hull=convex_hull,facecolor=facecolor)
+                           convex_hull=convex_hull,frontier=frontier,facecolor=facecolor)
 
     print(text_lang("【注释】","[Notes]"))
     print("★MAR ：Maximum Alpha Ratio"+text_lang("，最大阿尔法点",''))
@@ -2048,7 +2190,7 @@ if __name__=='__main__':
     
 #==============================================================================
 
-def portfolio_optimize_treynor(es_info,graph=True,convex_hull=False,facecolor='papayawhip'):
+def portfolio_optimize_treynor(es_info,graph=True,convex_hull=False,frontier='efficient',facecolor='papayawhip'):
     """
     功能：计算投资组合的最高特雷诺比率组合，并绘图
     MTR: Maximium Treynor Ratio, 最高特雷诺指数方案
@@ -2073,7 +2215,7 @@ def portfolio_optimize_treynor(es_info,graph=True,convex_hull=False,facecolor='p
     hiret_weights,lorisk_weights,portfolio_returns = \
         portfolio_optimize_rar(es_info,col_ratio,col_y,col_x,name_hiret,name_lorisk, \
                            colorbartxt,title_ext,ylabeltxt,x_axis_name,graph=graph, \
-                           convex_hull=convex_hull,facecolor=facecolor)
+                           convex_hull=convex_hull,frontier=frontier,facecolor=facecolor)
 
     print(text_lang("【注释】","[Notes]"))
     print("★MTR ：Maximum Treynor Ratio"+text_lang("，最大特雷诺比率点",''))
@@ -2088,7 +2230,7 @@ if __name__=='__main__':
     
 def portfolio_optimize_rar(es_info,col_ratio,col_y,col_x,name_hiret,name_lorisk, \
                            colorbartxt,title_ext,ylabeltxt,x_axis_name,graph=True, \
-                           convex_hull=False,facecolor='papayawhip'):
+                           convex_hull=False,frontier='efficient',facecolor='papayawhip'):
     """
     功能：提供rar比率优化的共同处理部分
     基于RandomPortfolios中的随机投资组合，计算相应的指数，寻找最大指数点和风险最小点，并绘图标注两个点
@@ -2163,7 +2305,8 @@ def portfolio_optimize_rar(es_info,col_ratio,col_y,col_x,name_hiret,name_lorisk,
     if graph:
         RandomPortfolios_plot(RandomPortfolios,col_x,col_y,colorbartxt,title_ext, \
                               ylabeltxt,x_axis_name,pname,simulation,hstart,hend, \
-                              hiret_point,lorisk_point,convex_hull=convex_hull,facecolor=facecolor)    
+                              hiret_point,lorisk_point,convex_hull=convex_hull, \
+                              frontier=frontier,facecolor=facecolor)    
 
     #返回数据，供进一步分析
     portfolio_returns=StockReturns.copy()
@@ -2200,7 +2343,7 @@ if __name__=='__main__':
 
 def portfolio_optimize(pf_info,ratio='sharpe',simulation=50000,RF=0, \
                        graph=True,hirar_return=False,lorisk=True, \
-                       convex_hull=False,facecolor='papayawhip'):
+                       convex_hull=True,frontier='efficient',facecolor='papayawhip'):
     """
     功能：集成式投资组合优化策略
     注意：实验发现RF较小时对于结果的影响极其微小难以观察，默认设为不使用无风险利率调整收益
@@ -2231,7 +2374,8 @@ def portfolio_optimize(pf_info,ratio='sharpe',simulation=50000,RF=0, \
         eval(func_optimize)(es_info=es_info,RF=RF,graph=graph)
     """
     name_hiret,hiret_weights,name_lorisk,lorisk_weights,portfolio_returns= \
-        eval(func_optimize)(es_info=es_info,graph=graph,convex_hull=convex_hull,facecolor=facecolor)
+        eval(func_optimize)(es_info=es_info,graph=graph,convex_hull=convex_hull, \
+                            frontier=frontier,facecolor=facecolor)
     
     
     lang = check_language()
@@ -2239,12 +2383,12 @@ def portfolio_optimize(pf_info,ratio='sharpe',simulation=50000,RF=0, \
         zhuhe_txt='组合'
         mingcheng_txt='投资组合名称/策略'
         titletxt="投资组合策略：业绩比较"
-        ylabeltxt="持有收益率"
+        ylabeltxt="持有期收益率"
     else:
         zhuhe_txt=''
         mingcheng_txt='Strategy'
         titletxt="Investment Portfolio Strategy: Performance Comparison"
-        ylabeltxt="Holding Return"
+        ylabeltxt="Holding Period Return"
     
     #打印投资组合构造和业绩表现
     hi_name=modify_portfolio_name(name_hiret+zhuhe_txt)

{siat-3.3.12.dist-info → siat-3.4.1.dist-info}/METADATA

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

@@ -69,7 +69,7 @@ siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
 siat/market_china.py,sha256=EOO-RvdnzJThTrgNHWW3TlWhx4k4rfdjbooOnQsYdQU,50299
 siat/markowitz.py,sha256=DsfS6vG9TAfdJP4GgN-CCArujPi84XjD23CWbxaA2o4,97627
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
-siat/markowitz2.py,sha256=y7ShcnKIaxw6LVZlwJj56PlOskiI0DRqU8PXU6f8uyM,114781
+siat/markowitz2.py,sha256=LK2pDEtE5PUmBtCHmCcRs8FlPqZKmhFXiuLIL4JeQa8,121991
 siat/markowitz_ccb_test.py,sha256=xBkkoaNHdq9KSUrNuHGgKTdNYUvgi84kNYcf719eoyE,1593
 siat/markowitz_ef_test.py,sha256=wjNlICkgRIqnonPeSIHo4Mu2GRtb9dr21wDt2kMNEcI,4032
 siat/markowitz_old.py,sha256=Lf7O_4QWT8RsdkHiUyc_7kKY3eZjKDtFR89Fz3pwYnY,33046
@@ -139,7 +139,7 @@ siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
-siat-3.3.12.dist-info/METADATA,sha256=EtLtE-RtRKITuvSR_Lx-VPuRx_GVICFYFtDe0pjtZHM,7310
-siat-3.3.12.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.3.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.3.12.dist-info/RECORD,,
+siat-3.4.1.dist-info/METADATA,sha256=0s5TpzHfnUzzwRFnFeoBNXS-3miIuEZglezF2dKX0rs,7309
+siat-3.4.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.4.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.1.dist-info/RECORD,,