siat 3.2.20__py3-none-any.whl → 3.2.30__py3-none-any.whl

siat/allin.py

@@ -120,3 +120,6 @@ from siat.stock_technical import *
 # 2FA: Google Authenticator
 from siat.google_authenticator import *
 
+# 提问记录
+from siat.luchy_draw import *
+

siat/common.py

@@ -1620,7 +1620,7 @@ def print_progress_percent2(current,total_list,steps=5,leading_blanks=4):
             pct=pct_list[pos]
             
             if pct=="100%":
-                print("100% completing last job ...")
+                print("100% wrapping up ...")
             else:
                 print(pct,end=' ')
     
@@ -2182,10 +2182,27 @@ def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
         print("  #Error(descriptive_statistics2): zero data found")
         return
     
+    #为避免nan的影响，对nan进行填充
+    df.fillna(method='bfill',inplace=True)
+    df.fillna(method='ffill',inplace=True)
+    
+    #转换字符为数值
+    import pandas as pd
+    for c in list(df):
+        try:
+            df[c] = pd.to_numeric(df[c], errors='coerce')
+        except:
+            continue
+    
+    dfn=df.select_dtypes(include='number')
+    if dfn.empty:
+        print("  #Error(descriptive_statistics2): no numeric columns found to describe")
+        return
+    
     # 计算短期趋势
     df20=df.tail(trailing)
 
-    ds=df.describe(include='all',percentiles=[.5])
+    ds=df.describe(include='number',percentiles=[.5])
     dst=ds.T   
     cols=['min','max','50%','mean','std']
     
