style: rename tsv/csv reading function in tests, tidy up

aimclub · Sep 23, 2024 · cb22381 · cb22381
1 parent 4fd8bde
commit cb22381
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/fedot_ind/tools/loader.py b/fedot_ind/tools/loader.py
@@ -179,7 +179,7 @@ def read_train_test_files(self, data_path, dataset_name: str, shuffle: bool = Tr
         return is_multivariate, (x_train, y_train), (x_test, y_test)
 
     @staticmethod
-    def predict_encoding(file_path: Path, n_lines: int = 20) -> str:
+    def predict_encoding(file_path: str, n_lines: int = 20) -> str:
         with Path(file_path).open('rb') as f:
             rawdata = b''.join([f.readline() for _ in range(n_lines)])
         return chardet.detect(rawdata)['encoding']
@@ -835,8 +835,8 @@ def load_process_data(path_to_dataset, sep):
         if mode not in ['tsv', 'csv']:
             raise ValueError(f'Invalid mode {mode}. Should be one of "tsv" or "csv"')
         separator = '/t' if mode == 'tsv' else ','
-        x_train, y_train = load_process_data(dataset_dir + f'{dataset_name}_TRAIN.{mode}', separator)
-        x_test, y_test = load_process_data(dataset_dir + f'{dataset_name}_TEST.{mode}', separator)
+        x_train, y_train = load_process_data(dataset_dir + f'/{dataset_name}_TRAIN.{mode}', separator)
+        x_test, y_test = load_process_data(dataset_dir + f'/{dataset_name}_TEST.{mode}', separator)
 
         return x_train, y_train, x_test, y_test
 

diff --git a/tests/unit/tools/test_load_data.py b/tests/unit/tools/test_load_data.py
@@ -131,7 +131,7 @@ def test_read_tsv():
     path = '.'
     loader = DataLoader(dataset_name=ds_name, folder=path)
     path = os.path.join(PROJECT_PATH, 'tests', 'data', 'datasets')
-    x_train, y_train, x_test, y_test = loader.read_tsv(
+    x_train, y_train, x_test, y_test = loader.read_tsv_or_csv(
         dataset_name='ItalyPowerDemand_tsv', data_path=path)
 
     for i in [x_train, y_train, x_test, y_test]: