siat 3.2.53__py3-none-any.whl → 3.2.54__py3-none-any.whl

siat/beta_adjustment.py

@@ -991,7 +991,7 @@ def compare_mhamada(tickers,market_index="000001.SS"):
     
     import pandas as pd
     df=pd.DataFrame() 
-    print("Starting to retrive and calculate Hamada ratios, please wait ......")
+    print("Starting to retrieve and calculate Hamada ratios, please wait ......")
     for t in tickers:
         
         with HiddenPrints():

siat/capm_beta2.py

@@ -285,7 +285,7 @@ def compare_mticker_1beta(ticker,start,end, \
         RF=RF[0]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Starting to retrive and calculate capm beta, please wait ......")
+    print("  Starting to retrieve and calculate capm beta, please wait ......")
         
     #计算日历日regression_period对应的交易日数
     regtrddays=int(252 / 365 * regression_period)
@@ -406,7 +406,7 @@ def compare_1ticker_mRF(ticker,start,end, \
         RF=[RF]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Starting to retrive and calculate capm beta on different RF, please wait ......")
+    print("  Starting to retrieve and calculate capm beta on different RF, please wait ......")
         
     #计算日历日regression_period对应的交易日数
     regtrddays=int(252 / 365 * regression_period)
@@ -525,7 +525,7 @@ def compare_1ticker_mregression_period(ticker,start,end, \
         RF=RF[0]
     if isinstance(regression_period,int):
         regression_period=[regression_period]
-    print("  Starting to retrive and calculate capm beta on different regression period, please wait ......")
+    print("  Starting to retrieve and calculate capm beta on different regression period, please wait ......")
 
     #预处理ticker_type
     ticker_type=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)

siat/common.py

@@ -2445,7 +2445,7 @@ def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
                              "近期优先加权平均":text_lang("近期优先加权平均","RWA"), \
                              "期间趋势":text_lang("期间趋势","Periodic Trend"), \
                              "近期趋势":text_lang("近期趋势","Recent Trend"), \
-                             "推荐标记":text_lang("推荐标记","Recommend")},inplace=True)
+                             "推荐标记":text_lang("推荐标记","Recommendation")},inplace=True)
         
         df_display_CSS(dst6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                        titile_font_size=titile_font_size,heading_font_size=heading_font_size, \

siat/risk_adjusted_return.py

@@ -1250,7 +1250,7 @@ def compare_mrar(tickers,rar_name,start,end, \
     
     import pandas as pd
     df=pd.DataFrame() 
-    print("  Starting to retrive and calculate",rar_name,"ratio, please wait ......")
+    print("  Starting to retrieve and calculate",rar_name,"ratio, please wait ......")
     for t in tickers:
         
         pf={'Market':(market,market_index),t:1.0}

siat/risk_adjusted_return2.py

@@ -598,7 +598,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
         regression_period=regression_period[0]
     
     tname=ticker_name(ticker,ticker_type)
-    print("  Starting to retrive and calculate different rar for",tname,"\b, please wait ......\n")
+    print("  Starting to retrieve and calculate different rar for",tname,"\b, please wait ......\n")
 
     #预处理ticker_type
     ticker_type=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)
@@ -679,10 +679,10 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
             sortby_txt=text_lang('按推荐标记+短期均值走势降序排列',"by Recommend + Recent Trend, Descending")
         
         #title_txt='***** 风险调整收益评估：'+tname+'，'+sortby_txt+' *****'
-        title_txt=text_lang('风险调整收益评估：基于',"RAR Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
+        title_txt=text_lang('风险调整收益评估：基于',"Risk-adjusted Return Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
         
-        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent uses ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " trading days. Trend change threshhold ")+str(trend_threshhold)
-        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recent trend rated by multiple factors, Recommend max 5 stars. RWA=Recent Weighted Average")        
+        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent = ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " days. Trend threshhold ")+str(trend_threshold)
+        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recommend max 5 stars. RWA = Recent Weighted Average")        
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         recommenddf=descriptive_statistics2(df1,title_txt,footnotey,decimals=4, \
@@ -749,7 +749,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         RF=RF[0]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Starting to retrive and calculate",rar,"\b, please wait ......\n")
+    print("  Starting to retrieve and calculate",rar,"\b, please wait ......\n")
     
     #预处理ticker_type
     ticker_type_list=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)
@@ -792,8 +792,16 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
             axhline_label='零线'   #显示零线，但不标注图例        
         #df1.rename(columns={c:ticker_name(c)},inplace=True)
     
-    #共同脚注    
-    footnote1=text_lang("注：","Notes: ")+ectranslate(rar)+text_lang("基于"," is based on ")+ectranslate(ret_type)+text_lang("。",", ")
+    #共同脚注   
+    rar_text=ectranslate(rar)
+    if check_language()=="English":
+        if rar != "alpha":
+            rar_text=rar_text.title()+" Ratio"
+        else:
+            #rar_text=rar_text.title()
+            rar_text="Jensen Alpha"
+    
+    footnote1=text_lang("注：","")+rar_text.capitalize()+text_lang("基于"," is based on ")+ectranslate(ret_type)+text_lang("。",", ")
     if RF !=0:
         footnote2=text_lang("年化无风险利率","annual RF = ")+str(round(RF*100,4))+text_lang('%。','%')
     else:
@@ -801,7 +809,15 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         
     footnote3=''
     if rar.lower() in ['treynor','alpha']:
-        footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
+        mktidx_text=''
+        if mktidx != 'auto':
+            mktidx_text=ticker_name(mktidx)
+            
+        if mktidx != 'auto':
+            footnote3=text_lang("CAPM回归期间","\nCAPM regression period ")+str(regression_period)+text_lang("个自然日，"," days, ")+ \
+                text_lang("市场指数基于","using ")+mktidx_text
+        else:
+            footnote3=text_lang("CAPM回归期间","\nCAPM regression period ")+str(regression_period)+text_lang("个自然日"," days")
     
     import datetime; todaydt = datetime.date.today()
     footnote4=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)