@@ -2952,6 +2969,10 @@ def df_preprocess(dfs,measure,axhline_label,x_label,y_label, \
     """
     功能：对于dfs中的数据进行预处理变换，以便克服数量级压制现象更好地展现多条曲线的趋势
     """
+    #填充空值，防止后续处理出错
+    dfs.fillna(method='ffill') #使用前一个非NaN值填充（向下填充）
+    dfs.fillna(method='bfill') #使用下一个非NaN值填充（向上填充）
+    
     plus_sign=False
     
     preprocess1=preprocess.lower()
@@ -2999,8 +3020,10 @@ def df_preprocess(dfs,measure,axhline_label,x_label,y_label, \
                     # 从头寻找第一个非空数值
                     import numpy as np
                     for n in range(0,len(dfs2)):
-                        if np.isnan(dfs2[c][n]): 
-                            continue
+                        try:
+                            checknan=np.isnan(dfs2[c][n])
+                        except: continue
+                        if checknan: continue
                         else:
                             cmean=dfs2[c][n] #使用第一个非空值
                             break
@@ -3011,8 +3034,9 @@ def df_preprocess(dfs,measure,axhline_label,x_label,y_label, \
                         scalingOptionText=text_lang('百分比','percentage') 
                     else:
                         scalingOptionText=text_lang('变化率%','change%')
-                    
-                meanlist=meanlist+[cmean]
+                try:
+                    meanlist=meanlist+[cmean]
+                except: continue
             
             #print(cmean,cstd,dfs2[c])
 
@@ -3765,7 +3789,8 @@ if __name__=='__main__':
     upgrade_siat()
 
 def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
-                 'yfinance','yahooquery','urllib3','tabulate','twine','mplfinance','openpyxl'], \
+                 'yfinance','yahooquery','urllib3','tabulate','twine', \
+                 'mplfinance','openpyxl','pip'], \
                  pipcmd="pip install --upgrade",alternative=""):
     """
     功能：一次性升级siat及其相关插件

siat/grafix.py

@@ -1390,20 +1390,35 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     collist=df.columns.values.tolist()  
     collist3=collist[:3] #专用于绘制布林带，取前3个字段
     
+    if lslist==[]:
+        lslist=['-','--','-.',':','-','--','-.',':','-','--','-.',':','-','--','-.',':',]
+    if colorlist==[]:
+        colorlist=['blue','tomato','green','chocolate','darksage','cyan','blueviolet','violet','darkcyan','gold','wheat','silver','darkred','brown','coral','pink',]
+        
     #绘制折线图    
     for c in collist:
         pos=collist.index(c)
         try:
             lcolor=colorlist[pos]
+        except:
+            lcolor=''
+        try:
             lls=lslist[pos]
+        except:
+            lls=''
+        try:
             llw=lwlist[pos]
         except:
-            lwadjust=linewidth_adjust(df)
-            plt.plot(df[c],label=c,linewidth=lwadjust)
-            lines = plt.gca().lines; last_line_color = lines[-1].get_color()
-        else:
+            llw=linewidth_adjust(df)
+        
+        if (lcolor !='') and (lls !=''):
             plt.plot(df[c],label=c,linewidth=llw,ls=lls,color=lcolor)
-            lines = plt.gca().lines; last_line_color = lines[-1].get_color()
+        elif (lcolor !=''):
+            plt.plot(df[c],label=c,linewidth=llw,color=lcolor)
+        else:
+            plt.plot(df[c],label=c,linewidth=llw)
+            
+        lines = plt.gca().lines; last_line_color = lines[-1].get_color()
         
         #为折线加数据标签
         if data_label==True:
@@ -1474,8 +1489,27 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
         
     #绘制带状区域
     if band_area != '' and isinstance(band_area,list) and len(band_area)>=2:
-       plt.fill_between(df.index,df[band_area[0]],df[band_area[1]],alpha=0.5,label='') 
-    
+        upper_line=band_area[0]; lower_line=band_area[1]
+        if upper_line not in collist:
+            upper_line=ectranslate(upper_line)
+            lower_line=ectranslate(lower_line)
+            
+            if upper_line not in collist:
+                upper_line=ticker_name(upper_line)
+                lower_line=ticker_name(lower_line)
+                
+                if upper_line not in collist:
+                    upper_line=None
+                    lower_line=None
+                
+        if not (upper_line is None) and not (lower_line is None):
+            """
+            plt.fill_between(df.index,df[upper_line],df[lower_line],color='moccasin',alpha=0.5,label='',where=df[upper_line]>=df[lower_line])
+            plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='',where=df[upper_line]<=df[lower_line])
+            """
+            plt.fill_between(df.index,df[upper_line],df[lower_line],color='aquamarine',alpha=0.5,label='')
+            
+            
     #绘制水平辅助线
     if axhline_label !="":
         if "零线" in axhline_label:

siat/luchy_draw.py

@@ -0,0 +1,252 @@
+# -*- coding: utf-8 -*-
+
+"""
+本模块功能：幸运抽奖，仅限课堂案例演示用
+创建日期：2024年6月29日
+最新修订日期：
+作者：王德宏 (WANG Dehong, Peter)
+作者单位：北京外国语大学国际商学院
+用途限制：仅限研究与教学使用，不可商用！商用需要额外授权。
+特别声明：作者不对使用本工具进行证券投资导致的任何损益负责！
+"""
+
+#==============================================================================
+#关闭所有警告
+import warnings; warnings.filterwarnings('ignore')
+import warnings; warnings.filterwarnings('ignore')
+
+import pandas as pd
+import pickle
+import random
+import datetime
+import time
+ 
+#==============================================================================
+if __name__=='__main__':
+    text="A B C"
+    text_color='red'
+    text_size=12
+    delay=1
+    
+    typewriter(text,text_color='red',text_size=12,delay=1)        
+
+def typewriter(text,text_color='blue',text_size=12,delay=1):
+    from IPython.display import display_html
+    
+    text_html="<center><font size="+str(text_size)+" color="+text_color+">"+text
+    display_html(text_html, raw=True)
+
+    return
+
+#==============================================================================
+
+def pickle_write(df,pickle_path):
+    with open(pickle_path, 'wb') as pickle_file:
+        # 使用pickle模块的dump函数写入对象
+        pickle.dump(df,pickle_file)     
+
+if __name__=='__main__':
+    file_path="S:\北外工作-24春\小学期-人大\学生名单\student_list.xlsx"
+    pickle_path="student_list.pkl"
+    skiprows=1
+    column='Name'
+    
+    namelist_get(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl")
+    
+def lucky_draw_initialize(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl"):
+    """
+    功能：读入带有指定路径的Excel文件file_path，跳过前skiprows行
+    Excel文件结构：抽奖名单字段为'Name'，字段位于第2行
+    输出：存入pickle文件student_list.pkl
+    """
+    
+    df = pd.read_excel(file_path,skiprows=skiprows)  
+    
+    df1=df[[column]].copy()  
+    
+    todaydt = str(datetime.date.today())
+    df1['Date']=todaydt
+    df1['Lucky']=0
+    df1['Absent']=0
+    df1['Answer']=0
+    
+    #排序
+    df1.sort_values(by=[column,'Date','Lucky','Absent','Answer'],inplace=True)
+    df1.reset_index(drop=True,inplace=True)
+    
+    pickle_write(df1,pickle_path)
+    
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    pickle_path="student_list.pkl"
+    
+    df=pickle_read(pickle_path)
+
+def pickle_read(pickle_path="student_list.pkl"):   
+    with open(pickle_path,'rb') as pickle_file:
+        df = pickle.load(pickle_file)
+    return df
+
+#==============================================================================
+
+
+
+def pickle_append(df,column='Name',pickle_path="student_list.pkl"):
+    df_tmp=pickle_read(pickle_path)
+    df_new=pd.concat([df_tmp,df])
+    
+    df_new.sort_values(by=[column,'Date'],inplace=True)
+    
+    pickle_write(df_new,pickle_path)
+    
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    alist=["A","B","C","D"]
+    
+    for i in range(4):
+        print(random_select(alist))
+
+
+def random_select(alist):
+    return random.choice(alist)
+
+#==============================================================================
+
+if __name__=='__main__':
+    prompt="Is the lucky person here in class?"
+    
+    read_yes_no(prompt)
+
+    
+def read_yes_no(prompt, default=None):
+    if default is None:
+        prompt += " [yes/no] "
+    else:
+        prompt += " [yes/no] (default: %s) " % ('yes' if default else 'no')
+    while True:
+        user_input = input(prompt).lower()
+        if user_input in ['', 'yes', 'y', 'true']:
+            return True
+        elif user_input in ['no', 'n', 'false']:
+            return False
+        elif user_input == '' and default is not None:
+            return default
+        else:
+            print("Please enter 'yes' or 'no' (or 'y'/'n').")
+            
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    draw_limit=2
+    absent_limit=2
+    column='Name'
+    pickle_path="student_list.pkl"
+    
+    lucky_draw()
+    df=pickle_read(pickle_path)
+    
+
+def lucky_draw(draw_limit=2,absent_limit=2,column='Name',pickle_path="student_list.pkl"):
+    """
+    draw_limit=2：整个课程每人最多2次抽签机会
+    absent_limit=2：整个课程每人最多缺席2次，超过就丧失抽签资格
+    """
+    df=pickle_read(pickle_path)
+
+    alist=list(set(list(df[column])))    
+    
+    found=False
+    todaydt = str(datetime.date.today())
+    prompt="*** Is the lucky person here on site?"
+    prompt2="*** Do you expect to pass?"
+    
+    while True:
+        while True:
+            aname=random_select(alist)
+            
+            adf=df[df[column]==aname]
+            atimes=adf['Lucky'].sum()
+            aonsite=adf['Absent'].sum()
+            
+            if atimes < draw_limit and aonsite <= absent_limit:
+                #检查今日是否被抽中过
+                drew_today=False
+                try:
+                    adf_today=adf[adf['Date']==todaydt]
+                    if len(adf_today) > 0:
+                        if adf_today['Lucky'].sum() > 0 or adf_today['Absent'].sum() > 0:
+                            drew_today=True
+                except: pass
+                
+                if not drew_today:                    
+                    found=True
+                    break
+                else: continue
+            else:
+                continue
+
+        if not found:  
+            print("Congratulations! all person has been lucky for",limit,"times")
+        else:
+            """
+            print("\nThe lucky person is ",end='')
+            typewriter(aname,delay=1) 
+            """
+            typewriter(text=aname,text_color='blue',text_size=12,delay=1)
+            
+            #print('')
+            onsite=read_yes_no(prompt)
+            #是否到场
+            if onsite: absent=0
+            else: absent=1
+            
+            onpass=False; answer=0
+            if onsite:            
+                onpass=read_yes_no(prompt2)
+                #是否pass
+                if onpass: answer=0
+                else: answer=1 
+            
+            #只要抽中，不论是否到场都记录
+            row=pd.Series({column:aname,'Date':todaydt,'Lucky':1,'Absent':absent,'Answer':answer})
+            try:
+                df=df.append(row,ignore_index=True)        
+            except:
+                df=df._append(row,ignore_index=True)
+                            
+            if onsite and not onpass:
+                #到场且不pass，结束本轮抽签
+                break
+            else:
+                #未到场或pass，继续抽签
+                continue
+    
+    df.sort_values(by=[column,'Date'],inplace=True)
+    pickle_write(df,pickle_path)
+    
+    return
+
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================        
+
+
+
+
+
+
+
+    
+
+
+#==============================================================================#==============================================================================
+#==============================================================================#==============================================================================
+#==============================================================================#==============================================================================
+
+#==============================================================================

siat/market_china.py

@@ -904,6 +904,177 @@ def market_detail_china2table(df,titletxt,firstColSpecial=True,leftColAlign='l',
     return
     
 #==============================================================================
+#==============================================================================
+if __name__=='__main__':
+    category='price'
+    category='valuation'
+    
+    facecolor='papayawhip'
+    decimals=2
+    font_size='16px'
+    
+    df1=market_detail_china(category='price')
+    df1=market_detail_china(category='price')
+
+def market_detail_china2(category='price',
+                         facecolor='papayawhip',
+                         decimals=2,
+                         font_size='22px'):
+    """
+    功能：给出中国当前最新的三大股票交易所的更多细节，合成
+    输出：构造表格型数据框df，利用CSS格式输出
+    数据来源：em东方财富
+    """
+    #确定表格字体大小
+    titile_font_size=font_size
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-2)+'px'    
+
+    # 检查信息类别
+    category1=category.upper()
+    catelist=["PRICE","VOLUME","RETURN","VALUATION"]
+    catenamelist=["当前股价","当前成交量","近期投资回报","市值与估值"]
+    if not (category1 in catelist):
+        print("  #Error(market_detail_china2): invalid category",category)
+        print(" Valid category",catelist)
+        return None
+    
+    # 合并三大交易所
+    import pandas as pd
+    df=pd.DataFrame()
+    exchlist=["SSE","SZSE","BJSE"]
+    for e in exchlist:
+        dft=market_detail_exchange_china(exchange=e,category=category)
+        if dft is None:
+            print("  #Warning(market_detail_china): info inaccessible for",e,"\b, try later")
+            #return None
+            continue
+        if len(dft)==0:
+            print("  #Warning(market_detail_china): zero info found for",e,"\b, try later")
+            continue
+        
+        if len(df)==0:
+            df=dft
+        else:
+            df=pd.merge(df,dft,left_index=True,right_index=True)
+    
+    if len(df)==0:
+        print("  #Warning(market_detail_china2): zero info found for",exchlist,"\b, try later")
+        return None
+    
+    # 处理索引字段
+    newcollist=['项目']+list(df)
+    df['项目']=df.index
+    df=df[newcollist]    
+
+    # 将空缺值替换为空格
+    df.fillna('',inplace=True)    
+    
+    import datetime as dt
+    nowstr0=str(dt.datetime.now())
+    nowstr=nowstr0[:19]
+    
+    # 前置空格个数
+    heading=' '*1
+    
+    if category1=='PRICE':
+        titletxt="中国三大股票交易所横向对比：股价与涨跌"
+        
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注释：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆昨日指的是上一个交易日\n"
+        ft4=heading+"☆涨速：平均每分钟股价变化率，表示股价变化速度\n"
+        ft5=heading+"☆5分钟涨跌：最新5分钟内股价的涨跌幅度\n"
+        ft6=heading+"☆振幅：最高最低价差绝对值/昨收，表示股价变化活跃程度\n"
+        ft7=heading+"☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n"
+        ft8=heading+"☆涨跌额：最新价-昨收，表示相对昨日的变化金额\n"
+        
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非交易日或开市前后短期内统计，数据可能出现空缺\n"
+        
+        footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6+ft7+ft8+ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    if category1=='VOLUME':
+        titletxt="中国三大股票交易所横向对比：成交状况"
+
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆成交量：当前成交股数，表示交易活跃度\n"
+        ft4=heading+"☆成交额：当前开市后的累计成交金额\n"
+        ft5=heading+"☆换手率：成交量/流通股数，表示成交量占比\n"
+        ft6=heading+"☆量比：当前每分钟成交量/过去5个交易日均值，表示成交量变化\n"
+        
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        
+        footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6 + ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    if category1=='RETURN':
+        titletxt="中国三大股票交易所横向对比：投资回报"
+        
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆MRQ：最近一个季度的滚动数据\n"
+        ft4=heading+"☆YTD：今年以来的累计情况\n"
+        
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+
+        footnote=ft0+ft1+ft2+ft3+ft4 + ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    if category1=='VALUATION':
+        titletxt="中国三大股票交易所横向对比：市值与估值"
+        
+        ft0=heading+"信息来源：东方财富，统计时间:"+nowstr+"\n"
+        ft1=heading+"注：\n"
+        ft2=heading+"☆可交易股票数量：将随着股票停复牌情况变化\n"
+        ft3=heading+"☆市盈率：这里为动态市盈率，即市盈率TTM，过去12个月的连续变化\n"
+        ft4=heading+"☆市净率：这里为静态市净率\n"
+        ft5=heading+"☆标准差/均值=标准差(数值)/均值，提升可比性\n"
+       
+        ft9=heading+"☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n"
+        ft10=heading+"☆若在非开市时间或开市前后短期内统计，数据可能出现空缺\n"
+        
+        footnote=ft0+ft1+ft2+ft3+ft4+ft5 + ft9+ft10
+        
+        df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
+                           first_col_align='left',second_col_align='right', \
+                           last_col_align='right',other_col_align='right', \
+                           titile_font_size=titile_font_size, \
+                           heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)     
+        
+    
+    return df
+
+#==============================================================================
+
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/risk_adjusted_return2.py

@@ -699,17 +699,22 @@ if __name__=='__main__':
     ticker=["600519.SS","000858.SZ"]
     ticker={'Market':('US','^SPX','中概教培组合'),'EDU':0.7,'TAL':0.3}
     
-    start="2024-1-1"
-    end="2024-3-15"
-    rar='sharpe'
-    ret_type="Monthly Ret%"
-    RF=0.01759
-    regression_period=365
+    ticker=['601628.SS','601319.SS','601318.SS','00966.HK']
     
-    graph=True; axhline_value=0; axhline_label=''
-    printout=False; sortby='tpw_mean'; trailing=5; trend_threshhold=0.01
-    annotate=False
+    start="2023-6-27"
+    end="2024-6-27"
+    rar='sharpe'
+    RF=0.01692
+    printout=True
+    
+    ret_type="Annual Ret%"; regression_period=365
+    graph=True; loc1='best'
+    axhline_value=0; axhline_label=''
+    sortby='tpw_mean'; trailing=7; trend_threshhold=0.01
+    annotate=False; annotate_value=False
+    mark_top=False; mark_bottom=False; mark_end=False
     mktidx='auto'; source='auto'
+    style_print=True; ticker_type='auto';facecolor='whitesmoke'
     
     rars=compare_mticker_1rar(ticker=["600519.SS","000858.SZ"],start="2024-1-1",end="2024-6-16",rar='sharpe',printout=True)
 
@@ -719,7 +724,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                          axhline_value=0,axhline_label='', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
-                             mark_top=False,mark_bottom=False,mark_end=False, \
+                         mark_top=False,mark_bottom=False,mark_end=False, \
                          mktidx='auto',source='auto', \
                          style_print=True,ticker_type='auto',facecolor='whitesmoke'):
     """
