siat 3.8.30__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/grafix.py

@@ -433,7 +433,8 @@ def plot_line2(df1,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
                ylabeltxt,titletxt,footnote, \
                power=0,datatag1=False,datatag2=False,yscalemax=5, \
-               zeroline=False,twinx=False, \
+               zeroline=False, \
+                   twinx=False, \
                    yline=999,attention_value_area='', \
                    xline=999,attention_point_area='', \
                resample_freq='D',loc1='best',loc2='best', \
@@ -465,7 +466,36 @@ def plot_line2(df1,ticker1,colname1,label1, \
         print("Going to plot_line2_coaxial")
         print("yline=",yline,"; xline=",xline)
     
-    if not twinx:            
+    #if not twinx:
+    if twinx == True: # 双轴会图
+        plot_line2_twinx(df1,ticker1,colname1,label1, \
+                         df2,ticker2,colname2,label2, \
+                         titletxt,footnote,power,datatag1,datatag2, \
+                         resample_freq=resample_freq, \
+                             xline=xline,attention_point_area=attention_point_area, \
+                         loc1=loc1,loc2=loc2, \
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
+    elif 'LR' in twinx.upper(): # 左右双图
+        plot_line2_LR(df1,ticker1,colname1,label1, \
+                         df2,ticker2,colname2,label2, \
+                         titletxt,footnote,power,datatag1,datatag2, \
+                         resample_freq=resample_freq, \
+                             xline=xline,attention_point_area=attention_point_area, \
+                         loc1=loc1,loc2=loc2, \
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
+    elif 'UD' in twinx.upper(): # 上下双图
+        plot_line2_UD(df1,ticker1,colname1,label1, \
+                         df2,ticker2,colname2,label2, \
+                         titletxt,footnote,power,datatag1,datatag2, \
+                         resample_freq=resample_freq, \
+                             xline=xline,attention_point_area=attention_point_area, \
+                         loc1=loc1,loc2=loc2, \
+                         color1=color1,color2=color2,facecolor=facecolor, \
+                             maxticks=maxticks)
+        
+    else: # twinx == False # 正常绘图           
         plot_line2_coaxial(df1,ticker1,colname1,label1, \
                 df2,ticker2,colname2,label2, \
                 ylabeltxt,titletxt,footnote,power,datatag1,datatag2,zeroline, \
@@ -475,15 +505,7 @@ def plot_line2(df1,ticker1,colname1,label1, \
                 loc1=loc1,loc2=loc2, \
                 color1=color1,color2=color2,facecolor=facecolor, \
                     maxticks=maxticks)
-    else:
-        plot_line2_twinx(df1,ticker1,colname1,label1, \
-                         df2,ticker2,colname2,label2, \
-                         titletxt,footnote,power,datatag1,datatag2, \
-                         resample_freq=resample_freq, \
-                             xline=xline,attention_point_area=attention_point_area, \
-                         loc1=loc1,loc2=loc2, \
-                         color1=color1,color2=color2,facecolor=facecolor, \
-                             maxticks=maxticks)
+            
     return
 
 
@@ -1298,10 +1320,501 @@ if __name__ =="__main__":
         df2,'600266.SS','Close','收盘价', \
         "证券价格走势对比图","数据来源：新浪/stooq")
 
-    plot_line2_twinx(df1,'000002.SZ','Close','收盘价', \
+    plot_line2_LR(df1,'000002.SZ','Close','收盘价', \
         df2,'600266.SS','Close','收盘价', \
         "证券价格走势对比图","数据来源：新浪/stooq",power=3)
 
+#==============================================================================
+def plot_line2_LR(df01,ticker1,colname1,label1, \
+                  df02,ticker2,colname2,label2, \
+                  titletxt,footnote,power=0, \
+                      datatag1=False,datatag2=False, \
+                      resample_freq='D', \
+                      xline=999,attention_point_area='', \
+                  loc1='upper left',loc2='lower left', \
+                      color1='red',color2='blue',facecolor='whitesmoke', \
+                      ticker_type='auto', \
+                      maxticks=15):
+    """
+    功能：绘制两个证券或指标的左右折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
+    假定：数据表有索引，且已经按照索引排序
+    输入：
+    证券1：数据表df1，证券代码ticker1，列名1，列名标签1；
+    证券2：数据表df2，证券代码ticker2，列名2，列名标签2；
+    标题titletxt，脚注footnote；是否在图中标记数据datatag；趋势图的多项式次数power
+    输出：绘制左右并列折线图
+    返回值：无
+    注意：需要日期类型作为df索引
+    """
+    DEBUG=False
+    
+    #plt.rcParams['axes.grid']=False
+    
+    #插值平滑
+    try:
+        df01x=df01[[colname1]].astype('float')
+        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+    except:
+        df1=df01
+    try:
+        df02x=df02[[colname2]].astype('float')
+        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+    except:
+        df2=df02
+    
+    #预处理ticker_type
+    ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)        
+    
+    #创建画布：绘制折线图，左右双子图
+    fig, (ax, ax2) = plt.subplots(1, 2)
+    
+    #设置主标题
+    #plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size, y=1.01)  # y参数调整垂直位置
+    plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size)
+    
+    # 绘制左子图================================================================
+    #设置画布背景颜色
+    try:
+        ax.set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_twinx): color",facecolor,"is unsupported")
+        facecolor="whitesmoke"
+        ax.set_facecolor(facecolor) 
+    
+    # 设置折线标签
+    if ticker1 == '':
+        label1txt=label1
+    else:
+        if label1 == '':
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'   
+
+    # 设置子图标题
+    if ticker1 != ticker2:
+        ax.set_title(label1txt,fontsize=xlabel_txt_size)
+    else:
+        ax.set_title(ectranslate(colname1),fontsize=xlabel_txt_size)
+
+    # 绘图        
+    lwadjust=linewidth_adjust(df1)
+    """
+    ax.plot(df1.index,df1[colname1],'-',label=label1txt, \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+    """  
+    ax.plot(df1.index,df1[colname1],'-', \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+
+    #证券1：绘制数据标签
+    if datatag1:
+        for x, y in zip(df1.index, df1[colname1]):
+            ax.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+
+    #绘制关注点
+    import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
+    if xline != 999:
+        attention_point=xline
+        
+        #用于关注点的颜色列表
+        atp_color_list=["crimson","dodgerblue","magenta","lightseagreen","chocolate"]  
+        
+        if isinstance(attention_point,str) or isinstance(attention_point,int) or isinstance(attention_point,float):
+            atp_list=[attention_point]
+        elif isinstance(attention_point,list):
+            atp_list=attention_point
+        else:
+            atp_list=[]
+        #去重，不打乱原来的顺序
+        atp_list=list(dict.fromkeys(atp_list))
+
+        if DEBUG:
+            print("In plot_line2_twinx")
+            print("atp_list=",atp_list)
+            
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    at=datetime.strptime(at, date_format)
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))        
+
+    if not attention_point_area=='':
+        if isinstance(attention_point_area,list) and len(attention_point_area)>=2:
+            apa_list=[]
+            for ap in attention_point_area:
+                try:
+                    ap=datetime.strptime(ap, date_format)
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            ax.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
+
+    #绘证券1：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'        
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df1['id']=range(len(df1))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df1.id, df1[colname1], power)
+        f = np.poly1d(parameter)
+
+        if ticker1 == '':
+            label1txt=''
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
+        ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
+
+    # 纵轴标签
+    #ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
+    #ax.legend(loc=loc1,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+
+    #绘图右图===================================================================
+    #设置画布背景颜色
+    ax2.set_facecolor(facecolor)
+
+    # 折线标签
+    if ticker2 == '':
+        label2txt=label2
+    else:
+        if label2 == '':
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'   
+
+    # 设置子图标题
+    if ticker1 != ticker2:
+        ax2.set_title(label2txt,fontsize=xlabel_txt_size)
+    else:
+        ax2.set_title(ectranslate(colname2),fontsize=xlabel_txt_size)
+    
+    # 绘图        
+    lwadjust=linewidth_adjust(df2)
+    """
+    ax2.plot(df2.index,df2[colname2],'-',label=label2txt, \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+    """  
+    ax2.plot(df2.index,df2[colname2],'-', \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+
+    #证券2：绘制数据标签
+    if datatag2:
+        for x, y in zip(df2.index, df2[colname2]):
+            ax2.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+    
+    #绘证券2：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'           
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df2['id']=range(len(df2))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df2.id, df2[colname2], power)
+        f = np.poly1d(parameter)
+
+        if ticker2 == '':
+            label2txt=''
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
+        ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
+    
+    # 纵轴标签
+    #ax2.set_ylabel(label2txt,fontsize=ylabel_txt_size)
+    #ax2.legend(loc=loc2,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax2.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+    
+    #自动优化x轴标签
+    #ax2.autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    
+    # 共同脚注==================================================================
+    fig.text(0.5,-0.01,footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    #plt.xlabel(footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    
+    # 自动倾斜横轴日期
+    fig.autofmt_xdate(ha="center")
+    
+    # 调整布局防止重叠
+    plt.tight_layout()        
+    plt.show()
+    
+    return
+
+
+#==============================================================================
+def plot_line2_UD(df01,ticker1,colname1,label1, \
+                  df02,ticker2,colname2,label2, \
+                  titletxt,footnote,power=0, \
+                      datatag1=False,datatag2=False, \
+                      resample_freq='D', \
+                      xline=999,attention_point_area='', \
+                  loc1='upper left',loc2='lower left', \
+                      color1='red',color2='blue',facecolor='whitesmoke', \
+                      ticker_type='auto', \
+                      maxticks=15):
+    """
+    功能：绘制两个证券或指标的上下折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
+    假定：数据表有索引，且已经按照索引排序
+    输入：
+    证券1：数据表df1，证券代码ticker1，列名1，列名标签1；
+    证券2：数据表df2，证券代码ticker2，列名2，列名标签2；
+    标题titletxt，脚注footnote；是否在图中标记数据datatag；趋势图的多项式次数power
+    输出：绘制上下并列折线图
+    返回值：无
+    注意：需要日期类型作为df索引
+    """
+    DEBUG=False
+    
+    #plt.rcParams['axes.grid']=False
+    
+    #插值平滑
+    try:
+        df01x=df01[[colname1]].astype('float')
+        df1=df_smooth_manual(df01x,resample_freq=resample_freq)
+    except:
+        df1=df01
+    try:
+        df02x=df02[[colname2]].astype('float')
+        df2=df_smooth_manual(df02x,resample_freq=resample_freq)
+    except:
+        df2=df02
+    
+    #预处理ticker_type
+    ticker_type_list=ticker_type_preprocess_mticker_mixed([ticker1,ticker2],ticker_type)        
+    
+    #创建画布：绘制折线图，上下双子图
+    fig, (ax, ax2) = plt.subplots(2, 1)
+    
+    #设置主标题
+    #plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size, y=1.01)  # y参数调整垂直位置
+    plt.suptitle(titletxt,fontweight='bold',fontsize=title_txt_size)
+    
+    # 绘制左子图================================================================
+    #设置画布背景颜色
+    try:
+        ax.set_facecolor(facecolor)
+    except:
+        print("  #Warning(plot_line2_twinx): color",facecolor,"is unsupported")
+        facecolor="whitesmoke"
+        ax.set_facecolor(facecolor) 
+    
+    # 设置折线标签
+    if ticker1 == '':
+        label1txt=label1
+    else:
+        if label1 == '':
+            label1txt=ticker_name(ticker1,ticker_type_list[0])
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+'('+label1+')'   
+
+    # 设置子图标题
+    """
+    if ticker1 != ticker2:
+        ax.set_title(label1txt,fontsize=xlabel_txt_size)
+    else:
+        ax.set_title(ectranslate(colname1),fontsize=xlabel_txt_size)
+    """
+    # 绘图        
+    lwadjust=linewidth_adjust(df1)
+    """
+    ax.plot(df1.index,df1[colname1],'-',label=label1txt, \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+    """  
+    ax.plot(df1.index,df1[colname1],'-', \
+             linestyle='-',color=color1,linewidth=lwadjust)   
+
+    #证券1：绘制数据标签
+    if datatag1:
+        for x, y in zip(df1.index, df1[colname1]):
+            ax.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+
+    #绘制关注点
+    import pandas as pd
+    from datetime import datetime; date_format="%Y-%m-%d"
+    if xline != 999:
+        attention_point=xline
+        
+        #用于关注点的颜色列表
+        atp_color_list=["crimson","dodgerblue","magenta","lightseagreen","chocolate"]  
+        
+        if isinstance(attention_point,str) or isinstance(attention_point,int) or isinstance(attention_point,float):
+            atp_list=[attention_point]
+        elif isinstance(attention_point,list):
+            atp_list=attention_point
+        else:
+            atp_list=[]
+        #去重，不打乱原来的顺序
+        atp_list=list(dict.fromkeys(atp_list))
+
+        if DEBUG:
+            print("In plot_line2_twinx")
+            print("atp_list=",atp_list)
+            
+        if not atp_list==[] and not atp_list==['']:
+            
+            for at in atp_list:
+                pos=atp_list.index(at)
+                color=atp_color_list[pos]
+                
+                #判断是否日期字符串
+                try:
+                    at=datetime.strptime(at, date_format)
+                    atpd=pd.to_datetime(at)
+                except:
+                    atpd=at
+                ax.axvline(x=atpd,ls=":",c=color,linewidth=1.5,label=text_lang("关注点","Attention point ")+str(at))        
+
+    if not attention_point_area=='':
+        if isinstance(attention_point_area,list) and len(attention_point_area)>=2:
+            apa_list=[]
+            for ap in attention_point_area:
+                try:
+                    ap=datetime.strptime(ap, date_format)
+                    appd=pd.to_datetime(ap)
+                except:
+                    appd=ap
+                apa_list=apa_list+[appd]
+                
+            yaxis_data=plt.ylim()
+            ax.fill_betweenx(yaxis_data,apa_list[0],apa_list[1],color='powderblue',alpha=0.5)
+
+    #绘证券1：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'        
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df1['id']=range(len(df1))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df1.id, df1[colname1], power)
+        f = np.poly1d(parameter)
+
+        if ticker1 == '':
+            label1txt=''
+        else:
+            label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
+        ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
+
+    # 纵轴标签
+    if ticker1 != ticker2:
+        ax.set_ylabel(label1txt,fontsize=ylabel_txt_size)
+    else:
+        ax.set_ylabel(ectranslate(colname1),fontsize=ylabel_txt_size)
+    #ax.legend(loc=loc1,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+
+    #绘图右图===================================================================
+    #设置画布背景颜色
+    ax2.set_facecolor(facecolor)
+
+    # 折线标签
+    if ticker2 == '':
+        label2txt=label2
+    else:
+        if label2 == '':
+            label2txt=ticker_name(ticker2,ticker_type_list[1])
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+'('+label2+')'   
+
+    # 设置子图标题
+    """
+    if ticker1 != ticker2:
+        ax2.set_title(label2txt,fontsize=xlabel_txt_size)
+    else:
+        ax2.set_title(ectranslate(colname2),fontsize=xlabel_txt_size)
+    """
+    # 绘图        
+    lwadjust=linewidth_adjust(df2)
+    """
+    ax2.plot(df2.index,df2[colname2],'-',label=label2txt, \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+    """  
+    ax2.plot(df2.index,df2[colname2],'-', \
+             linestyle='-.',color=color2,linewidth=lwadjust)
+
+    #证券2：绘制数据标签
+    if datatag2:
+        for x, y in zip(df2.index, df2[colname2]):
+            ax2.text(x,y+0.1,'%.2f' % y,ha='center',va='bottom',color='black')
+    
+    #绘证券2：制趋势线
+    if power > 0:
+        lang=check_language()
+        trend_txt='趋势线'
+        if lang == 'English':
+            trend_txt='Trend line'           
+        
+        #生成行号，借此将横轴的日期数量化，以便拟合
+        df2['id']=range(len(df2))
+        
+        #设定多项式拟合，power为多项式次数
+        import numpy as np
+        parameter = np.polyfit(df2.id, df2[colname2], power)
+        f = np.poly1d(parameter)
+
+        if ticker2 == '':
+            label2txt=''
+        else:
+            label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
+        ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
+    
+    # 纵轴标签
+    if ticker1 != ticker2:
+        ax2.set_ylabel(label2txt,fontsize=ylabel_txt_size)
+    else:
+        ax2.set_ylabel(ectranslate(colname2),fontsize=ylabel_txt_size)
+    #ax2.legend(loc=loc2,fontsize=legend_txt_size)
+
+    # 横轴标签
+    #ax2.set_xlabel(text_lang("日期","Date"),fontsize=xlabel_txt_size,ha='center')
+    
+    #自动优化x轴标签
+    #ax2.autofmt_xdate(ha="center") # 优化标注（自动倾斜）
+    
+    # 共同脚注==================================================================
+    fig.text(0.5,-0.01,footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    #plt.xlabel(footnote,ha='center',fontsize=xlabel_txt_size,color='gray')
+    
+    # 自动倾斜横轴日期
+    fig.autofmt_xdate(ha="center")
+    
+    # 调整布局防止重叠
+    plt.tight_layout()        
+    plt.show()
+    
+    return
+
 #==============================================================================
 def plot_line2_twinx2(df01,ticker1,colname1,label1, \
                       df02,ticker2,colname2,label2, \

siat/valuation_china.py

@@ -205,20 +205,19 @@ if __name__ =="__main__":
 
 
 def valuation_china(start='MRY',end='today',indicator='pe', \
-                           method='lyr',value='value',statistic='median', \
-                           average_value=False,show_index=False, \
-                           power=0,twinx=False, \
+                    method='lyr',value='value',statistic='median', \
+                    average_value=False,show_index=False, \
+                    power=0,twinx=False, \
                                
-                               band_area='', \
-                               attention_value='',attention_value_area='', \
-                               attention_point='',attention_point_area='', \
+                    band_area='', \
+                    attention_value='',attention_value_area='', \
+                    attention_point='',attention_point_area='', \
                                
-                           annotate=False,annotate_value=False,plus_sign=True, \
-                           mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
+                    annotate=False,annotate_value=False,plus_sign=True, \
+                    mark_start=False,mark_top=False,mark_bottom=False,mark_end=False, \
                                
-                           loc1='upper left',loc2='lower right', \
-                           facecolor='whitesmoke', \
-                           maxticks=20):
+                    loc1='upper left',loc2='lower right', \
+                    facecolor='whitesmoke',maxticks=20):
     """
     ===========================================================================
     功能：比较中国全A股市场的估值指标变化趋势
@@ -440,7 +439,8 @@ def valuation_china(start='MRY',end='today',indicator='pe', \
                       mark_start=True,mark_top=True,mark_bottom=True,mark_end=mark_end, \
                       facecolor=facecolor,maxticks=maxticks)
     
-    elif twinx and len(list(df)) >= 2:
+    #elif twinx and len(list(df)) >= 2:
+    elif twinx != False and len(list(df)) >= 2:
         ticker1=ticker2=''
         colname1=label1=list(df)[0]; df1=df[[colname1]]
         colname2=label2=list(df)[1]; df2=df[[colname2]]
@@ -449,7 +449,8 @@ def valuation_china(start='MRY',end='today',indicator='pe', \
                    df2,ticker2,colname2,label2, \
                    ylabeltxt,titletxt,footnote, \
                    power=power,datatag1=False,datatag2=False,yscalemax=5, \
-                   zeroline=False,twinx=twinx, \
+                   zeroline=False, \
+                       twinx=twinx, \
                        yline=999,attention_value_area='', \
                        xline=999,attention_point_area='', \
                    resample_freq='H',loc1=loc1,loc2=loc2, \

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.8.30
+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.30.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
@@ -64,7 +64,7 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=MIaNkxxt_n9zoYafsidPhn9xdX0rwjKHbbsNMhkYj0Q,119901
+siat/grafix.py,sha256=Noy_gIwVGjktPgfUIx-KZQJ-pjtwR3o7iBI030m4wzs,139126
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=uWRtMMJqKr-puQn26g6Fq5N3mFB70c0B99zLQug8hAo,30774
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -140,12 +140,12 @@ siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,21
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=K7epQC_UtELjRR5cyjJp4gskSyJMxXy-jHIAS0SUEj8,51801
-siat/valuation_china.py,sha256=DURa9uplp7B9tgjWvEQVTRQPqFNpRGWnLdTXQHePrB0,83115
+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.30.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.8.30.dist-info/METADATA,sha256=VTBGp1ahs79HhChoP4vHnzBxdz2PAELL72yzNp4XYI0,8321
-siat-3.8.30.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.8.30.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.8.30.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,,