diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/weighted_linear_early_fusion.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/weighted_linear_early_fusion.py index aa86a71bab433060d0f8c010048058192b332510..66cbdf292bc55025056d997d22bac4c5dfbad36f 100644 --- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/weighted_linear_early_fusion.py +++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/weighted_linear_early_fusion.py @@ -2,10 +2,13 @@ import numpy as np import inspect # from ..utils.dataset import get_v -from ..multiview.multiview_utils import BaseMultiviewClassifier, get_examples_views_indices, ConfigGenerator, get_available_monoview_classifiers +from multiview_platform.mono_multi_view_classifiers.multiview.multiview_utils import BaseMultiviewClassifier +from multiview_platform.mono_multi_view_classifiers.multiview.multiview_utils import get_examples_views_indices +from multiview_platform.mono_multi_view_classifiers.multiview.multiview_utils import ConfigGenerator +from multiview_platform.mono_multi_view_classifiers.multiview.multiview_utils import get_available_monoview_classifiers -from .. import monoview_classifiers +from multiview_platform.mono_multi_view_classifiers import monoview_classifiers classifier_class_name = "WeightedLinearEarlyFusion" diff --git a/multiview_platform/tests/__init__.py b/multiview_platform/tests/__init__.py index 3fd5c6b4ff2b4d4fa0a02e0647991fb2e204bf8d..b7887f5996bd1484d567e919608c364fe9a64c63 100644 --- a/multiview_platform/tests/__init__.py +++ b/multiview_platform/tests/__init__.py @@ -1 +1,2 @@ from . import test_ExecClassif +from .utils import rm_tmp, gen_test_dataset, tmp_path \ No newline at end of file diff --git a/multiview_platform/tests/test_ExecClassif.py b/multiview_platform/tests/test_ExecClassif.py index c3c8b6c355f351a2b000e8dc68e9cc5961c0cc83..abbcd77f933e6c9f49dc74213388551bbe85e61d 100644 --- a/multiview_platform/tests/test_ExecClassif.py +++ b/multiview_platform/tests/test_ExecClassif.py @@ -4,7 +4,7 @@ import unittest import h5py import numpy as np -from .utils import rm_tmp, tmp_path, test_dataset +from multiview_platform.tests.utils import rm_tmp, tmp_path, test_dataset from multiview_platform.mono_multi_view_classifiers import exec_classif diff --git a/multiview_platform/tests/test_mono_view/test_ExecClassifMonoView.py b/multiview_platform/tests/test_mono_view/test_ExecClassifMonoView.py index 1e1625ae0e293c550ad53e625eecc8796d440522..8b24579332aec06011ba54094b0a2a1841a0cb5e 100644 --- a/multiview_platform/tests/test_mono_view/test_ExecClassifMonoView.py +++ b/multiview_platform/tests/test_mono_view/test_ExecClassifMonoView.py @@ -5,10 +5,10 @@ import h5py import numpy as np from sklearn.model_selection import StratifiedKFold -from ..utils import rm_tmp, tmp_path +from multiview_platform.tests.utils import rm_tmp, tmp_path -from ...mono_multi_view_classifiers.monoview import exec_classif_mono_view -from ...mono_multi_view_classifiers.monoview_classifiers import decision_tree +from multiview_platform.mono_multi_view_classifiers.monoview import exec_classif_mono_view +from multiview_platform.mono_multi_view_classifiers.monoview_classifiers import decision_tree class Test_initConstants(unittest.TestCase): diff --git a/multiview_platform/tests/test_mono_view/test_MonoviewUtils.py b/multiview_platform/tests/test_mono_view/test_MonoviewUtils.py index a68c710a446bf09dbee7acc542564a775423b3b7..bdbbcf262d3e1c309fe24f2cf90cb53f940fd37c 100644 --- a/multiview_platform/tests/test_mono_view/test_MonoviewUtils.py +++ b/multiview_platform/tests/test_mono_view/test_MonoviewUtils.py @@ -4,7 +4,7 @@ import numpy as np from sklearn.model_selection import StratifiedKFold from sklearn.tree.tree import DecisionTreeClassifier -from ...mono_multi_view_classifiers.monoview import monoview_utils +from multiview_platform.mono_multi_view_classifiers.monoview import monoview_utils class Test_genTestFoldsPreds(unittest.TestCase): diff --git a/multiview_platform/tests/test_multiview_classifiers/test_additions/test_diversity_utils.py b/multiview_platform/tests/test_multiview_classifiers/test_additions/test_diversity_utils.py index a7dd8797d18f7b5ce6e9d0c11bcd22de5881f0b9..8e1f77d22fb7544aa53ceafb32a848e30eac261a 100644 --- a/multiview_platform/tests/test_multiview_classifiers/test_additions/test_diversity_utils.py +++ b/multiview_platform/tests/test_multiview_classifiers/test_additions/test_diversity_utils.py @@ -1,7 +1,7 @@ import unittest import numpy as np -from ....mono_multi_view_classifiers.multiview_classifiers.additions import diversity_utils +import multiview_platform.mono_multi_view_classifiers.multiview_classifiers.additions.diversity_utils as du class FakeDataset(): @@ -19,7 +19,7 @@ class FakeDataset(): return np.unique(self.labels[example_indices]) -class FakeDivCoupleClf(diversity_utils.CoupleDiversityFusionClassifier): +class FakeDivCoupleClf(du.CoupleDiversityFusionClassifier): def __init__(self, rs, classifier_names=None, classifiers_config=None, monoview_estimators=None): @@ -33,7 +33,7 @@ class FakeDivCoupleClf(diversity_utils.CoupleDiversityFusionClassifier): return self.rs.randint(0,100) -class FakeDivGlobalClf(diversity_utils.GlobalDiversityFusionClassifier): +class FakeDivGlobalClf(du.GlobalDiversityFusionClassifier): def __init__(self, rs, classifier_names=None, classifiers_config=None, monoview_estimators=None): diff --git a/multiview_platform/tests/test_multiview_classifiers/test_difficulty_fusion.py b/multiview_platform/tests/test_multiview_classifiers/test_difficulty_fusion.py index b49eb1f61389a4c3eb7b63b768bc9ec81dcf9ac6..ff298b8c07ed5a8225f27885ad911b935bbd17ba 100644 --- a/multiview_platform/tests/test_multiview_classifiers/test_difficulty_fusion.py +++ b/multiview_platform/tests/test_multiview_classifiers/test_difficulty_fusion.py @@ -2,7 +2,7 @@ import unittest import numpy as np -from ...mono_multi_view_classifiers.multiview_classifiers import difficulty_fusion +from multiview_platform.mono_multi_view_classifiers.multiview_classifiers import difficulty_fusion class Test_difficulty_fusion(unittest.TestCase): diff --git a/multiview_platform/tests/test_multiview_classifiers/test_disagree_fusion.py b/multiview_platform/tests/test_multiview_classifiers/test_disagree_fusion.py index 3ae051fa653f7e2ad132087682cc3fef4996f5f6..bb08e016e5ea75ac78f373ead873e8721eea31e3 100644 --- a/multiview_platform/tests/test_multiview_classifiers/test_disagree_fusion.py +++ b/multiview_platform/tests/test_multiview_classifiers/test_disagree_fusion.py @@ -3,7 +3,7 @@ import numpy as np import unittest # -from ...mono_multi_view_classifiers.multiview_classifiers import disagree_fusion +from multiview_platform.mono_multi_view_classifiers.multiview_classifiers import disagree_fusion class Test_disagree(unittest.TestCase): diff --git a/multiview_platform/tests/test_multiview_classifiers/test_double_fault_fusion.py b/multiview_platform/tests/test_multiview_classifiers/test_double_fault_fusion.py index 3a0b7f6f29edeb3ee196e7f9cb60309fec96f2b4..7e6fd3d70bd5ad84ec62aee0b3e00c8ec336cc34 100644 --- a/multiview_platform/tests/test_multiview_classifiers/test_double_fault_fusion.py +++ b/multiview_platform/tests/test_multiview_classifiers/test_double_fault_fusion.py @@ -2,7 +2,7 @@ import numpy as np import unittest -from ...mono_multi_view_classifiers.multiview_classifiers import double_fault_fusion +from multiview_platform.mono_multi_view_classifiers.multiview_classifiers import double_fault_fusion class Test_disagree(unittest.TestCase): diff --git a/multiview_platform/tests/test_multiview_classifiers/test_entropy_fusion.py b/multiview_platform/tests/test_multiview_classifiers/test_entropy_fusion.py index 765a0b793c0deab1687d540d565f7f17002b9f17..dc88bfcc3070b57707f4f8931a55ea1c337f468d 100644 --- a/multiview_platform/tests/test_multiview_classifiers/test_entropy_fusion.py +++ b/multiview_platform/tests/test_multiview_classifiers/test_entropy_fusion.py @@ -2,7 +2,7 @@ import unittest import numpy as np -from ...mono_multi_view_classifiers.multiview_classifiers import entropy_fusion +from multiview_platform.mono_multi_view_classifiers.multiview_classifiers import entropy_fusion class Test_difficulty_fusion(unittest.TestCase): diff --git a/multiview_platform/tests/test_multiview_classifiers/test_weighted_linear_early_fusion.py b/multiview_platform/tests/test_multiview_classifiers/test_weighted_linear_early_fusion.py index 65541a03c067f8e2a26e5367314b1fc89d7af9ed..c86607525dc958adf14907a8d3da190682a6adb8 100644 --- a/multiview_platform/tests/test_multiview_classifiers/test_weighted_linear_early_fusion.py +++ b/multiview_platform/tests/test_multiview_classifiers/test_weighted_linear_early_fusion.py @@ -3,7 +3,7 @@ import unittest import numpy as np import os -from ..utils import rm_tmp, tmp_path, test_dataset +from multiview_platform.tests.utils import rm_tmp, tmp_path, test_dataset from multiview_platform.mono_multi_view_classifiers.multiview_classifiers import \ weighted_linear_early_fusion diff --git a/multiview_platform/tests/test_utils/test_GetMultiviewDB.py b/multiview_platform/tests/test_utils/test_GetMultiviewDB.py index 1f1c3b0a3b6ba853dc421c98148d923635db2c6f..a61bfbf3d0e967b8d849893f52c3e7e5967d545e 100644 --- a/multiview_platform/tests/test_utils/test_GetMultiviewDB.py +++ b/multiview_platform/tests/test_utils/test_GetMultiviewDB.py @@ -4,8 +4,9 @@ import unittest import h5py import numpy as np -from ...mono_multi_view_classifiers.utils import get_multiview_db -from ..utils import rm_tmp, tmp_path, test_dataset +from multiview_platform.mono_multi_view_classifiers.utils import get_multiview_db +from multiview_platform.tests.utils import rm_tmp, tmp_path + class Test_get_classic_db_hdf5(unittest.TestCase): diff --git a/multiview_platform/tests/test_utils/test_configuration.py b/multiview_platform/tests/test_utils/test_configuration.py index 5e487e769c7dc6ecdb7753a3c61630d0c62d223f..2d2b9f41ca6c4a105ee063bb5c5cf21435aea3a7 100644 --- a/multiview_platform/tests/test_utils/test_configuration.py +++ b/multiview_platform/tests/test_utils/test_configuration.py @@ -3,17 +3,19 @@ import unittest import yaml import numpy as np -from ..utils import rm_tmp, tmp_path - +from multiview_platform.tests.utils import rm_tmp, tmp_path from multiview_platform.mono_multi_view_classifiers.utils import configuration + class Test_get_the_args(unittest.TestCase): @classmethod def setUpClass(cls): rm_tmp() cls.path_to_config_file = tmp_path+"config_temp.yml" - os.mkdir("./multiview_platform/tests/tmp_tests") + path_file = os.path.dirname(os.path.abspath(__file__)) + make_tmp_dir = os.path.join(path_file, "../tmp_tests") + os.mkdir(make_tmp_dir) data = {"Base":{"first_arg": 10, "second_arg":[12.5, 1e-06]}, "Classification":{"third_arg":True}} with open(cls.path_to_config_file, "w") as config_file: yaml.dump(data, config_file) diff --git a/multiview_platform/tests/test_utils/test_dataset.py b/multiview_platform/tests/test_utils/test_dataset.py index 381dca70e699c1383c0c50de5af172769fb41b26..dcfcb353d97ae45109c3f86c6a8d2e705f9d7207 100644 --- a/multiview_platform/tests/test_utils/test_dataset.py +++ b/multiview_platform/tests/test_utils/test_dataset.py @@ -3,9 +3,8 @@ import h5py import numpy as np import os -from ..utils import rm_tmp, tmp_path - -from ...mono_multi_view_classifiers.utils import dataset +from multiview_platform.tests.utils import rm_tmp, tmp_path +from multiview_platform.mono_multi_view_classifiers.utils import dataset class Test_Dataset(unittest.TestCase): diff --git a/multiview_platform/tests/test_utils/test_execution.py b/multiview_platform/tests/test_utils/test_execution.py index 3a351de12f7dfd5ac9846fb5fd68a96016b18599..14e064e393bb731cd42f9a37b0c01dcc197ae080 100644 --- a/multiview_platform/tests/test_utils/test_execution.py +++ b/multiview_platform/tests/test_utils/test_execution.py @@ -3,9 +3,9 @@ import unittest import numpy as np -from ..utils import rm_tmp, tmp_path +from multiview_platform.tests.utils import rm_tmp, tmp_path -from ...mono_multi_view_classifiers.utils import execution +from multiview_platform.mono_multi_view_classifiers.utils import execution class Test_parseTheArgs(unittest.TestCase): @@ -56,14 +56,14 @@ class Test_getDatabaseFunction(unittest.TestCase): def test_simple(cls): getDB = execution.get_database_function(cls.name, cls.type) - from ...mono_multi_view_classifiers.utils.get_multiview_db import \ + from multiview_platform.mono_multi_view_classifiers.utils.get_multiview_db import \ get_classic_db_csv cls.assertEqual(getDB, get_classic_db_csv) def test_hdf5(cls): cls.type = ".hdf5" getDB = execution.get_database_function(cls.name, cls.type) - from ...mono_multi_view_classifiers.utils.get_multiview_db import \ + from multiview_platform.mono_multi_view_classifiers.utils.get_multiview_db import \ get_classic_db_hdf5 cls.assertEqual(getDB, get_classic_db_hdf5) @@ -71,7 +71,7 @@ class Test_getDatabaseFunction(unittest.TestCase): cls.name = "plausible" cls.type = ".hdf5" getDB = execution.get_database_function(cls.name, cls.type) - from ...mono_multi_view_classifiers.utils.get_multiview_db import \ + from multiview_platform.mono_multi_view_classifiers.utils.get_multiview_db import \ get_plausible_db_hdf5 cls.assertEqual(getDB, get_plausible_db_hdf5) diff --git a/multiview_platform/tests/test_utils/test_hyper_parameter_search.py b/multiview_platform/tests/test_utils/test_hyper_parameter_search.py index 4917c207ce7e1cf87fbc080430df99225e306a38..b5dfe409c98f7ecc18ddeccf6eaca53216f53aed 100644 --- a/multiview_platform/tests/test_utils/test_hyper_parameter_search.py +++ b/multiview_platform/tests/test_utils/test_hyper_parameter_search.py @@ -4,12 +4,13 @@ import unittest import h5py import numpy as np from sklearn.model_selection import StratifiedKFold +from multiview_platform.tests.utils import rm_tmp, tmp_path -from ..utils import rm_tmp, tmp_path -from ...mono_multi_view_classifiers.utils.dataset import Dataset -from ...mono_multi_view_classifiers.utils import hyper_parameter_search -from ...mono_multi_view_classifiers.multiview_classifiers import weighted_linear_early_fusion +from multiview_platform.mono_multi_view_classifiers.utils.dataset import Dataset +from multiview_platform.mono_multi_view_classifiers.utils import hyper_parameter_search +from multiview_platform.mono_multi_view_classifiers.multiview_classifiers import weighted_linear_early_fusion + class Test_randomized_search(unittest.TestCase): diff --git a/multiview_platform/tests/test_utils/test_multiclass.py b/multiview_platform/tests/test_utils/test_multiclass.py index 52cac2a3c257d4e30903fe7e2ab313abe766cd57..f4ffbad929828fd04161f792366a5df1c4d6813d 100644 --- a/multiview_platform/tests/test_utils/test_multiclass.py +++ b/multiview_platform/tests/test_utils/test_multiclass.py @@ -2,7 +2,7 @@ import unittest import numpy as np -from ...mono_multi_view_classifiers.utils import multiclass +import multiview_platform.mono_multi_view_classifiers.utils.multiclass as mm class Test_genMulticlassLabels(unittest.TestCase): @@ -21,7 +21,7 @@ class Test_genMulticlassLabels(unittest.TestCase): cls.testIndices[1]]] def test_one_versus_one(cls): - multiclassLabels, labelsIndices, oldIndicesMulticlass = multiclass.gen_multiclass_labels( + multiclassLabels, labelsIndices, oldIndicesMulticlass = mm.gen_multiclass_labels( cls.labels, "oneVersusOne", cls.classification_indices) cls.assertEqual(len(multiclassLabels), 10) cls.assertEqual(labelsIndices,