简单修复了下bug

FinHackCN · Sep 10, 2024 · 1c22ed1 · 1c22ed1
1 parent 6a1fd50
commit 1c22ed1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/database/finhack_structure.sql b/database/finhack_structure.sql
@@ -255,4 +255,4 @@ CREATE TABLE `rqalpha` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2024-09-10  1:12:17
+-- Dump completed on 2024-09-11  2:06:05
diff --git a/finhack/factor/default/indicatorCompute.py b/finhack/factor/default/indicatorCompute.py
@@ -234,7 +234,7 @@ def computeListByStock(ts_code,list_name='all',where='',factor_list=None,c_list=
                 single_factors_path=SINGLE_FACTORS_DIR+factor_name+'.csv'
                 if os.path.isfile(single_factors_path):
                     has_csv=True
-                #df_factor没有此列，diff_date>100，且代码未发生变化，且存在csv
+                #df_factor没有此列，diff_date>100，且代码未发生变化，或不存在csv
                 if (not factor_name in df_factor.columns or diff_date>100 or has_csv==False) and (not factor_name in c_list):
                     # if not factor_name in df_all.columns:
                     if True:
@@ -243,7 +243,11 @@ def computeListByStock(ts_code,list_name='all',where='',factor_list=None,c_list=
                             df_all[factor_name]=np.nan
                         else:
                             df_all=df_all_tmp
-
+                    # print(factor_name)
+                    # print(df_all)
+
+
+
                 #否则计算250日数据
                 else:
                     if df_250 is None or isinstance(df_250, bool):
@@ -254,6 +258,9 @@ def computeListByStock(ts_code,list_name='all',where='',factor_list=None,c_list=
 
 
 
+            # print(df_all)
+            # exit()
+
             if(first_time):
                 df_factor=df_all
             else:
@@ -346,12 +353,16 @@ def computeListByStock(ts_code,list_name='all',where='',factor_list=None,c_list=
 
     #计算单个股票单个因子
     def computeFactorByStock(ts_code,factor_name,df_price=pd.DataFrame(),where='',db='tushare'):
+
+
         if(df_price.empty):
             df_price=AStock.getStockDailyPriceByCode(code=ts_code,where=where,db='tushare')
             #df_result=df_price.copy()
         if(df_price.empty):
             return pd.DataFrame()
 
+        if factor_name in df_price.columns:
+            return df_price
 
         indicators,func_name,code,return_fileds=indicatorCompute.getFactorInfo(factor_name)
 
@@ -455,6 +466,8 @@ def computeFactorByStock(ts_code,factor_name,df_price=pd.DataFrame(),where='',db
         #print(suffix)
         #exit()
 
+
+
         #如果返回多列，则需要同样进行shift计算
         if True:
             for f in rlist:
@@ -472,9 +485,10 @@ def computeFactorByStock(ts_code,factor_name,df_price=pd.DataFrame(),where='',db
                     #print("f=%s,fs=%s" %(f,factor_name))
         #print(len(df.columns))
 
+        # print("hint")
         # print(factor_name)
         # print(df)
-
+        #exit()
         del df_price
         del func
         return df

diff --git a/finhack/factor/default/taskRunner.py b/finhack/factor/default/taskRunner.py
@@ -27,19 +27,13 @@ def runTask(task_list):
         if True:
             for factor_list_name in task_list:
                 #factor列表
-
                 if os.path.exists(CONFIG_DIR+"/factorlist/indicatorlist/"+factor_list_name):
 
                     with open(CONFIG_DIR+"/factorlist/indicatorlist/"+factor_list_name, 'r', encoding='utf-8') as f:
                         factor_list=[_.rstrip('\n') for _ in f.readlines()]
-                    #print(factor_list)
                     indicatorCompute.computeList(list_name=factor_list_name,factor_list=factor_list,c_list=c_list)
 
-
-
-            #continue
             #alpha列表
-
             for factor_list_name in task_list:
                 if os.path.exists(CONFIG_DIR+"/factorlist/alphalist/"+factor_list_name):
                     with open(CONFIG_DIR+"/factorlist/alphalist/"+factor_list_name, 'r', encoding='utf-8') as f:
@@ -51,9 +45,8 @@ def runTask(task_list):
                                 i=i+1
                                 alpha_name=factor_list_name+'_'+str(i).zfill(3)
                                 mytask=pool.submit(alphaEngine.calc,factor,pd.DataFrame(),alpha_name,False,True)
-                                
+
                                 #alphaEngine.calc(factor,pd.DataFrame(),alpha_name)
-                                #exit()
         os.system('mv '+CACHE_DIR+'/single_factors_tmp2/* '+SINGLE_FACTORS_DIR)
         factorPkl.save()
 

diff --git a/finhack/widgets/templates/empty_project/data/config/factorlist/indicatorlist/test b/finhack/widgets/templates/empty_project/data/config/factorlist/indicatorlist/test
@@ -0,0 +1,9 @@
+UPPER_0
+MIDDLE_0
+LOWER
+DEMA_0
+EMA_90_0
+HTTRENDLINE_0
+MACD
+MACDSIGNAL_0
+MACDHIST