@@ -812,8 +828,9 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
 
     #绘图
     if graph:
-        title_txt=text_lang("风险调整收益：","Risk-adjusted Return: ")+ectranslate(rar)
-        y_label=ectranslate(rar)
+                
+        title_txt=text_lang("风险调整收益：","Risk-adjusted Return: ")+rar_text
+        y_label=rar_text
 
         draw_lines(df1,y_label,x_label=footnotex, \
                    axhline_value=axhline_value,axhline_label=axhline_label, \
@@ -837,10 +854,10 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
             sortby_txt=text_lang('按推荐标记+短期均值走势降序排列',"by Recommend + Recent Trend, Descending")
         
         #title_txt='***** 风险调整收益评估：基于'+ectranslate(rar)+'，'+sortby_txt+' *****'
-        title_txt=text_lang('风险调整收益评估：基于',"RAR Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
+        title_txt=text_lang('风险调整收益评估：基于',"Risk-adjusted Return Evaluation: Based on ")+rar_text+text_lang('，',', ')+sortby_txt
         
-        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent uses ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " trading days. Trend change threshhold ")+str(trend_threshhold)
-        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recent trend rated by multiple factors, Recommend max 5 stars. RWA=Recent Weighted Average")
+        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent = ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " days. Trend threshhold ")+str(trend_threshhold)
+        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recommend max 5 stars. RWA = Recent Weighted Average")
         footnotey=footnote6+'\n'+footnote7+'\n'+footnotex
         
         #不能简单删除含有Nan的行，否则导致清空df1，应该进行填充
@@ -934,15 +951,15 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
         pd.set_option('display.width', 180) #设置打印宽度(**重要**)
 
         if sortby=='tpw_mean':
-            sortby_txt='近期优先加权平均值优先'
+            sortby_txt=text_lang('按推荐标记+近期优先加权平均值降序排列',"by Recommend + RWA, Descending")
         elif sortby=='min':
