siat 3.2.25__py3-none-any.whl → 3.2.30__py3-none-any.whl

siat/allin.py

@@ -120,3 +120,6 @@ from siat.stock_technical import *
 # 2FA: Google Authenticator
 from siat.google_authenticator import *
 
+# 提问记录
+from siat.luchy_draw import *
+

siat/luchy_draw.py

@@ -0,0 +1,252 @@
+# -*- coding: utf-8 -*-
+
+"""
+本模块功能：幸运抽奖，仅限课堂案例演示用
+创建日期：2024年6月29日
+最新修订日期：
+作者：王德宏 (WANG Dehong, Peter)
+作者单位：北京外国语大学国际商学院
+用途限制：仅限研究与教学使用，不可商用！商用需要额外授权。
+特别声明：作者不对使用本工具进行证券投资导致的任何损益负责！
+"""
+
+#==============================================================================
+#关闭所有警告
+import warnings; warnings.filterwarnings('ignore')
+import warnings; warnings.filterwarnings('ignore')
+
+import pandas as pd
+import pickle
+import random
+import datetime
+import time
+ 
+#==============================================================================
+if __name__=='__main__':
+    text="A B C"
+    text_color='red'
+    text_size=12
+    delay=1
+    
+    typewriter(text,text_color='red',text_size=12,delay=1)        
+
+def typewriter(text,text_color='blue',text_size=12,delay=1):
+    from IPython.display import display_html
+    
+    text_html="<center><font size="+str(text_size)+" color="+text_color+">"+text
+    display_html(text_html, raw=True)
+
+    return
+
+#==============================================================================
+
+def pickle_write(df,pickle_path):
+    with open(pickle_path, 'wb') as pickle_file:
+        # 使用pickle模块的dump函数写入对象
+        pickle.dump(df,pickle_file)     
+
+if __name__=='__main__':
+    file_path="S:\北外工作-24春\小学期-人大\学生名单\student_list.xlsx"
+    pickle_path="student_list.pkl"
+    skiprows=1
+    column='Name'
+    
+    namelist_get(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl")
+    
+def lucky_draw_initialize(file_path,skiprows=1,column='Name',pickle_path="student_list.pkl"):
+    """
+    功能：读入带有指定路径的Excel文件file_path，跳过前skiprows行
+    Excel文件结构：抽奖名单字段为'Name'，字段位于第2行
+    输出：存入pickle文件student_list.pkl
+    """
+    
+    df = pd.read_excel(file_path,skiprows=skiprows)  
+    
+    df1=df[[column]].copy()  
+    
+    todaydt = str(datetime.date.today())
+    df1['Date']=todaydt
+    df1['Lucky']=0
+    df1['Absent']=0
+    df1['Answer']=0
+    
+    #排序
+    df1.sort_values(by=[column,'Date','Lucky','Absent','Answer'],inplace=True)
+    df1.reset_index(drop=True,inplace=True)
+    
+    pickle_write(df1,pickle_path)
+    
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    pickle_path="student_list.pkl"
+    
+    df=pickle_read(pickle_path)
+
+def pickle_read(pickle_path="student_list.pkl"):   
+    with open(pickle_path,'rb') as pickle_file:
+        df = pickle.load(pickle_file)
+    return df
+
+#==============================================================================
+
+
+
+def pickle_append(df,column='Name',pickle_path="student_list.pkl"):
+    df_tmp=pickle_read(pickle_path)
+    df_new=pd.concat([df_tmp,df])
+    
+    df_new.sort_values(by=[column,'Date'],inplace=True)
+    
+    pickle_write(df_new,pickle_path)
+    
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    alist=["A","B","C","D"]
+    
+    for i in range(4):
+        print(random_select(alist))
+
+
+def random_select(alist):
+    return random.choice(alist)
+
+#==============================================================================
+
+if __name__=='__main__':
+    prompt="Is the lucky person here in class?"
+    
+    read_yes_no(prompt)
+
+    
+def read_yes_no(prompt, default=None):
+    if default is None:
+        prompt += " [yes/no] "
+    else:
+        prompt += " [yes/no] (default: %s) " % ('yes' if default else 'no')
+    while True:
+        user_input = input(prompt).lower()
+        if user_input in ['', 'yes', 'y', 'true']:
+            return True
+        elif user_input in ['no', 'n', 'false']:
+            return False
+        elif user_input == '' and default is not None:
+            return default
+        else:
+            print("Please enter 'yes' or 'no' (or 'y'/'n').")
+            
+    return
+
+#==============================================================================
+if __name__=='__main__':
+    draw_limit=2
+    absent_limit=2
+    column='Name'
+    pickle_path="student_list.pkl"
+    
+    lucky_draw()
+    df=pickle_read(pickle_path)
+    
+
+def lucky_draw(draw_limit=2,absent_limit=2,column='Name',pickle_path="student_list.pkl"):
+    """
+    draw_limit=2：整个课程每人最多2次抽签机会
+    absent_limit=2：整个课程每人最多缺席2次，超过就丧失抽签资格
+    """
+    df=pickle_read(pickle_path)
+
+    alist=list(set(list(df[column])))    
+    
+    found=False
+    todaydt = str(datetime.date.today())
+    prompt="*** Is the lucky person here on site?"
+    prompt2="*** Do you expect to pass?"
+    
+    while True:
+        while True:
+            aname=random_select(alist)
+            
+            adf=df[df[column]==aname]
+            atimes=adf['Lucky'].sum()
+            aonsite=adf['Absent'].sum()
+            
+            if atimes < draw_limit and aonsite <= absent_limit:
+                #检查今日是否被抽中过
+                drew_today=False
+                try:
+                    adf_today=adf[adf['Date']==todaydt]
+                    if len(adf_today) > 0:
+                        if adf_today['Lucky'].sum() > 0 or adf_today['Absent'].sum() > 0:
+                            drew_today=True
+                except: pass
+                
+                if not drew_today:                    
+                    found=True
+                    break
+                else: continue
+            else:
+                continue
+
+        if not found:  
+            print("Congratulations! all person has been lucky for",limit,"times")
+        else:
+            """
+            print("\nThe lucky person is ",end='')
+            typewriter(aname,delay=1) 
+            """
+            typewriter(text=aname,text_color='blue',text_size=12,delay=1)
+            
+            #print('')
+            onsite=read_yes_no(prompt)
+            #是否到场
+            if onsite: absent=0
+            else: absent=1
+            
+            onpass=False; answer=0
+            if onsite:            
+                onpass=read_yes_no(prompt2)
+                #是否pass
+                if onpass: answer=0
+                else: answer=1 
+            
+            #只要抽中，不论是否到场都记录
+            row=pd.Series({column:aname,'Date':todaydt,'Lucky':1,'Absent':absent,'Answer':answer})
+            try:
+                df=df.append(row,ignore_index=True)        
+            except:
+                df=df._append(row,ignore_index=True)
+                            
+            if onsite and not onpass:
+                #到场且不pass，结束本轮抽签
+                break
+            else:
+                #未到场或pass，继续抽签
+                continue
+    
+    df.sort_values(by=[column,'Date'],inplace=True)
+    pickle_write(df,pickle_path)
+    
+    return
+
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================        
+
+
+
+
+
+
+
+    
+
+
+#==============================================================================#==============================================================================
+#==============================================================================#==============================================================================
+#==============================================================================#==============================================================================
+
+#==============================================================================

siat/stock_technical.py

@@ -188,8 +188,10 @@ def calc_technical(df,start,end,technical='MACD', \
         ROC_day=12,ROC_madays=[6], \
         DMI_DIdays=[14],DMI_ADXdays=[6], \
             
-        MFI_day=14,MFI_madays=[14], \
-        MOM_day=10,MOM_madays=[10], \
+        MFI_day=14,MFI_madays=[6], \
+            
+        #提出选择12日或25日，移动均线为10日            
+        MOM_day=12,MOM_madays=6, \
             
         #需要显示SAR
         SAR_day=4,SAR_madays=[5,20], \
@@ -201,7 +203,7 @@ def calc_technical(df,start,end,technical='MACD', \
         TSF_day=14,TSF_madays=[5,20], \
             
         #需要显示AD
-        AD_day=26,AD_madays=[5,20], \
+        AD_madays=[5], \
         
         #不建议使用复权价，因为最高最低价和开盘价没有复权价！
         indicator='Close', \
@@ -586,11 +588,11 @@ def calc_technical(df,start,end,technical='MACD', \
             TRIX_madays=[TRIX_madays]
         for d in TRIX_madays:    
             df['trix_ma'+str(d)] = talib.MA(df['trix'],timeperiod=d)    
-        
+        """
         if not more_details:
             #不保留TRIX
             df.drop(columns = ['trix'],inplace=True) 
-
+        """
     #=========== DMA: 平均线差
     """
     计算公式：
@@ -744,11 +746,11 @@ def calc_technical(df,start,end,technical='MACD', \
             MFI_madays=[MFI_madays]
         for d in MFI_madays:    
             df['mfi_ma'+str(d)] = df['mfi'].rolling(window=d).mean()
-    
+        """
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['mfi'],inplace=True) 
-    
+        """
     #=========== MOM：动量指标
     """
     
@@ -760,11 +762,11 @@ def calc_technical(df,start,end,technical='MACD', \
             MOM_madays=[MOM_madays]
         for d in MOM_madays:    
             df['mom_ma'+str(d)] = df['mom'].rolling(window=d).mean()   
-    
+        """
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['mom'],inplace=True) 
-    
+        """
     #=========== BETA：贝塔系数
     """
     动态贝塔系数？
@@ -805,18 +807,17 @@ def calc_technical(df,start,end,technical='MACD', \
     """
     if technical=='AD':
     
-        #df['ad'] = talib.AD(df['High'],df['Low'],df[indicator],df['Volume'],timeperiod=AD_day)
         df['ad'] = talib.AD(df['High'],df['Low'],df[indicator],df['Volume'])
         
         if not isinstance(AD_madays,list):
             AD_madays=[AD_madays]
         for d in AD_madays:    
             df['ad_ma'+str(d)] = df['ad'].rolling(window=d).mean()   
-    
+        """
         if not more_details:
             #不保留指标本身
             df.drop(columns = ['ad'],inplace=True) 
-
+        """
 
     
     #过滤日期===================================================================
@@ -2620,12 +2621,12 @@ if __name__ =="__main__":
     WR_days=[10,6]
     ROC_day=12; ROC_madays=6
     DMI_DIdays=14; DMI_ADXdays=6
-    MFI_day=14; MFI_madays=[3,5]
-    MOM_day=10; MOM_madays=[5,20]
+    MFI_day=14; MFI_madays=[6]
+    MOM_day=12; MOM_madays=6
     SAR_day=4; SAR_madays=[5,20]
     BETA_day=5; BETA_madays=[5,20]
     TSF_day=14; TSF_madays=[5,10]
-    AD_day=26; AD_madays=[5,20]
+    AD_madays=[5]
     
     
     ticker='002594.SZ';ticker_type='auto'
@@ -2691,7 +2692,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         
         DMA_fastperiod=10,DMA_slowperiod=50,DMA_madays=[10], \
         
-        TRIX_day=12,TRIX_madays=[5,10], \
+        TRIX_day=12,TRIX_madays=[20], \
             
         BIAS_days=[6,12,24], \
             
@@ -2703,9 +2704,10 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             
         DMI_DIdays=7,DMI_ADXdays=6, \
         
-        #资金流：3日作为信号，5日作为确认信号
-        MFI_day=14,MFI_madays=[3,5], \
-        MOM_day=10,MOM_madays=[5,20], \
+        #资金流：
+        MFI_day=14,MFI_madays=[6], \
+            
+        MOM_day=12,MOM_madays=6, \
             
         #需要显示SAR
         SAR_day=4,SAR_madays=[5,20], \
@@ -2717,7 +2719,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         TSF_day=14,TSF_madays=[5,10], \
             
         #需要显示AD
-        AD_day=26,AD_madays=[5,20], \
+        AD_madays=[], \
         
         #数据提前量，用于前置计算指标的移动平均值   
         ahead_days=30*8, \
@@ -2739,11 +2741,11 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             
         #价格线的绘图参数
         #price_line_style=(0,(1,1)), \
-        price_line_style='dotted', \
+        price_line_style=(0,(3,1,1,1,1,1)), \
         price_line_color=['red','green'], \
         price_line_width=1,price_line_marker='o', \
         marker_sizes=[30,120,250], \
-                        ):
+        ):
     """
     功能：计算和绘制证券技术分析指标的简易图，仅供进一步探索使用，仅用于单个证券(股债基)
     
@@ -2867,7 +2869,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             TSF_day=TSF_day,TSF_madays=TSF_madays, \
                 
             #需要显示AD
-            AD_day=AD_day,AD_madays=AD_madays, \
+            AD_madays=AD_madays, \
             
             indicator=indicator, \
             more_details=more_details)
@@ -3007,6 +3009,9 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         ax3.set_facecolor('papayawhip')
         
     color_list=['k','g','b','c','m','yellowgreen','tomato','lime','orange','deepskyblue']
+    
+    if isinstance(attention_values,int):
+        attention_values=[attention_values]
     attention_draws=[False] * len(attention_values)
 
     for l in tech_line_collist:
@@ -3037,7 +3042,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
                              xy=(x_end, y_end),
                              xytext=(x_end, y_end),color=last_line_color)        
             """
-            ax.annotate(text=' '+l.upper(), 
+            ax.annotate(text=''+l.upper(), 
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end),color=last_line_color,fontsize=legend_txt_size)        
             
@@ -3053,7 +3058,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             
             #如果需要绘制关注线，且尚未绘制过，则绘制
             if line_al and not attention_draws[pos]:
-                ax.axhline(y=attention_values[pos],ls=":",c=color_list[pos],linewidth=2)
+                ax.axhline(y=attention_values[pos],ls='dotted',c=color_list[pos],linewidth=1)
 
                 attention_draws[pos]=True
         
@@ -3109,8 +3114,8 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     ax2.set_ylabel(ylabeltxt2,fontsize=ylabel_txt_size)
 
     #细灰线先画出轮廓
-    ax2.plot(df1.index,df1[indicator],label='', \
-             linestyle=price_line_style,color='grey',lw=2)   
+    ax2.plot(df1.index,df1[indicator],label=ylabeltxt2, \
+             linestyle=price_line_style,color='k',lw=2)   
 
     #不同颜色绘制涨跌价格线
     first_time=True; second_time=False
@@ -3119,11 +3124,13 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         if df1seg['up_down'].values[0] >=0:
             seg_color=price_line_color1
             #labeltxt=ylabeltxt2+'(当日↑)'
-            labeltxt=ylabeltxt2+'(当日阳线)'
+            #labeltxt=ylabeltxt2+'(当日阳线)'
+            labeltxt='当日↑'
         else:
             seg_color=price_line_color2
             #labeltxt=ylabeltxt2+'(当日↓)'
-            labeltxt=ylabeltxt2+'(当日阴线)'
+            #labeltxt=ylabeltxt2+'(当日阴线)'
+            labeltxt='当日↓'
             
         if first_time:
             first_time=False; second_time=True
@@ -3135,7 +3142,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         ax2.scatter(df1seg.index,df1seg[indicator], \
                     s=df1seg['marker_size'], \
                     label=labeltxt, \
-                    linestyle=':',color=seg_color,lw=price_line_width,marker=price_line_marker)   
+                    linestyle=':',color=seg_color,lw=price_line_width,marker=price_line_marker,alpha=0.5)   
     
     ax2.legend(loc=loc2,fontsize=legend_txt_size)
     

{siat-3.2.25.dist-info → siat-3.2.30.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 siat/__init__.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/allin.py,sha256=f1VWxZLvPLR57ilk9GOziZMWjyAYOYLXbvQI4z38r50,2708
+siat/allin.py,sha256=f8mlMSQJUgx4mRVOJNlHH2SZP0jUyWaeDPT2V6AGfY8,2757
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
 siat/assets_liquidity_test.py,sha256=UWk6HIUlizU7LQZ890fGx8LwU1jMMrIZswg8cFUJWZ8,1285
@@ -64,6 +64,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=cL-QBRbnjvY2h8B6YGp6Orycw43ypvBPhkFARD1bbPo,8248
 siat/market_china.py,sha256=hKoTLUyHuzsuG2L3_IuLx_utTKqS-__mZ63wrElh65U,45943
 siat/markowitz.py,sha256=glHikhabFAF6Hb6df1pYfhkxid2IZXBYAVQng5wd9Wk,97526
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
@@ -115,7 +116,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=DYSewOV9kRTusA3PX37BVbLQuo3qAeJML_qmEljXcAc,131491
+siat/stock_technical.py,sha256=GPedxbOSPTi8zthDMu69edFVLES2RSNor2a1y8Zo42w,131612
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -136,7 +137,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.25.dist-info/METADATA,sha256=rrntA_Rsj1bjBtLPjAssepn-I-IYK1cxL7eAMMHDgmU,7234
-siat-3.2.25.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.25.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.25.dist-info/RECORD,,
+siat-3.2.30.dist-info/METADATA,sha256=zYx92U4_7j4-A4T0OGuZKkgwk8HFROhi0Wblv7L-w2E,7234
+siat-3.2.30.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.30.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.30.dist-info/RECORD,,