原油画图边界判断20改为60

This commit is contained in:
liurui 2024-12-06 11:18:45 +08:00
parent 9812e92f52
commit 11630bfcce
2 changed files with 22 additions and 22 deletions

View File

@ -172,25 +172,25 @@ def predict_main():
row, col = df.shape
now = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
# ex_Model(df,
# horizon=horizon,
# input_size=input_size,
# train_steps=train_steps,
# val_check_steps=val_check_steps,
# early_stop_patience_steps=early_stop_patience_steps,
# is_debug=is_debug,
# dataset=dataset,
# is_train=is_train,
# is_fivemodels=is_fivemodels,
# val_size=val_size,
# test_size=test_size,
# settings=settings,
# now=now,
# etadata=etadata,
# modelsindex=modelsindex,
# data=data,
# is_eta=is_eta,
# )
ex_Model(df,
horizon=horizon,
input_size=input_size,
train_steps=train_steps,
val_check_steps=val_check_steps,
early_stop_patience_steps=early_stop_patience_steps,
is_debug=is_debug,
dataset=dataset,
is_train=is_train,
is_fivemodels=is_fivemodels,
val_size=val_size,
test_size=test_size,
settings=settings,
now=now,
etadata=etadata,
modelsindex=modelsindex,
data=data,
is_eta=is_eta,
)
logger.info('模型训练完成')

View File

@ -353,11 +353,11 @@ def model_losss(sqlitedb):
def find_most_common_model():
# 最多频率的模型名称
min_model_max_frequency_model = df_combined3['min_model'].tail(20).value_counts().idxmax()
max_model_max_frequency_model = df_combined3['max_model'].tail(20).value_counts().idxmax()
min_model_max_frequency_model = df_combined3['min_model'].tail(60).value_counts().idxmax()
max_model_max_frequency_model = df_combined3['max_model'].tail(60).value_counts().idxmax()
if min_model_max_frequency_model == max_model_max_frequency_model:
# 取20天第二多的模型
max_model_max_frequency_model = df_combined3['max_model'].tail(20).value_counts().nlargest(2).index[1]
max_model_max_frequency_model = df_combined3['max_model'].tail(60).value_counts().nlargest(2).index[1]
df_predict['min_model'] = min_model_max_frequency_model
df_predict['max_model'] = max_model_max_frequency_model