siat 2.14.1__py3-none-any.whl → 2.14.2__py3-none-any.whl

siat/common.py

@@ -720,19 +720,20 @@ def save_to_excel(df,filedir,excelfile,sheetname="Sheet1"):
     注意：如果df中含有以文本表示的数字，写入到Excel会被自动转换为数字类型保存。
     从Excel中读出后为数字类型，因此将会与df的类型不一致
     """
+    DEBUG=True
 
     #检查目录是否存在
     import os
     try:
         os.chdir(filedir)
     except:
-        print("Error #1(save_to_excel): folder does not exist")        
-        print("Information:",filedir)  
+        print("  #Error(save_to_excel): folder does not exist",filedir)        
         return
                 
     #取得df字段列表
     dflist=df.columns
     #合成完整的带目录的文件名
+    #filename=filedir+'\\'+excelfile
     filename=filedir+'/'+excelfile
     
     import pandas as pd
@@ -740,9 +741,9 @@ def save_to_excel(df,filedir,excelfile,sheetname="Sheet1"):
         file1=pd.ExcelFile(excelfile)
     except:
         #不存在excelfile文件，直接写入
-        df.to_excel(filename,sheet_name=sheetname, \
-                       header=True,encoding='utf-8')
-        print("***Results saved in",filename,"@ sheet",sheetname)
+        #df.to_excel(filename,sheet_name=sheetname,header=True,encoding='utf-8')
+        df.to_excel(filename,sheet_name=sheetname,header=True)
+        print("  Successfully saved in",filename,"@ sheet",sheetname)
         return
     else:
         #已存在excelfile文件，先将所有sheet的内容读出到dict中        
@@ -770,18 +771,25 @@ def save_to_excel(df,filedir,excelfile,sheetname="Sheet1"):
     result=pd.ExcelWriter(filename)
     for s in sheetlist:
         df1=dict[s][dflist]
-        df1.to_excel(result,s,header=True,index=True,encoding='utf-8')
+        #df1.to_excel(result,s,header=True,index=True,encoding='utf-8')
+        df1.to_excel(result,s,header=True,index=True)
     #写入新内容
     if not dup: #sheetname未重复
-        df.to_excel(result,sheetname,header=True,index=True,encoding='utf-8')
-    try:
-        result.save()
-        result.close()
-    except:
-        print("Error #2(save_to_excel): writing file permission denied")
-        print("Information:",filename)  
-        return
-    print("***Results saved in",filename,"@ sheet",sheetname)
+        #df.to_excel(result,sheetname,header=True,index=True,encoding='utf-8')
+        df.to_excel(result,sheetname,header=True,index=True)
+        if DEBUG:
+            #result.save()
+            result.close()
+        else:
+            try:
+                #result.save()
+                result.close()
+            except:
+                print("  #Error(save_to_excel): writing file failed for",filename)
+                print("  Solution: change file name and try again")
+                return
+
+    print("  Successfully saved in",filename,"@ sheet",sheetname)
     return       
 #==============================================================================
 def set_df_period(df,df_min,df_max):
@@ -2993,7 +3001,7 @@ def df_preprocess(dfs,measure,axhline_label,x_label,y_label,lang='Chinese', \
                 elif scaling_option == 'change%':
                     std_notes="注释：为突出变化趋势，图中数值为相对期间起点的增减百分比"
                     #measure_suffix='(增/减%)'
-                    measure_suffix='(涨/跌%)'
+                    measure_suffix='(涨跌幅度%)'
                     axhline_label='零线' #可以在security_trend中使用critical_value选项指定水平线位置，默认0
                     #axhline_value=0
                     

siat/grafix.py

@@ -93,7 +93,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               power=0,zeroline=False,average_value=False, \
               resample_freq='H',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
-              mark_top=0,mark_bottom=0,mark_end=True):
+              mark_top=1,mark_bottom=1,mark_end=True):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -210,7 +210,9 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         av=df[colname].mean()
         plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label="均值")
         haveLegend=True
-        footnote=footnote + "，均值"+str(round(av,2))
+        av=str(round(av,2)) if av < 100 else str(int(av))
+        #footnote=footnote + "，均值"+av
+        footnote="注：期间均值"+av+"；"+footnote
     
     #绘制趋势线
     #print("--Debug(plot_line): power=",power)

siat/security_trend2.py

@@ -349,7 +349,7 @@ def security_trend(ticker,indicator='Close', \
                               average_value=average_value, \
                               datatag=datatag,power=power,graph=graph, \
                               source=source, 
-                              mark_top=mark_top,mark_bottom=mark_bottom)
+                              mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
         return df
     
     # 情形2：单个证券，两个普通指标，twinx==True =================================
@@ -367,7 +367,7 @@ def security_trend(ticker,indicator='Close', \
                          date_range=date_range,date_freq=date_freq, \
                          annotate=annotate,annotate_value=annotate_value, \
                          source=source,
-                         mark_top=mark_top,mark_bottom=mark_bottom)
+                         mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
         return df
     
     # 情形4：两个证券，取第一个普通指标，twinx==True =============================

{siat-2.14.1.dist-info → siat-2.14.2.dist-info}/METADATA

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

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cqbmfM4mrq73Ub0bq5QjWJjmJHj9x7-dSqbmNxnEj7k,28946
 siat/capm_beta2.py,sha256=tC2fhColziTeWzhzQNPff6LoGCsK6A5fw_NOEIKnNqo,22197
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=uCzH0d5Z7ZOkYrGek8xtp06bZa1_EPy8dwUUYEH31JE,121770
+siat/common.py,sha256=V0iYl9UrxSyuEtbvggGuJ_9HUeb8RjhvWpThk-AJQ9c,122131
 siat/compare_cross.py,sha256=-MZzxmX8_9oFZ7X0IcR51w87EWwssbitiw-BcmHMFzQ,26228
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -59,7 +59,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=bTVBUEHR8LokYVIRUIK8Q_QzxE8Nmeqi0og9F4UOnKY,76609
+siat/grafix.py,sha256=jndxeDXgJjrBVSDDdTMjpNfCZcS1KFJUwVG0Z9ibev0,76712
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=Dh4zXEw-0hnbMNorbsRS142C8mUzq4NhFjYnauWu5tc,30548
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -96,7 +96,7 @@ siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_prices.py,sha256=ES7EVWEdPdSMTEeJSk5WFTux1O_HN0ybcluSW9qmYK0,80420
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=BNZm0Yujs3V6tlOirtcKqsKAegy36shWXGen_c4KwBo,17204
-siat/security_trend2.py,sha256=B9m1C845WDotQUclxIU_QdzYWYTC0tJAvD0HUMVRCCY,24761
+siat/security_trend2.py,sha256=gbdrvzrp5UglSNdqw8y9IVhkFk0QU4tKzUTFSueMpPo,24797
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
 siat/stock.py,sha256=Sg3Qsv8uCm3uIK2UurR5Chf1Sq8i3PZ3UsEQsaeANaE,142556
@@ -130,7 +130,7 @@ siat/valuation.py,sha256=x-3qpu_14SLAPuO2gwmT9ojPYIEZCX8KcnIbezDiFKI,47362
 siat/valuation_china.py,sha256=oEQRrktJNHiOG1mJSQN1aSSQAQrwrg-ppIHyNVjMjNg,67603
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=zB_Skk_tmzIR15l6oAW3am4HBGVIG-eZ8gJhCdXZ8Qw,14859
-siat-2.14.1.dist-info/METADATA,sha256=o1TYSfa1kGqGd6eDO7V6A-030-2BYrCmcoez7sDK2zI,1448
-siat-2.14.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-2.14.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-2.14.1.dist-info/RECORD,,
+siat-2.14.2.dist-info/METADATA,sha256=NWrDiu1w4EuA_bqczpwbwBODqR8vhYa0wnz3FcG8Npc,1448
+siat-2.14.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-2.14.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-2.14.2.dist-info/RECORD,,