siat 3.4.10__py3-none-any.whl → 3.4.12__py3-none-any.whl

siat/sector_china.py

@@ -3199,9 +3199,9 @@ if __name__=='__main__':
     
     peers=stock_industry_peer_em(ticker,indicator="市盈率",rank=10)
 
-def stock_peers_em(ticker,indicator="市盈率",rank=10, \
+def stock_peers_em(ticker='',indicator='',rank=10, \
                   font_size="16px",facecolor="papayawhip", \
-                  numberPerLine=7):
+                  numberPerLine=5):
     """
     功能：基于东方财富行业分类，查找股票所属的行业以及主要同行
     特点：行业分类较粗糙，略胜于无
@@ -3245,8 +3245,9 @@ def stock_peers_em(ticker,indicator="市盈率",rank=10, \
             indicator_col=i
             break
         
-    if indicator_col=='':
-        print("  #Warning(stock_peer_em): unsupported indicator",indicator)
+    if indicator_col=='' or indicator=='':
+        if indicator!='':
+            print("  #Warning(stock_peer_em): unsupported indicator",indicator)
         
         remove_list=["序号","代码","名称"]
         cfg_col_list_tmp = [x for x in cfg_col_list if x not in remove_list]
@@ -3282,6 +3283,22 @@ def stock_peers_em(ticker,indicator="市盈率",rank=10, \
         rank_flag="后"
         df_disp=cfg[collist].tail(abs(rank))
     
+    #强制显示所选股票
+    if force_show_stock:
+        #所选股票是否在其中？
+        if not ticker[:6] in list(df_disp["代码"]):
+            ticker_seq=cfg[cfg["代码"]==ticker[:6]]["序号"].values[0]
+            seq1=ticker_seq-4; seq2=ticker_seq+5
+            #如果超出开头
+            if seq1 <=0:
+                seq1=1; seq2=10
+            #如果超出结尾    
+            if seq2 > len(cfg):
+                seq2=len(cfg); seq1=len(cfg)-9
+                
+            #注意：此处的&不能换为and    
+            df_disp=cfg[(cfg["序号"]>=seq1) & (cfg["序号"]<=seq2)][collist]
+    
     #制表
     tname=ticker_name(ticker)
     titletxt="行业板块及其上市公司排名："+hangye+"，"+indicator_col+"("+rank_flag+str(abs(rank))+"名)"
@@ -3311,13 +3328,16 @@ if __name__=='__main__':
     
     ticker="600519.SS"
     indicator="市盈率"
-    rank=40
+    rank=11
+    
+    force_show_stock=True
     
     font_size="16px"; facecolor="papayawhip"; numberPerLine=7
     
 
 def concept_stocks_em(concept='',ticker='',indicator="市盈率",rank=10, \
-                      font_size="16px",facecolor="papayawhip",numberPerLine=7):
+                      force_show_stock=False, \
+                      font_size="16px",facecolor="papayawhip",numberPerLine=5):
     """
     功能：基于东方财富概念板块，查找关键字相关概念以及股票业绩
     特点：概念板块划分细致，同一股票可能分属多个板块，与行业分类不同
@@ -3428,6 +3448,23 @@ def concept_stocks_em(concept='',ticker='',indicator="市盈率",rank=10, \
         rank_flag="后"
         df_disp=cfg[collist].tail(abs(rank))
     
+    #强制显示所选股票
+    if force_show_stock:
+        #所选股票是否在其中？
+        if not ticker[:6] in list(df_disp["代码"]):
+            ticker_seq=cfg[cfg["代码"]==ticker[:6]]["序号"].values[0]
+            seq1=ticker_seq-4; seq2=ticker_seq+5
+            #如果超出开头
+            if seq1 <=0:
+                seq1=1; seq2=10
+            #如果超出结尾    
+            if seq2 > len(cfg):
+                seq2=len(cfg); seq1=len(cfg)-9
+                
+            #注意：此处的&不能换为and    
+            df_disp=cfg[(cfg["序号"]>=seq1) & (cfg["序号"]<=seq2)][collist]
+        
+    
     #制表
     titletxt="概念板块及其上市公司排名："+concept+"，"+indicator_col+"("+rank_flag+str(abs(rank))+"名)"
 

{siat-3.4.10.dist-info → siat-3.4.12.dist-info}/METADATA

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

@@ -94,7 +94,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=ASAIwlysX9HbS4C30gd6Uh7d1dWAQdRGQvUgJhtexm0,129147
+siat/sector_china.py,sha256=dCBzhFUbCKZytRmtMcPCmrq6ktmXJ50FH6g48SMXlt8,130573
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=65s64L68aRZdVVK3V8UYxdPd_JHMqgJ2FBJJX5MSW-Q,26174
@@ -139,7 +139,7 @@ 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/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
-siat-3.4.10.dist-info/METADATA,sha256=gTlCZesag1aR19iTEb2e5ORaiOiAO2uJku9vpyRI7z8,7683
-siat-3.4.10.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.4.10.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.10.dist-info/RECORD,,
+siat-3.4.12.dist-info/METADATA,sha256=4x-7hEFgcIpc91o197nqMAM8kxqCckIONyb5qWMpdO8,7683
+siat-3.4.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.4.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.12.dist-info/RECORD,,

{siat-3.4.10.dist-info → siat-3.4.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any