|
|
@@ -38,7 +38,7 @@ def forecast_data_distribution(pre_data, args):
|
|
|
def model_prediction(df, args):
|
|
|
# 新增日出、日落时间参数
|
|
|
howLongAgo, farm_id, target, cap, col_radiance, radiance_max, model_name, col_time = int(args['howLongAgo']), args['farm_id'], \
|
|
|
- args['target'], args['cap'], args['col_radiance'], args['radiance_max'], args['model_name'], args['col_time']
|
|
|
+ args['target'], float(args['cap']), args['col_radiance'], args['radiance_max'], args['model_name'], args['col_time']
|
|
|
df['power_forecast'] = round(df[col_radiance]*cap/radiance_max, 2)
|
|
|
df.loc[df['power_forecast'] < 0, 'power_forecast'] = 0
|
|
|
if 'sunrise_time' in args:
|
