siat 3.1.22__py3-none-any.whl → 3.1.23__py3-none-any.whl

siat/stock_technical.py

@@ -183,7 +183,8 @@ def calc_technical(df,start,end, \
                    CCI_days=14, \
                    WR_days=[10,6], \
                    ROC_day=12,ROC_madays=6, \
-                   DMI_DIdays=14,DMI_ADXdays=6):
+                   DMI_DIdays=14,DMI_ADXdays=6, \
+                   more_details=False):
     """
     功能：计算股票的技术分析指标
     输入：df，四种股价Open/Close/High/Low，成交量Volume
@@ -222,6 +223,7 @@ def calc_technical(df,start,end, \
         RSI_days=[RSI_days]
     for d in RSI_days:
         df['rsi'+str(d)] = talib.RSI(df['Close'], timeperiod=d)
+    #注意：rsi1没有意义
     
     #=========== OBV：能量潮
     """
@@ -258,8 +260,9 @@ def calc_technical(df,start,end, \
         OBV_days=[OBV_days]
     for d in OBV_days:    
         df['obv_ma'+str(d)] = talib.MA(df['obv'],timeperiod=d)
-        
-    df.drop(columns = ['obv'],inplace=True)
+    
+    if not more_details:    
+        df.drop(columns = ['obv'],inplace=True)
     
     #=========== MA: 简单、加权移动平均
     """
@@ -435,7 +438,11 @@ def calc_technical(df,start,end, \
     for d in CR_madays:
         df['cr_ma'+str(d)] = talib.MA(df['cr'],timeperiod=d)
     
-    df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum','cr'],inplace=True) 
+    if more_details:
+        #保留cr
+        df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum'],inplace=True) 
+    else:
+        df.drop(columns = ['m_price','h_m','m_l','h_m_sum','m_l_sum','cr'],inplace=True) 
     
     #=========== EMV: 简易波动指标
     """
@@ -506,8 +513,10 @@ def calc_technical(df,start,end, \
         TRIX_madays=[TRIX_madays]
     for d in TRIX_madays:    
         df['trix_ma'+str(d)] = talib.MA(df['trix'],timeperiod=d)    
-        
-    df.drop(columns = ['trix'],inplace=True) 
+    
+    if not more_details:
+        #不保留TRIX
+        df.drop(columns = ['trix'],inplace=True) 
 
     #=========== DMA: 平均线差
     """
@@ -529,6 +538,7 @@ def calc_technical(df,start,end, \
         DMA_madays=[DMA_madays]
     for d in DMA_madays:    
         df['dma'+str(d)] = talib.MA(df['ddd'],timeperiod=d)    
+    #注意：dma1似乎没有意义
     
     df.drop(columns = ['ma_shortperiod','ma_longperiod','ddd'],inplace=True) 
     
@@ -559,7 +569,7 @@ def calc_technical(df,start,end, \
         CCI_days=[CCI_days]
     for d in CCI_days:    
         df['cci'+str(d)] = talib.CCI(df['High'],df['Low'],df['Close'],timeperiod=d)
-
+            
     #=========== W%R: 威廉指标   
     """
     N日W%R = [(Hn-Ct)/(Hn-Ln)]*100
@@ -599,8 +609,11 @@ def calc_technical(df,start,end, \
         ROC_madays=[ROC_madays]
     for d in ROC_madays:    
         df['roc_ma'+str(d)] = talib.MA(df['roc'],timeperiod=d)  
+    
+    if not more_details:
+        #不保留roc
+        df.drop(columns = ['roc'],inplace=True) 
         
-    df.drop(columns = ['roc'],inplace=True) 
     #=========== DMI: 趋向指标
     """
 
@@ -2452,7 +2465,9 @@ def security_technical2(ticker,start='default',end='default', \
                 ticker_type='auto', \
                     
                 attention_values=[0,30,50,80], \
-                facecolor='papayawhip',price_line_color='red'):
+                facecolor='papayawhip',price_line_color='red', \
+                
+                more_details=False):
     """
     
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
@@ -2542,7 +2557,9 @@ def security_technical2(ticker,start='default',end='default', \
                        CCI_days=CCI_days, \
                        WR_days=WR_days, \
                        ROC_day=ROC_day,ROC_madays=ROC_madays, \
-                       DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays)
+                       DMI_DIdays=DMI_DIdays,DMI_ADXdays=DMI_ADXdays, \
+                           
+                       more_details=more_details)
 
     #技术指标的绘图线
     tech_line_default={'RSI':['rsi'],

{siat-3.1.22.dist-info → siat-3.1.23.dist-info}/METADATA

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

@@ -112,7 +112,7 @@ siat/stock_list_china_test.py,sha256=gv14UwMMvkZqtb6G7DCTSuehIwVHuVwu7w60p6gyHoo
 siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum6s,36738
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
-siat/stock_technical.py,sha256=uBHps4RpWYbLjHV4buNU-B29aG1YKYJ2WzS8QzLZl7k,113918
+siat/stock_technical.py,sha256=_b4oRMemnG9eJtOciaMzcnPpxrzAeooujCrQIcZEGlM,114462
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -133,7 +133,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=Tde2LzPDQy3Z7xOQQDw4ckQMPdROp_z0-GjFE6Z5_lI,67639
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.1.22.dist-info/METADATA,sha256=-tITPyfoAysRKI9PCIi9qlAVxctl-EZ3sqD42rB22Jo,1448
-siat-3.1.22.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.1.22.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.1.22.dist-info/RECORD,,
+siat-3.1.23.dist-info/METADATA,sha256=OSzi5L0CybWsNdSshB0Ke0Ge6IcDdrIdbE3985Dl9jE,1448
+siat-3.1.23.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.1.23.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.1.23.dist-info/RECORD,,