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

siat/common.py

@@ -2436,6 +2436,17 @@ def descriptive_statistics2(df,titletxt,footnote,decimals=4,sortby='tpw_mean', \
         titile_font_size=font_size
         heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
         
+        dst6.rename(columns={"比较对象":text_lang("比较对象","Securities"), \
+                             "最小值":text_lang("最小值","Minimum"), \
+                             "最大值":text_lang("最大值","Maximum"), \
+                             "中位数":text_lang("中位数","Median"), \
+                             "平均值":text_lang("平均值","Mean"), \
+                             "标准差":text_lang("标准差","Std Dev"), \
+                             "近期优先加权平均":text_lang("近期优先加权平均","RWA"), \
+                             "期间趋势":text_lang("期间趋势","Periodic Trend"), \
+                             "近期趋势":text_lang("近期趋势","Recent Trend"), \
+                             "推荐标记":text_lang("推荐标记","Recommend")},inplace=True)
+        
         df_display_CSS(dst6,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                        titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                            data_font_size=data_font_size)

siat/luchy_draw.py

@@ -195,7 +195,7 @@ def lucky_draw_header_modify(course,file_path="current",pickle_path="current", \
                 'skiprows':skiprows,'column':column,'draw_limit':draw_limit, \
                 'absent_limit':absent_limit,'pass_limit':pass_limit}  
         
-    pickle_write(header_dict,pickle_path,overlap_confirm=False)
+    pickle_write(header_dict,header_path,overlap_confirm=False)
     print(header_path,"is modified in",cur_dir)
     
     return
@@ -282,7 +282,7 @@ def lucky_draw_detail_add(course,name):
 
     #写回明细文件
     if added:
-        pickle_write(df,header_dict['pickle_path'],overlap_confirm=False)
+        pickle_write(df,detail_path,overlap_confirm=False)
         
     return
 
@@ -326,7 +326,7 @@ def lucky_draw_detail_remove(course,name):
     
     #写回明细文件
     if found:
-        pickle_write(df,header_dict['pickle_path'],overlap_confirm=False)
+        pickle_write(df,detail_path,overlap_confirm=False)
         
     return
 

siat/risk_adjusted_return2.py

@@ -635,7 +635,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
     
     footnote1="注：基于"+ectranslate(ret_type)+"，"
     if RF !=0:
-        footnote2="年化无风险利率为"+str(round(RF*100,4))+'%。'
+        footnote2="年化无风险利率为"+str(round(RF*100,4))+text_lang('%。','%')
     else:
         footnote2="不考虑年化无风险利率时。"
 
@@ -644,7 +644,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
         footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
-    footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
+    footnote4=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)
     if footnote3 !='':
         footnotex=footnote1+footnote2+footnote3+'\n'+footnote4
     else:
@@ -654,8 +654,8 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
     if graph:
         y_label=''
         import datetime; todaydt = datetime.date.today()
