From cfa4e58b24006289bdff9ef1b4974f8766305955 Mon Sep 17 00:00:00 2001 From: Sergey Kasyanov Date: Fri, 1 Sep 2023 16:13:06 +0300 Subject: [PATCH] Fix' --- fedot/api/api_utils/assumptions/task_assumptions.py | 6 ++++++ fedot/core/pipelines/ts_wrappers.py | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fedot/api/api_utils/assumptions/task_assumptions.py b/fedot/api/api_utils/assumptions/task_assumptions.py index 09477ed565..a1fbcc0a2c 100644 --- a/fedot/api/api_utils/assumptions/task_assumptions.py +++ b/fedot/api/api_utils/assumptions/task_assumptions.py @@ -58,6 +58,7 @@ def builders(self): PipelineBuilder() .add_branch('polyfit', 'lagged') .grow_branches(None, 'ridge') +<<<<<<< Updated upstream <<<<<<< Updated upstream .join_branches('ridge'), 'smoothing_ar': @@ -68,6 +69,8 @@ def builders(self): .add_branch('gru', 'lagged') ======= <<<<<<< Updated upstream +======= +>>>>>>> Stashed changes .join_branches('ridge') ======= .join_branches('ridge'), @@ -75,6 +78,9 @@ def builders(self): PipelineBuilder() .add_sequence('lagged', 'gru') >>>>>>> Stashed changes +<<<<<<< Updated upstream +>>>>>>> Stashed changes +======= >>>>>>> Stashed changes } diff --git a/fedot/core/pipelines/ts_wrappers.py b/fedot/core/pipelines/ts_wrappers.py index d88bc0e30c..e7ee919af7 100644 --- a/fedot/core/pipelines/ts_wrappers.py +++ b/fedot/core/pipelines/ts_wrappers.py @@ -92,7 +92,6 @@ def in_sample_ts_forecast(pipeline, input_data: Union[InputData, MultiModalData] f" and data length {input_data.idx.shape[0]}")) final_forecast = np.zeros((number_of_iterations, forecast_length)) - is_multimodal = isinstance(input_data, MultiModalData) for i in range(number_of_iterations): data = input_data.slice(-(i + 1) * forecast_length, -i * forecast_length if i != 0 else None,