From fc72b3816db55d7f3e16c6f65c68980c4fea4e34 Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Fri, 1 May 2020 09:31:11 -0400
Subject: [PATCH] Random state in tests
---
summit/multiview_platform/utils/dataset.py | 2 +-
summit/tests/test_utils/test_dataset.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/summit/multiview_platform/utils/dataset.py b/summit/multiview_platform/utils/dataset.py
index 168903bd..953bcb16 100644
--- a/summit/multiview_platform/utils/dataset.py
+++ b/summit/multiview_platform/utils/dataset.py
@@ -644,7 +644,7 @@ class HDF5Dataset(Dataset):
def get_name(self):
"""Ony works if there are not multiple dots in the files name"""
- return self.dataset.filename.split('/')[-1].split('.')[0]
+ return os.path.split(self.dataset.filename)[-1].split('.')[0]
def is_just_number(string):
diff --git a/summit/tests/test_utils/test_dataset.py b/summit/tests/test_utils/test_dataset.py
index f8b64e05..67750428 100644
--- a/summit/tests/test_utils/test_dataset.py
+++ b/summit/tests/test_utils/test_dataset.py
@@ -204,10 +204,10 @@ class Test_Dataset(unittest.TestCase):
def test_check_selected_label_names(self):
dataset_object = dataset.HDF5Dataset(hdf5_file=self.dataset_file)
names = dataset_object.check_selected_label_names(
- nb_labels=2, random_state=self.rs)
- self.assertEqual(names, ["1", "0"])
+ nb_labels=2, random_state=np.random.RandomState(42))
+ self.assertEqual(names, ["0", "1"])
names = dataset_object.check_selected_label_names(selected_label_names=['0', '2'],
- random_state=self.rs)
+ random_state=np.random.RandomState(42))
self.assertEqual(names, ["0", "2"])
def test_select_views_and_labels(self):
@@ -234,9 +234,9 @@ class Test_Dataset(unittest.TestCase):
names = dataset_object.select_views_and_labels(
nb_labels=2,
view_names=["ViewN0"],
- random_state=self.rs,
+ random_state=np.random.RandomState(42),
path_for_new=tmp_path)
- self.assertEqual(names, {0: '2', 1: '1'})
+ self.assertEqual(names, {0: '0', 1: '1'})
self.assertEqual(dataset_object.nb_view, 1)
dataset_object.dataset.close()
os.remove(os.path.join(tmp_path, "test_filter_temp_filter.hdf5"))
--
GitLab