From acdc19a3534391a370da674001fd7e81eb64a28a Mon Sep 17 00:00:00 2001
From: Dominique BENIELLI <dominique.benielli@univ-amu.fr>
Date: Mon, 14 Oct 2019 14:46:22 +0200
Subject: [PATCH] 71 test passed
---
.../weighted_linear_early_fusion.py | 7 +++++--
multiview_platform/tests/__init__.py | 1 +
multiview_platform/tests/test_ExecClassif.py | 2 +-
.../tests/test_mono_view/test_ExecClassifMonoView.py | 6 +++---
.../tests/test_mono_view/test_MonoviewUtils.py | 2 +-
.../test_additions/test_diversity_utils.py | 6 +++---
.../test_difficulty_fusion.py | 2 +-
.../test_multiview_classifiers/test_disagree_fusion.py | 2 +-
.../test_double_fault_fusion.py | 2 +-
.../test_multiview_classifiers/test_entropy_fusion.py | 2 +-
.../test_weighted_linear_early_fusion.py | 2 +-
.../tests/test_utils/test_GetMultiviewDB.py | 5 +++--
.../tests/test_utils/test_configuration.py | 8 +++++---
multiview_platform/tests/test_utils/test_dataset.py | 5 ++---
multiview_platform/tests/test_utils/test_execution.py | 10 +++++-----
.../tests/test_utils/test_hyper_parameter_search.py | 9 +++++----
multiview_platform/tests/test_utils/test_multiclass.py | 4 ++--
17 files changed, 41 insertions(+), 34 deletions(-)
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 aa86a71b..66cbdf29 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 3fd5c6b4..b7887f59 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 c3c8b6c3..abbcd77f 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 1e1625ae..8b245793 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 a68c710a..bdbbcf26 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 a7dd8797..8e1f77d2 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 b49eb1f6..ff298b8c 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 3ae051fa..bb08e016 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 3a0b7f6f..7e6fd3d7 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 765a0b79..dc88bfcc 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 65541a03..c8660752 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 1f1c3b0a..a61bfbf3 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 5e487e76..2d2b9f41 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 381dca70..dcfcb353 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 3a351de1..14e064e3 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 4917c207..b5dfe409 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 52cac2a3..f4ffbad9 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,
--
GitLab