-        x_label="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)
-        title_txt="风险调整收益："+tname
+        x_label=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)
+        title_txt=text_lang("风险调整收益：","Risk-adjusted Return: ")+tname
 
         draw_lines(df1,y_label,x_label=footnotex, \
                    axhline_value=axhline_value,axhline_label=axhline_label, \
@@ -667,25 +667,22 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
     #制表
     recommenddf=pd.DataFrame()
     if printout:
-        #删除含有Nan的行
-        df1.dropna(inplace=True)    
-        
         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")
         
         #title_txt='***** 风险调整收益评估：'+tname+'，'+sortby_txt+' *****'
-        title_txt='风险调整收益评估：'+tname+'，'+sortby_txt
+        title_txt=text_lang('风险调整收益评估：基于',"RAR Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
         
-        footnote6='期间：'+str(start)+'至'+str(end)+"；近期指近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)+"。"
-        footnote7="近期优先趋势和星号为多项因素综合研判，最多五颗星"
+        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")        
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         recommenddf=descriptive_statistics2(df1,title_txt,footnotey,decimals=4, \
@@ -796,18 +793,18 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         #df1.rename(columns={c:ticker_name(c)},inplace=True)
     
     #共同脚注    
-    footnote1=ectranslate(rar)+"基于"+ectranslate(ret_type)+"。"
+    footnote1=text_lang("注：","Notes: ")+ectranslate(rar)+text_lang("基于"," is 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))+text_lang('%。','%')
     else:
-        footnote2="假设年化无风险利率为零。"
+        footnote2=text_lang("假设年化无风险利率为零。","assuming annual RF = 0.")
         
     footnote3=''
     if rar.lower() in ['treynor','alpha']:
         footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
-    footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
+    footnote4=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)
     if footnote3 !='':
         footnotex=footnote1+footnote2+footnote3+'\n'+footnote4
     else:
@@ -815,7 +812,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
 
     #绘图
     if graph:
-        title_txt="风险调整收益："+ectranslate(rar)
+        title_txt=text_lang("风险调整收益：","Risk-adjusted Return: ")+ectranslate(rar)
         y_label=ectranslate(rar)
 
         draw_lines(df1,y_label,x_label=footnotex, \
@@ -826,24 +823,24 @@ 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='按推荐标记+近期优先加权平均值降序排列'
+            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")
         
         #title_txt='***** 风险调整收益评估：基于'+ectranslate(rar)+'，'+sortby_txt+' *****'
-        title_txt='风险调整收益评估：基于'+ectranslate(rar)+'，'+sortby_txt
+        title_txt=text_lang('风险调整收益评估：基于',"RAR Evaluation: Based on ")+ectranslate(rar)+text_lang('，',', ')+sortby_txt
         
-        footnote6='期间为'+str(start)+'至'+str(end)+"；近期指近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)
-        footnote7="近期优先趋势和星号为风险调整收益指标加趋势等多项因素综合研判，最多五颗星"
+        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")
         footnotey=footnote6+'\n'+footnote7+'\n'+footnotex
         
         #不能简单删除含有Nan的行，否则导致清空df1，应该进行填充
@@ -1027,7 +1024,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
         if RF !=0:
             footnote2="年化无风险利率"+str(round(RF*100,4))+'%'
         else:
-            footnote2="假设年化无风险利率为零"
+            footnote2=text_lang("假设年化无风险利率为零","Assume annual RF = 0")
             
         footnote3=''
         if 'treynor' in rar or 'alpha' in rar:
@@ -1037,7 +1034,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
             footnote3="贝塔系数基于"+mktidx_name+"，回归期间"+str(regression_period)+"个自然日"
         
         import datetime; todaydt = datetime.date.today()
-        footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
+        footnote4=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)+text_lang("统计",'')
         if footnote3 !='':
             footnotex=footnote1+footnote2+'\n'+footnote3+'\n'+footnote4
         else:
@@ -1117,7 +1114,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
             break
         else:
             dft=df_tmp[[rar]]
-            dft.rename(columns={rar:"基于"+ectranslate(t)},inplace=True)
+            dft.rename(columns={rar:text_lang("基于","Based on ")+ectranslate(t)},inplace=True)
             
         if len(df)==0: #第一个
             df=dft 
@@ -1138,16 +1135,16 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
     #共同脚注    
     footnote1="注："
     if RF !=0:
-        footnote2="年化无风险利率为"+str(round(RF*100,4))+'%。'
+        footnote2="年化无风险利率为"+str(round(RF*100,4))+text_lang('%。','%')
     else:
-        footnote2="假设年化无风险利率为零。"
+        footnote2=text_lang("假设年化无风险利率为零。","Assume annual RF = 0")
         
     footnote3=''
     if rar.lower() in ['treynor','alpha']:
         footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
-    footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
+    footnote4=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)
     if footnote3 !='':
         footnotex=footnote1+footnote2+footnote3+'\n'+footnote4
     else:
@@ -1156,7 +1153,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
     #绘图
     if graph:
         
-        title_txt="风险调整收益："+ticker_name(ticker,ticker_type)
+        title_txt=text_lang("风险调整收益：","Risk-adjusted Return: ")+ticker_name(ticker,ticker_type)
         y_label=ectranslate(rar)
 
         draw_lines(df1,y_label,x_label=footnotex, \
@@ -1170,21 +1167,21 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
     recommenddf=pd.DataFrame()
     if printout:
         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")
         
         #title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
-        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
         
-        footnote6='期间：'+str(start)+'至'+str(end)+"；近期指近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)+"。"
-        footnote7="近期优先趋势和星号为多项因素综合研判，最多五颗星"
+        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")        
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         #删除含有Nan的行
@@ -1264,7 +1261,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
             break
         else:
             dft=df_tmp[[rar]]
-            dft.rename(columns={rar:"基于无风险利率"+str(round(t*100,4))+'%'},inplace=True)
+            dft.rename(columns={rar:text_lang("基于无风险利率","Based on RF=")+str(round(t*100,4))+'%'},inplace=True)
             
         if len(df)==0: #第一个
             df=dft 
@@ -1283,7 +1280,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
         #df1.rename(columns={c:"基于无风险利率"+c},inplace=True)
         
     #共同脚注    
-    footnote1="注："+ectranslate(rar)+"基于"+ectranslate(ret_type)+'。'
+    footnote1=text_lang("注：","Notes: ")+ectranslate(rar)+text_lang("基于"," is based on ")+ectranslate(ret_type)+'。'
     footnote2=""
         
     footnote3=""
@@ -1291,7 +1288,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
         footnote3="贝塔系数回归期间"+str(regression_period)+"个自然日"
     
     import datetime; todaydt = datetime.date.today()
-    footnote4="数据来源: 综合新浪/stooq/Yahoo，"+str(todaydt)+"统计"
+    footnote4=text_lang("数据来源: 综合新浪/Stooq/Yahoo，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)
     if footnote3 !='':
         footnotex=footnote1+footnote3+'\n'+footnote4
     else:
@@ -1300,7 +1297,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
     #绘图
     if graph:
         
-        title_txt="风险调整收益："+ticker_name(ticker,ticker_type)
+        title_txt=text_lang("风险调整收益：","Risk-adjusted Return: ")+ticker_name(ticker,ticker_type)
         y_label=ectranslate(rar)
 
         draw_lines(df1,y_label,x_label=footnotex, \
@@ -1314,21 +1311,21 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
     recommenddf=pd.DataFrame()
     if printout:
         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")
         
         #title_txt='***** 风险调整收益评估：'+'基于'+ectranslate(rar)+'，'+ticker_name(ticker,ticker_type)+'，'+sortby_txt+' *****'
-        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
         
-        footnote6='期间为'+str(start)+'至'+str(end)+"；近期指近"+str(trailing)+"个交易日。趋势变化率阈值："+str(trend_threshhold)+"。"
-        footnote7="近期优先趋势和星号为多项因素综合研判，最多五颗星"
+        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")        
         footnotey=footnote6+footnote7+'\n'+footnotex
 
         #删除含有Nan的行
@@ -1374,7 +1371,7 @@ if __name__=='__main__':
     rars=compare_rar_security(ticker,start,end,rar,ret_type,RF,printout=True)
 
 def compare_rar_security(ticker,start,end,rar='sharpe', \
-                         ret_type="Annual Ret%", \
+                         ret_type="Annual Adj Ret%", \
                          RF=0, \
                          regression_period=365, \
                          graph=True,loc1='best', \

siat/security_trend2.py

@@ -97,7 +97,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                        
                    dividend=False,split=False, \
                        
-                   ret_type='Annual Ret%',RF=0,regression_period=365,market_index="auto", \
+                   ret_type='Annual Adj Ret%',RF=0,regression_period=365,market_index="auto", \
                    sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
                        
                    band_area='', \

siat/stock.py

@@ -1350,7 +1350,7 @@ def comp_1security_2measures(df,measure1,measure2,twinx=False, \
     titletxt=text_lang("证券趋势分析：","Security Trend: ")+tname
     
     import datetime; todaydt = datetime.date.today()
-    footnote1=text_lang("数据来源：综合新浪/东方财富/stooq/yahoo，","Source: integrating sina/eastmoney/stooq/yahoo, ")
+    footnote1=text_lang("数据来源：综合Sina/EM/Stooq/Yahoo，","Source: Sina/EM/Stooq/Yahoo, ")
     footnote=footnote1+str(todaydt)
     
     #绘图
@@ -1962,13 +1962,13 @@ def compare_msecurity(tickers,measure,start,end, \
             #y_label='指标'
             y_label='指标对比'
     
-    x_label1cn="数据来源: 综合新浪/东方财富/stooq/yahoo等，"
-    x_label1en="Source: integrating sina/stooq/yahoo, "
+    x_label1cn="数据来源: 综合Sina/EM/Stooq/Yahoo等，"
+    x_label1en="Source: Sina/EM/Stooq/Yahoo, "
     x_label1=text_lang(x_label1cn,x_label1en)   
     import datetime; todaydt = datetime.date.today()
     x_label=x_label1+str(todaydt)  
 
-    title_txt1=text_lang("证券趋势对比分析","Trend Comparative Analysis") 
+    title_txt1=text_lang("证券趋势分析","Security Trend") 
     if y_label != '':
         title_txt=title_txt1+": "+y_label
     else:

siat/stock_technical.py

@@ -1107,6 +1107,8 @@ def stock_MACD(ticker,start='default',end='default', \
         df1=df[(df.index >= startpd) & (df.index <= endpd)]    
         
         # MACD绘图
+        print('') #空一行
+        
         df4=df1[['Close','DIF','DEA','MACD']]
         df4.rename(columns={'Close':'收盘价','DIF':'快线DIF','DEA':'慢线DEA','MACD':'柱线MACD'},inplace=True)
         title_txt=text_lang("证券价格走势分析：","Security Trend: ")+ticker_name(ticker,ticker_type)+"，MACD"

siat/translate.py

@@ -1807,8 +1807,8 @@ def codetranslate1(code):
         ['UBSG.SW','UBS(SW)'],        
 
         #股票：高科技
-        ['AAPL','Apple'],['Apple','Apple'],['DELL','DELL'],['IBM','IBM'],
-        ['MSFT','Microsoft'],['Microsoft','Microsoft'],['HPQ','HP'],['AMD','AMD'],
+        ['AAPL','Apple'],['Apple','Apple'],['DELL','DELL Corp'],['IBM','IBM Corp'],
+        ['MSFT','Microsoft'],['Microsoft','Microsoft'],['HPQ','HP'],['AMD','AMD Corp'],
         ['NVDA','NVidia'],['INTC','Intel'],['QCOM','Qualcomm'],['BB','Blackberry'],
         
         #股票：电商、互联网        
@@ -1946,7 +1946,10 @@ def codetranslate1(code):
         ['000057.SS','SSE Growth Index'],['000058.SS','SSE Value Index'],
         ['000019.SS','SSE Governance Index'],['000048.SS','SSE CSR Index'],
         
-        ['899050.BJ','BSE50 Index'],
+        ['899050.BJ','BSE50 Index'],['^SPX','Standard & Poor 500 Index'],
+        ['^RUT','Russell 2000 Index'],['^NKX','Nikkei 225 Index'],
+        ['^NDQ','NASDAQ Composite Index'],['^NDX','NASDAQ 100 Index'],
+        ['IBM','IBM Corp'],
         
         ['000002.SS','SSE A Index'],['000003.SS','SSE B Index'],
         ['399107.SZ','SZE A Index'],['399108.SZ','SZE B Index'],
@@ -1957,7 +1960,7 @@ def codetranslate1(code):
         ['399234.SZ','SZE Utility Index'],['399236.SZ','SZE Commercial Index'],
         ['399237.SZ','SZE Logistics Index'],['399240.SZ','SZE Financial Index'],
         ['399241.SZ','SZE Realestate Index'],['399244.SZ','SZE EP Index'],
-        ['399991.SZ','SZSE BRI Index'],['399997.SZ','CSI China Baijiu Index'],
+        ['399991.SZ','SZE BRI Index'],['399997.SZ','CSI China Baijiu Index'],
         
         ['000903.SS','CSI100 Index'],['399903.SZ','CSI100 Index'],
         ['000904.SS','CSI200 Index'],['399904.SZ','CSI200 Index'],
@@ -3222,6 +3225,7 @@ if __name__=='__main__':
     ticker='sh010303' #国债/基金重码
     ticker='sh018001' #金融债
     ticker='PDD'
+    ticker='IBM'
     
     ticker_type='auto'
     ticker_type='bond'

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

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

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=07y3q4nJdkM-anpZepj4gK0gvTKj-BB0ppDDI5-TCcY,26904
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=-0zmR2N_t2xaTyYedwztT7HcHKG39DwaoLoX1u5Wm7s,150656
+siat/common.py,sha256=493MZpsrKnb_RP1myq_uHj0wCdqvDk0kiRBzNF-syQI,151521
 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
@@ -65,7 +65,7 @@ siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
 siat/local_debug_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/luchy_draw.py,sha256=CESMhLYcsC6UtYfTZOfYnVQ84zz1MnXRN81P7OZHEgE,20516
+siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
 siat/market_china.py,sha256=EOO-RvdnzJThTrgNHWW3TlWhx4k4rfdjbooOnQsYdQU,50299
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
@@ -88,7 +88,7 @@ siat/option_sina_api_test.py,sha256=dn-k_wrQnAaNKHoROvWJEc7lqlU0bwiV2Aa4usWAFGM,
 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=nK5tO-FIVnECbJD0on2CClQVgCyrkI1pWve1oQERK3k,66310
+siat/risk_adjusted_return2.py,sha256=AkpxKIYv3LL1mvb6Lha4z0sevinsLLmb-ttwiJGHNO0,69083
 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
@@ -102,10 +102,10 @@ siat/security_prices.py,sha256=LqTrS20mTmM_ACENOXU5qrLmxczGtxnuziAdAynSG_Q,10587
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
-siat/security_trend2.py,sha256=WOygSyWSynNmk5gpOA8n1738-nWqfDzuyMjwriB3eP4,25284
+siat/security_trend2.py,sha256=lUMab8HilXIUPo_z9ZkztMiZ5kf3jAbbCwPPkYbQ1TI,25288
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=cIEVxAZ6vPhpICWk4p4tqpeyidLjxZHO2fF_HClaxHw,152530
+siat/stock.py,sha256=D8S2nAeDOdGv4EymfIH1rZnWGNV82sJgYA4wb88f0nI,152460
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -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=GsW1lciBEH-OEndXyFCUI6BB8uo12RwhAnuS7ND0mgg,134190
+siat/stock_technical.py,sha256=X0AqtpCih62-4ff8AnsNGEvDUVoo-sY5hTb3igc5yuE,134230
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -131,14 +131,14 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=5o7hSMeNOdyenqiyB5oZwFvIpFvt3yGgp25KZNbqy9o,216309
+siat/translate.py,sha256=LIS4ybfYAk17lOFKu80ZLkvIXnTquBi90wTKcF8BCo0,216547
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 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.52.dist-info/METADATA,sha256=cbql3N27Ey8OhncmGulNMr8S7kVrcY92OQAwrz5w-8g,7310
-siat-3.2.52.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.52.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.52.dist-info/RECORD,,
+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,,