@@ -781,6 +786,10 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
     
     #仅用于绘图和制表
     df1=df.copy()
+    #进行空缺值填充，以便绘图连续
+    df1.fillna(method='bfill',inplace=True)
+    df1.fillna(method='ffill',inplace=True)
+    
     for c in list(df1):
         if df1[c].max() > axhline_value and df1[c].min() < axhline_value:
             axhline_label='零线'   #显示零线，但不标注图例        
@@ -817,7 +826,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                    facecolor=facecolor,loc=loc1)
             
     #制表
-    recommenddf=pd.DataFrame()
+    #recommenddf=pd.DataFrame()
     if printout:
         if sortby=='tpw_mean':
             sortby_txt='按推荐标记+近期优先加权平均值降序排列'
@@ -837,8 +846,8 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         footnote7="近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星"
         footnotey=footnote6+'\n'+footnote7+'\n'+footnotex
         
-        #删除含有Nan的行，否则可能引起近期优先加权平均计算结果市场出现Nan
-        df1.dropna(inplace=True,axis=1)    
+        #不能简单删除含有Nan的行，否则导致清空df1，应该进行填充
+        #df1.dropna(inplace=True,axis=1)    
         recommenddf=descriptive_statistics2(df1,title_txt,footnotey,decimals=4, \
                                sortby=sortby,recommend_only=True,trailing=trailing, \
                                trend_threshhold=trend_threshhold, \