-            sortby_txt='最小值优先'
+            sortby_txt=text_lang('按推荐标记+最小值降序排列',"by Recommend + Min, Descending")
         elif sortby=='mean':
-            sortby_txt='平均值优先'
+            sortby_txt=text_lang('按推荐标记+平均值降序排列',"by Recommend + Mean, Descending")
         elif sortby=='median':
-            sortby_txt='中位数值优先'
+            sortby_txt=text_lang('按推荐标记+中位数值降序排列',"by Recommend + Median, Descending")
         elif sortby=='trailing':
-            sortby_txt='短期均值走势优先'
+            sortby_txt=text_lang('按推荐标记+短期均值走势降序排列',"by Recommend + Recent Trend, Descending")
         
         df1=df.copy()
         df1.reset_index(drop=True,inplace=True)
@@ -950,7 +967,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
         
         # 处理表格标题
         #titletxt='===风险调整收益综合对比：'+sortby_txt+'==='
-        titletxt='风险调整收益综合对比：'+sortby_txt
+        titletxt=text_lang('风险调整收益综合对比：',"Risk-adjusted Return Overall Evaluation: ")+sortby_txt
         """
         #print("\n"+titletxt)
         df2=df1.style.set_caption(titletxt).set_table_styles(
@@ -1020,18 +1037,18 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
         """
         
         #脚注
-        footnote1="风险调整收益基于"+ectranslate(ret_type)+"，"
+        footnote1=text_lang("风险调整收益基于","Based on ")+ectranslate(ret_type)+text_lang("，",', ')
         if RF !=0:
-            footnote2="年化无风险利率"+str(round(RF*100,4))+'%'
+            footnote2=text_lang("年化无风险利率","annual RF = ")+str(round(RF*100,4))+'%'
         else:
-            footnote2=text_lang("假设年化无风险利率为零","Assume annual RF = 0")
+            footnote2=text_lang("假设年化无风险利率为零","assuming annual RF = 0")
             
         footnote3=''
         if 'treynor' in rar or 'alpha' in rar:
             if mktidx=='auto':
                 mktidx=get_market_index_code(ticker[0] if isinstance(ticker,list) else ticker)
             mktidx_name=ticker_name(mktidx)
-            footnote3="贝塔系数基于"+mktidx_name+"，回归期间"+str(regression_period)+"个自然日"
+            footnote3=text_lang("CAPM基于","CAPM based on ")+mktidx_name+text_lang("，回归期间",", regression in ")+str(regression_period)+text_lang("个自然日"," days")
         
         import datetime; todaydt = datetime.date.today()
         footnote4=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)+text_lang("统计",'')
@@ -1042,8 +1059,12 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
     
         #print("\n"+footnotex)
         #print(footnotex)
-        
-        df_display_CSS(df1,titletxt=titletxt,footnote=footnotex,decimals=4)
+        if check_language()=="English":
+            df1.rename(columns={"比较对象":"Securities","sharpe":"Sharpe Ratio","sortino":"Sortino Ratio","alpha":"Jensen Alpha","treynor":"Treynor Ratio","综合推荐":"Overall Recommendation"},inplace=True)
+            
+        df_display_CSS(df1,titletxt=titletxt,footnote=footnotex,decimals=4, \
+                       first_col_align='left',second_col_align='center', \
+                       last_col_align='center',other_col_align='center')
  
     return df
 
@@ -1100,7 +1121,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
         RF=RF[0]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Starting to retrive and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different types of return, please wait ......\n")
+    print("  Starting to retrieve and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different types of return, please wait ......\n")
         
     df=pd.DataFrame() 
     for t in ret_type:
@@ -1178,10 +1199,10 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
             sortby_txt=text_lang('按推荐标记+短期均值走势降序排列',"by Recommend + Recent Trend, Descending")
         
         #title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
