From 23e4ad897c969529b7fe10eaf8a5783f7eb0cfc3 Mon Sep 17 00:00:00 2001 From: technocreep Date: Mon, 27 May 2024 12:03:13 +0200 Subject: [PATCH] restored dataloader tests --- tests/unit/core/ensemble/test_RankEnsemble.py | 21 +++++----- tests/unit/tools/test_load_data.py | 42 +++++++------------ 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/tests/unit/core/ensemble/test_RankEnsemble.py b/tests/unit/core/ensemble/test_RankEnsemble.py index 5a4ea0330..3258fc18e 100644 --- a/tests/unit/core/ensemble/test_RankEnsemble.py +++ b/tests/unit/core/ensemble/test_RankEnsemble.py @@ -16,17 +16,16 @@ def get_proba_metric_dict(): return proba_dict, metric_dict -# TODO: uncomment when web loading is fixed -# def test_rank_ensemble_umd(get_proba_metric_dict): -# proba_dict, metric_dict = get_proba_metric_dict -# -# ensembler_umd = RankEnsemble(dataset_name='UMD', -# proba_dict=proba_dict, -# metric_dict=metric_dict) -# result = ensembler_umd.ensemble() -# -# assert result['Base_metric'] == 0.993 -# assert result['Base_model'] == 'fedot_preset' +def test_rank_ensemble_umd(get_proba_metric_dict): + proba_dict, metric_dict = get_proba_metric_dict + + ensembler_umd = RankEnsemble(dataset_name='UMD', + proba_dict=proba_dict, + metric_dict=metric_dict) + result = ensembler_umd.ensemble() + + assert result['Base_metric'] == 0.993 + assert result['Base_model'] == 'fedot_preset' def test__create_models_rank_dict(get_proba_metric_dict): diff --git a/tests/unit/tools/test_load_data.py b/tests/unit/tools/test_load_data.py index 49a80339e..04675fff0 100644 --- a/tests/unit/tools/test_load_data.py +++ b/tests/unit/tools/test_load_data.py @@ -2,6 +2,7 @@ import numpy as np import pandas as pd +import pytest from fedot_ind.api.utils.path_lib import PROJECT_PATH from fedot_ind.tools.loader import DataLoader @@ -19,39 +20,28 @@ def test_init_loader(): def test_load_multivariate_data(): - # TODO: get back to loading from web when it is fixed - # train_data, test_data = DataLoader('Epilepsy').load_data() - - # delete when loading from web is fixed - path_folder = os.path.join(PROJECT_PATH, 'tests', 'data', 'datasets') - train_data, test_data = DataLoader( - 'Blink', folder=path_folder).load_data() # remove folder=path_folder also + train_data, test_data = DataLoader('Epilepsy').load_data() x_train, y_train = train_data x_test, y_test = test_data - assert x_train.shape == (500, 4, 510) - assert x_test.shape == (450, 4, 510) - assert y_train.shape == (500,) - assert y_test.shape == (450,) + assert x_train.shape == (137, 3) + assert x_test.shape == (138, 3) + assert y_train.shape == (137,) + assert y_test.shape == (138,) def test_load_univariate_data(): - # train_data, test_data = DataLoader('DodgerLoopDay').load_data() - - # delete when loading from web is fixed - path_folder = os.path.join(PROJECT_PATH, 'tests', 'data', 'datasets') - train_data, test_data = DataLoader('ItalyPowerDemand_tsv', # change to 'DodgerLoopDay' and adjust shapes below - folder=path_folder).load_data() # remove folder=path_folder also + train_data, test_data = DataLoader('DodgerLoopDay').load_data() x_train, y_train = train_data x_test, y_test = test_data - assert x_train.shape == (67, 24) - assert x_test.shape == (67, 24) - assert y_train.shape == (67,) - assert y_test.shape == (67,) - -# TODO: uncomment when loading from web is fixed -# def test_load_fake_data(): -# with pytest.raises(FileNotFoundError): -# DataLoader('Fake').load_data() + assert x_train.shape == (78, 288) + assert x_test.shape == (80, 288) + assert y_train.shape == (78,) + assert y_test.shape == (80,) + + +def test_load_fake_data(): + with pytest.raises(FileNotFoundError): + DataLoader('Fake').load_data() def test__load_from_tsfile_to_dataframe():