diff --git a/config_jingbo.py b/config_jingbo.py index 8af6963..161f7ad 100644 --- a/config_jingbo.py +++ b/config_jingbo.py @@ -364,7 +364,7 @@ table_name = 'v_tbl_crude_oil_warning' # 开关 -is_train = True # 是否训练 +is_train = False # 是否训练 is_debug = False # 是否调试 is_eta = True # 是否使用eta接口 is_market = True # 是否通过市场信息平台获取特征 ,在is_eta 为true 的情况下生效 diff --git a/lib/dataread.py b/lib/dataread.py index 24506f6..aa1f21a 100644 --- a/lib/dataread.py +++ b/lib/dataread.py @@ -875,6 +875,13 @@ def datachuli(df_zhibiaoshuju, df_zhibiaoliebiao, datecol='date', end_time='', y dataset, '特征处理后的指标名称及分类.csv'), index=False) # 数据频度分析 featurePindu(dataset=dataset) + + # 原油最高最低价列误删重新拼接,后面更新最高价最低价用,计算准确率用 + if 'Brentzgj' not in df.columns and 'Brentzgj' in df_zhibiaoliebiao.columns: + df['Brentzgj'] = df_zhibiaoliebiao['Brentzgj'] + if 'Brentzdj' not in df.columns and 'Brentzdj' in df_zhibiaoliebiao.columns: + df['Brentzdj'] = df_zhibiaoliebiao['Brentzdj'] + # 向上填充 df = df.ffill() # 向下填充 @@ -972,7 +979,6 @@ def zhoududatachuli(df_zhibiaoshuju, df_zhibiaoliebiao, datecol='date', end_time return df - def datachuli_juxiting(df_zhibiaoshuju, df_zhibiaoliebiao, datecol='date', end_time='', y='y', dataset='dataset', delweekenday=False, add_kdj=False, is_timefurture=False): ''' 聚烯烃特征数据处理函数, @@ -1141,7 +1147,7 @@ def yuedudatachuli_shiyoujiaolvyong(df_zhibiaoshuju, df_zhibiaoliebiao, datecol= end=end_date, freq='M' # 每月最后一天 ) - + # 创建新DataFrame并合并 new_rows = pd.DataFrame({'ds': date_range}) df = pd.concat([new_rows, df]).sort_values('ds').reset_index(drop=True) @@ -1165,8 +1171,6 @@ def yuedudatachuli_shiyoujiaolvyong(df_zhibiaoshuju, df_zhibiaoliebiao, datecol= return df - - def getdata(filename, datecol='date', y='y', dataset='', add_kdj=False, is_timefurture=False, end_time=''): config.logger.info('getdata接收:'+filename+' '+datecol+' '+end_time) # 判断后缀名 csv或excel diff --git a/main_yuanyou.py b/main_yuanyou.py index 3a9fe0d..d98512d 100644 --- a/main_yuanyou.py +++ b/main_yuanyou.py @@ -294,15 +294,15 @@ def predict_main(): logger.info(f'要更新y的信息:{update_y}') # try: for row in update_y.itertuples(index=False): - try: - row_dict = row._asdict() - yy = df[df['ds'] == row_dict['ds']]['y'].values[0] - LOW = df[df['ds'] == row_dict['ds']]['Brentzdj'].values[0] - HIGH = df[df['ds'] == row_dict['ds']]['Brentzgj'].values[0] - sqlitedb.update_data( - 'accuracy', f"y = {yy},LOW_PRICE = {LOW},HIGH_PRICE = {HIGH}", where_condition=f"ds = '{row_dict['ds']}'") - except: - logger.info(f'更新accuracy表的y值失败:{row_dict}') + # try: + row_dict = row._asdict() + yy = df[df['ds'] == row_dict['ds']]['y'].values[0] + LOW = df[df['ds'] == row_dict['ds']]['Brentzdj'].values[0] + HIGH = df[df['ds'] == row_dict['ds']]['Brentzgj'].values[0] + sqlitedb.update_data( + 'accuracy', f"y = {yy},LOW_PRICE = {LOW},HIGH_PRICE = {HIGH}", where_condition=f"ds = '{row_dict['ds']}'") + # except: + # logger.info(f'更新accuracy表的y值失败:{row_dict}') # except Exception as e: # logger.info(f'更新accuracy表的y值失败:{e}') diff --git a/main_yuanyou_yuedu.py b/main_yuanyou_yuedu.py index 68160f2..43be498 100644 --- a/main_yuanyou_yuedu.py +++ b/main_yuanyou_yuedu.py @@ -19,6 +19,7 @@ global_config.update({ 'is_update_report': is_update_report, 'settings': settings, 'bdwdname': bdwdname, + 'columnsrename': columnsrename, # 模型参数