-        title_txt=text_lang('风险调整收益评估：基于',"RAR Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
+        title_txt=text_lang('风险调整收益评估：基于',"Risk-adjusted Return Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
         
-        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent means ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " trading days. Trend change threshhold is ")+str(trend_threshhold)
-        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recent trend is rated by multiple factors, Recommend max 5 stars. RWA=Recent Weighted Average")        
+        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent = ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " days. Trend threshhold ")+str(trend_threshhold)
+        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recommend max 5 stars. RWA = Recent Weighted Average")        
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         #删除含有Nan的行
@@ -1247,7 +1268,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
         RF=[RF]
     if isinstance(regression_period,list):
         regression_period=regression_period[0]
-    print("  Starting to retrive and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different RF, please wait ......\n")
+    print("  Starting to retrieve and calculate",rar,"for",ticker_name(ticker,ticker_type),"on different RF, please wait ......\n")
         
     df=pd.DataFrame() 
     for t in RF:
@@ -1280,7 +1301,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
         #df1.rename(columns={c:"基于无风险利率"+c},inplace=True)
         
     #共同脚注    
-    footnote1=text_lang("注：","Notes: ")+ectranslate(rar)+text_lang("基于"," is based on ")+ectranslate(ret_type)+'。'
+    footnote1=text_lang("注：","")+ectranslate(rar)+text_lang("基于"," is based on ")+ectranslate(ret_type)+'。'
     footnote2=""
         
     footnote3=""
@@ -1322,10 +1343,10 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
             sortby_txt=text_lang('按推荐标记+短期均值走势降序排列',"by Recommend + Recent Trend, Descending")
         
         #title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
