From bc04dbcde5c9293c67c444c35e1ddf046f30bf34 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 16 Aug 2023 10:36:18 +0300 Subject: [PATCH 1/4] Fix path to data --- cases/multi_target_levels_forecasting.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cases/multi_target_levels_forecasting.py b/cases/multi_target_levels_forecasting.py index 602582dc78..316d12f2c9 100644 --- a/cases/multi_target_levels_forecasting.py +++ b/cases/multi_target_levels_forecasting.py @@ -7,6 +7,7 @@ from fedot.api.main import Fedot from fedot.core.data.data import InputData from fedot.core.data.data_split import train_test_data_setup +from fedot.core.utils import fedot_project_root warnings.filterwarnings('ignore') @@ -99,5 +100,5 @@ def run_multi_output_case(path, vis=False): if __name__ == '__main__': - path_file = './data/lena_levels/multi_sample.csv' + path_file = fedot_project_root() / 'cases/data/lena_levels/multi_sample.csv' run_multi_output_case(path_file, vis=True) From 14fa981d283807cd39f55e697d080c925fed1944 Mon Sep 17 00:00:00 2001 From: Sergey Kasyanov Date: Thu, 17 Aug 2023 14:47:13 +0300 Subject: [PATCH 2/4] Fix another tests --- cases/multi_ts_level_forecasting.py | 1 - test/integration/composer/test_history.py | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cases/multi_ts_level_forecasting.py b/cases/multi_ts_level_forecasting.py index 0db05a9575..b0b3fdfb7a 100644 --- a/cases/multi_ts_level_forecasting.py +++ b/cases/multi_ts_level_forecasting.py @@ -52,7 +52,6 @@ def run_multi_ts_forecast(forecast_length, is_multi_ts): pop_size=15, max_arity=4, cv_folds=None, - validation_blocks=None, initial_assumption=init_pipeline ) # fit model diff --git a/test/integration/composer/test_history.py b/test/integration/composer/test_history.py index 40eccc6570..7190a4bb0e 100644 --- a/test/integration/composer/test_history.py +++ b/test/integration/composer/test_history.py @@ -119,7 +119,9 @@ def test_collect_intermediate_metric(pipeline: Pipeline, input_data: InputData, metrics = [metric] data_source = DataSourceSplitter(validation_blocks=1).build(input_data) - objective_eval = PipelineObjectiveEvaluate(MetricsObjective(metrics), data_source) + objective_eval = PipelineObjectiveEvaluate(MetricsObjective(metrics), + data_source, + validation_blocks=1) dispatcher = MultiprocessingDispatcher(graph_gen_params.adapter) dispatcher.set_graph_evaluation_callback(objective_eval.evaluate_intermediate_metrics) evaluate = dispatcher.dispatch(objective_eval) From 88fdb6930b7eaf233fcf92976f4a5cab89f7c1db Mon Sep 17 00:00:00 2001 From: Sergey Kasyanov Date: Thu, 17 Aug 2023 15:11:44 +0300 Subject: [PATCH 3/4] Fix for pep --- cases/multi_ts_level_forecasting.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cases/multi_ts_level_forecasting.py b/cases/multi_ts_level_forecasting.py index b0b3fdfb7a..5518e233dc 100644 --- a/cases/multi_ts_level_forecasting.py +++ b/cases/multi_ts_level_forecasting.py @@ -1,7 +1,6 @@ import os import numpy as np -from matplotlib import pyplot as plt from sklearn.metrics import mean_absolute_error, mean_squared_error, mean_absolute_percentage_error from examples.simple.time_series_forecasting.ts_pipelines import ts_complex_ridge_smoothing_pipeline From 9b9b1cc7cccce9ed9f2bda48b687817f7a63c16b Mon Sep 17 00:00:00 2001 From: Sergey Kasyanov Date: Thu, 17 Aug 2023 15:37:35 +0300 Subject: [PATCH 4/4] Fixes --- test/integration/composer/test_history.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/integration/composer/test_history.py b/test/integration/composer/test_history.py index 7190a4bb0e..9987be5232 100644 --- a/test/integration/composer/test_history.py +++ b/test/integration/composer/test_history.py @@ -3,6 +3,8 @@ import numpy as np import pytest + +from fedot.core.repository.tasks import TaskTypesEnum from golem.core.dag.graph import Graph from golem.core.optimisers.fitness import SingleObjFitness from golem.core.optimisers.genetic.evaluation import MultiprocessingDispatcher @@ -118,10 +120,11 @@ def test_collect_intermediate_metric(pipeline: Pipeline, input_data: InputData, graph_gen_params = get_pipeline_generation_params() metrics = [metric] - data_source = DataSourceSplitter(validation_blocks=1).build(input_data) + validation_blocks = 1 if input_data.task.task_type is TaskTypesEnum.ts_forecasting else None + data_source = DataSourceSplitter(validation_blocks=validation_blocks).build(input_data) objective_eval = PipelineObjectiveEvaluate(MetricsObjective(metrics), data_source, - validation_blocks=1) + validation_blocks=validation_blocks) dispatcher = MultiprocessingDispatcher(graph_gen_params.adapter) dispatcher.set_graph_evaluation_callback(objective_eval.evaluate_intermediate_metrics) evaluate = dispatcher.dispatch(objective_eval)