-        title_txt=text_lang('风险调整收益评估：基于',"RAR Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
+        title_txt=text_lang('风险调整收益评估：基于',"Risk-adjusted Return Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
         
-        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent uses ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " trading days. Trend change threshhold ")+str(trend_threshhold)
-        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recent trend rated by multiple factors, Recommend max 5 stars. RWA=Recent Weighted Average")        
+        footnote6=text_lang('期间为',"Period: ")+str(start)+text_lang('至'," to ")+str(end)+text_lang("；近期指近","; Recent = ")+str(trailing)+text_lang("个交易日。趋势变化率阈值：", " days. Trend threshhold ")+str(trend_threshhold)
+        footnote7=text_lang("近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星","Recommend max 5 stars. RWA = Recent Weighted Average")        
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         #删除含有Nan的行

siat/stock_technical.py

@@ -1193,31 +1193,40 @@ def stock_MACD(ticker,start='default',end='default', \
 #==============================================================================
 #==============================================================================
 #==============================================================================
+if __name__ =="__main__":
+    talib_install_method()
+
+ 
+def is_64bit_os():
+    import platform
+    if platform.machine().endswith('64'):
+        bits='64'
+    else:
+        bits='32'
+        
+    return bits+'-bit'
 
 def talib_install_method():
     """
     功能：提示必需的talib安装方法
     """
-    print("  Installation method 1: pip install TA_Lib")
-    print("    Note: method 1 is subject to fail")
-    print("  Installation method 2: conda install -c quantopian ta-lib")
-    print("    Note: method 2 may need scientific internet access")
-    print("  Installation method 3: recommended")
-    print("    Step1. Goto website https://www.lfd.uci.edu/~gohlke/pythonlibs/")
-    print("    Step2. On the web page, search for TA_lib")
-    print("    Step3. Select the file suitable for the Python version and OS 32/64")
-    print("      Your Python version:",check_python_version(),"\b, your operating system:",check_os())
-    
-    print("    Step4. Download the file")
-    print("    Step5. pip install <downloaded file name>")
-    print("    Note: method 3 is troublesome, but more likely successful")
+    print("  Warning: the classical method may not work properly:")
+    print("    pip install TA-Lib\n")
+    print("  Installation method: for Windows")
+    print("    Step1. Check your Python version and your OS")
+    print("      Your Python version:",check_python_version(),"\b, your OS:",is_64bit_os(),check_os())
     
-    print("  How to check the Python version in your computer? ")
-    print("    python --version")
-    print("  How to check the win32/win_amd64 in your computer? ")
-    print("    On Windows, right click Start, click System")
+    print("    Step2. Search TA_lib whl file for your OS and Python version")
+    print("      e.g. Find the one free of charge from CSDN, ... ...\n")
+    print("    Step3. Download the file to a local folder in your computer")
+    print("    Step4. Directly install the .whl file from the local folder by:")
+    print("      pip install ta_lib_whl_file_name")
+
+    print("\n  Installation method: for Mac, not tested for M chip")
+    print("    Step1. brew install ta-lib")
+    print("    Step2. pip install ta-lib")
     
-    print("  Important: after installing ta-lib, restart Python environment.")
+    print("\n  Important: after installing ta-lib, RESTART your Jupyter.")
     
     return
 #==============================================================================
@@ -1375,11 +1384,11 @@ def stock_RSI(ticker,start='default',end='default', \
         
         # 绘制曲线
         if ('RSI1' in graph) or ('ALL' in graph):
-            ax.plot(df4['RSI1'],label=text_lang('快速(周)线RSI1','RSI1(1 week, Fast line)'),linewidth=linewidth*2,color='orange')
+            ax.plot(df4['RSI1'],label=text_lang('快速线RSI1','RSI1(Fast line)'),linewidth=linewidth*2,color='orange')
         if ('RSI2' in graph) or ('ALL' in graph):
-            ax.plot(df4['RSI2'],label=text_lang('中速(双周)线RSI2','RSI2(2 weeks, Mid line)'),linewidth=linewidth*2,color='purple')
+            ax.plot(df4['RSI2'],label=text_lang('中速线RSI2','RSI2(Mid line)'),linewidth=linewidth*2,color='purple')
         if ('RSI3' in graph) or ('ALL' in graph):
-            ax.plot(df4['RSI3'],label=text_lang('慢速(月)线RSI3','RSI3(1 month, Slow line)'),linewidth=linewidth*2,color='white')
+            ax.plot(df4['RSI3'],label=text_lang('慢速线RSI3','RSI3(Slow line)'),linewidth=linewidth*2,color='white')
         
         # 绘制水平辅助线
         #hl_linestyle_list=['dashed','-.','dotted']
@@ -1645,11 +1654,11 @@ def stock_KDJ(ticker,start='default',end='default', \
         
         # 绘制曲线
         if ('K' in graph) or ('ALL' in graph):
-            ax.plot(df4['K'],label=text_lang('快速线K','K line(Fast)'),linewidth=linewidth*2,color='orange')
+            ax.plot(df4['K'],label=text_lang('快速线K','K(Fast line)'),linewidth=linewidth*2,color='orange')
         if ('D' in graph) or ('ALL' in graph):
-            ax.plot(df4['D'],label=text_lang('慢速线D','D line(Slow)'),linewidth=linewidth*2,color='green')
+            ax.plot(df4['D'],label=text_lang('慢速线D','D(Slow line)'),linewidth=linewidth*2,color='green')
         if ('J' in graph) or ('ALL' in graph):
-            ax.plot(df4['J'],label=text_lang('超快确认线J','J line(Faster, confirm)'),linewidth=linewidth*2,color='purple')
+            ax.plot(df4['J'],label=text_lang('超快线J','J(Faster line)'),linewidth=linewidth*2,color='purple')
         
         # 绘制水平辅助线: 某些情况下不绘制，以便展现KDJ线细节
         maxK=df4['K'].max()

{siat-3.2.53.dist-info → siat-3.2.54.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,74
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
 siat/assets_liquidity_test.py,sha256=UWk6HIUlizU7LQZ890fGx8LwU1jMMrIZswg8cFUJWZ8,1285
 siat/barrons_scraping_test.py,sha256=jSRVPxyYylcgG3fAsuqE-9WH3sDfJ3CdZUcU8VBVdoU,10110
-siat/beta_adjustment.py,sha256=LZWrEWP-yw7spQjeSldLXpmZu7pFqF5jR3EHym7wNys,37286
+siat/beta_adjustment.py,sha256=viJJE9O82SbA_VYuJtrs3HT0OWYhk4yvmoywskrAhaI,37287
 siat/beta_adjustment_china.py,sha256=QAVhTQxfV7NSakNPMfQtGMeRzEHVBC8JZQTqD5Owp2I,20802
 siat/beta_adjustment_test.py,sha256=nBhvQQfqxooCHjy5hL0a8V0ZC58BjuCZVFpqpWpHeF0,2467
 siat/blockchain.py,sha256=awF3GDtlwaJhku0a2kLuXOS8d3IzkjR_RyzlZWvD3L4,6032
@@ -15,10 +15,10 @@ siat/bond_china.py,sha256=eYv-nMoWSS5fZ4VxnuJ29QFY9GUS6meGiIc0Xjm1fQI,3038
 siat/bond_test.py,sha256=yUOFw7ddGU-kb1rJdnsjkJWziDNgUR7OLDA7F7Ub91A,5246
 siat/bond_zh_sina.py,sha256=26BohGcS120utwqg9dJvdGm5OkuNpNu5bco80uOuQpU,4423
 siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
-siat/capm_beta2.py,sha256=07y3q4nJdkM-anpZepj4gK0gvTKj-BB0ppDDI5-TCcY,26904
+siat/capm_beta2.py,sha256=d7lZ-VXVVmBkMVGDPlozL-9gAU3cYpHG23X1WSRCOgY,26907
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=493MZpsrKnb_RP1myq_uHj0wCdqvDk0kiRBzNF-syQI,151521
+siat/common.py,sha256=ZRf7eq9trFmOSG_JQfWjcpSxn7B6ShB8bQ-kHi1qu9g,151526
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -87,8 +87,8 @@ siat/option_pricing_test.py,sha256=eeorV5Ja5vjlRXnP6fWJHetGU5Vb8SnLopkC6RV3GfA,2
 siat/option_sina_api_test.py,sha256=dn-k_wrQnAaNKHoROvWJEc7lqlU0bwiV2Aa4usWAFGM,5908
 siat/proxy_test.py,sha256=erQJrmGs2X46z8Gb1h-7GYQ0rTUcaR8dxHExWoBz2eM,2610
 siat/quandl_test.py,sha256=EcPoXnLuqzPl5dKyVEZi3j3PJZFpsnU_iNPhLWC9p-A,1552
-siat/risk_adjusted_return.py,sha256=dWVrCDnoxvMmI6cVtrL_FC18QZFrGb6-k9lOoyy5JGE,55085
-siat/risk_adjusted_return2.py,sha256=AkpxKIYv3LL1mvb6Lha4z0sevinsLLmb-ttwiJGHNO0,69083
+siat/risk_adjusted_return.py,sha256=oRUOagpQlGB56R1xIHZoYwAi42RqcZl0R-JCVBCKVe0,55086
+siat/risk_adjusted_return2.py,sha256=_ZJvinGmURdT37vgEtpd0DJIAI23HlC02oEmv_By4mA,70523
 siat/risk_adjusted_return_test.py,sha256=m_VHL5AtT74cJv5i7taTeTfnkX48y0AFJk5phawyYWg,3416
 siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
@@ -117,7 +117,7 @@ siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
 siat/stock_technical-20240620.py,sha256=A4x18mZgYSA8SSiDz4u_O3gd5oVRgbI6JIiBfFY0tVw,116013
-siat/stock_technical.py,sha256=X0AqtpCih62-4ff8AnsNGEvDUVoo-sY5hTb3igc5yuE,134230
+siat/stock_technical.py,sha256=1pdhk0FwiQ5v252EckmQMlr2RJQIgR3wDtaSeliDyxY,134192
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -138,7 +138,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 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-3.2.53.dist-info/METADATA,sha256=CRsgADyYbTDreJlYNKtVB0p0uZdkKN603MoUoWPCwZo,7310
-siat-3.2.53.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.53.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.53.dist-info/RECORD,,
+siat-3.2.54.dist-info/METADATA,sha256=12BBbiCRE7mttmx2Cngyy3M7MxRteZFv43vWg6y0B3c,7310
+siat-3.2.54.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.54.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.54.dist-info/RECORD,,