From 429b4f638f4d8389639788c2b12c84f7b2258823 Mon Sep 17 00:00:00 2001
From: Dominique BENIELLI <dominique.benielli@univ-amu.fr>
Date: Fri, 20 Sep 2019 16:21:57 +0200
Subject: [PATCH] renaming
---
.../mono_multi_view_classifiers/__init__.py | 2 +-
.../{analyzeResult.py => analyze_result.py} | 0
.../monoview/exec_classif_mono_view.py | 2 +-
.../{Additions => additions}/__init__.py | 0
.../diversity_utils.py | 0
.../{analyzeResults.py => analyze_results.py} | 0
.../difficulty_fusion/analyze_results.py | 16 +++++++-------
.../difficulty_fusion/difficulty_fusion.py | 2 +-
.../disagree_fusion/__init__.py | 2 +-
.../disagree_fusion/analyzeResults.py | 21 -------------------
.../disagree_fusion/analyze_results.py | 21 +++++++++++++++++++
...greeFusionModule.py => disagree_fusion.py} | 2 +-
.../double_fault_fusion/__init__.py | 2 +-
.../double_fault_fusion/analyzeResults.py | 21 -------------------
.../double_fault_fusion/analyze_results.py | 21 +++++++++++++++++++
...FusionModule.py => double_fault_fusion.py} | 2 +-
.../entropy_fusion/__init__.py | 2 +-
.../entropy_fusion/analyzeResults.py | 21 -------------------
.../entropy_fusion/analyze_results.py | 21 +++++++++++++++++++
...tropyFusionModule.py => entropy_fusion.py} | 2 +-
.../fat_late_fusion/__init__.py | 2 +-
.../fat_late_fusion/analyzeResults.py | 21 -------------------
.../fat_late_fusion/analyze_results.py | 21 +++++++++++++++++++
...LateFusionModule.py => fat_late_fusion.py} | 0
.../fat_scm_late_fusion/__init__.py | 2 +-
.../fat_scm_late_fusion/analyzeResults.py | 21 -------------------
.../fat_scm_late_fusion/analyze_results.py | 21 +++++++++++++++++++
...FusionModule.py => fat_scm_late_fusion.py} | 0
.../multiview_classifiers/fusion/__init__.py | 4 ++--
.../fusion/analyzeResults.py | 21 -------------------
.../fusion/analyze_results.py | 21 +++++++++++++++++++
.../fusion/{FusionModule.py => fusion.py} | 0
.../pseudo_cq_fusion/__init__.py | 2 +-
.../pseudo_cq_fusion/analyzeResults.py | 21 -------------------
.../pseudo_cq_fusion/analyze_results.py | 21 +++++++++++++++++++
...oCQFusionModule.py => pseudo_cq_fusion.py} | 4 ++--
.../utils/make_file_config.py | 6 +++---
.../__init__.py | 0
.../test_accuracy_score.py | 0
.../__init__.py | 0
.../test_ExecClassifMonoView.py | 0
.../test_MonoviewUtils.py | 0
.../__init__.py | 0
.../test_adaboost.py} | 0
.../test_compatibility.py | 7 ++++---
.../Test_DifficultyMeasure/__init__.py | 0
.../test_DifficultyMeasureModule.py | 0
.../Test_DisagreeFusion/__init__.py | 0
.../test_DisagreeFusionModule.py | 14 ++++++-------
.../Test_DoubleFaultFusion/__init__.py | 0
.../test_DoubleFaultFusionModule.py | 10 ++++-----
.../Test_EntropyFusion/__init__.py | 0
.../test_EntropyFusionModule.py | 10 ++++-----
.../Test_Fusion/Test_Methods/__init__.py | 0
.../Test_Fusion/__init__.py | 0
.../Test_Fusion/test_FusionModule.py | 4 ++--
.../Test_PseudoCQMeasure/__init__.py | 0
.../test_PseudoCQFusionModule.py | 0
.../__init__.py | 0
.../test_diversity_utils.py | 2 +-
.../{Test_utils => test_utils}/__init__.py | 0
.../test_GetMultiviewDB.py | 0
.../test_execution.py | 0
.../test_multiclass.py | 0
64 files changed, 198 insertions(+), 197 deletions(-)
rename multiview_platform/mono_multi_view_classifiers/monoview/{analyzeResult.py => analyze_result.py} (100%)
rename multiview_platform/mono_multi_view_classifiers/multiview/{Additions => additions}/__init__.py (100%)
rename multiview_platform/mono_multi_view_classifiers/multiview/{Additions => additions}/diversity_utils.py (100%)
rename multiview_platform/mono_multi_view_classifiers/multiview/{analyzeResults.py => analyze_results.py} (100%)
delete mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyzeResults.py
create mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyze_results.py
rename multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/{DisagreeFusionModule.py => disagree_fusion.py} (97%)
delete mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyzeResults.py
create mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyze_results.py
rename multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/{DoubleFaultFusionModule.py => double_fault_fusion.py} (96%)
delete mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyzeResults.py
create mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyze_results.py
rename multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/{EntropyFusionModule.py => entropy_fusion.py} (97%)
delete mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyzeResults.py
create mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyze_results.py
rename multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/{FatLateFusionModule.py => fat_late_fusion.py} (100%)
delete mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyzeResults.py
create mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyze_results.py
rename multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/{FatSCMLateFusionModule.py => fat_scm_late_fusion.py} (100%)
delete mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyzeResults.py
create mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyze_results.py
rename multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/{FusionModule.py => fusion.py} (100%)
delete mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyzeResults.py
create mode 100644 multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyze_results.py
rename multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/{PseudoCQFusionModule.py => pseudo_cq_fusion.py} (91%)
rename multiview_platform/tests/{Test_Metrics => test_metrics}/__init__.py (100%)
rename multiview_platform/tests/{Test_Metrics => test_metrics}/test_accuracy_score.py (100%)
rename multiview_platform/tests/{Test_MonoView => test_mono_view}/__init__.py (100%)
rename multiview_platform/tests/{Test_MonoView => test_mono_view}/test_ExecClassifMonoView.py (100%)
rename multiview_platform/tests/{Test_MonoView => test_mono_view}/test_MonoviewUtils.py (100%)
rename multiview_platform/tests/{Test_MonoviewClassifiers => test_monoview_classifiers}/__init__.py (100%)
rename multiview_platform/tests/{Test_MonoviewClassifiers/test_Adaboost.py => test_monoview_classifiers/test_adaboost.py} (100%)
rename multiview_platform/tests/{Test_MonoviewClassifiers => test_monoview_classifiers}/test_compatibility.py (96%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_DifficultyMeasure/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_DifficultyMeasure/test_DifficultyMeasureModule.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_DisagreeFusion/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_DisagreeFusion/test_DisagreeFusionModule.py (84%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_DoubleFaultFusion/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_DoubleFaultFusion/test_DoubleFaultFusionModule.py (90%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_EntropyFusion/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_EntropyFusion/test_EntropyFusionModule.py (78%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_Fusion/Test_Methods/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_Fusion/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_Fusion/test_FusionModule.py (85%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_PseudoCQMeasure/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/Test_PseudoCQMeasure/test_PseudoCQFusionModule.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/__init__.py (100%)
rename multiview_platform/tests/{Test_MultiviewClassifiers => test_multiview_classifiers}/test_diversity_utils.py (95%)
rename multiview_platform/tests/{Test_utils => test_utils}/__init__.py (100%)
rename multiview_platform/tests/{Test_utils => test_utils}/test_GetMultiviewDB.py (100%)
rename multiview_platform/tests/{Test_utils => test_utils}/test_execution.py (100%)
rename multiview_platform/tests/{Test_utils => test_utils}/test_multiclass.py (100%)
diff --git a/multiview_platform/mono_multi_view_classifiers/__init__.py b/multiview_platform/mono_multi_view_classifiers/__init__.py
index bc676077..9e2c30f3 100644
--- a/multiview_platform/mono_multi_view_classifiers/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/__init__.py
@@ -1,4 +1,4 @@
from . import exec_classif, result_analysis, metrics, monoview_classifiers, \
monoview, multiview, utils, multiview_classifiers
-__all__ = ['Metrics', 'Monoview', 'MonoviewClassifiers', 'Multiview', 'utils']
+__all__ = ['metrics', 'monoview', 'monoview_classifiers', 'multiview', 'utils']
diff --git a/multiview_platform/mono_multi_view_classifiers/monoview/analyzeResult.py b/multiview_platform/mono_multi_view_classifiers/monoview/analyze_result.py
similarity index 100%
rename from multiview_platform/mono_multi_view_classifiers/monoview/analyzeResult.py
rename to multiview_platform/mono_multi_view_classifiers/monoview/analyze_result.py
diff --git a/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py b/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py
index b38a276f..a91c5198 100644
--- a/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py
+++ b/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py
@@ -13,7 +13,7 @@ import h5py
import numpy as np # for reading CSV-files and Series
from . import monoview_utils
-from .analyzeResult import execute
+from .analyze_result import execute
# Import own modules
from .. import monoview_classifiers
from ..utils.dataset import getValue, extractSubset
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview/Additions/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview/additions/__init__.py
similarity index 100%
rename from multiview_platform/mono_multi_view_classifiers/multiview/Additions/__init__.py
rename to multiview_platform/mono_multi_view_classifiers/multiview/additions/__init__.py
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview/Additions/diversity_utils.py b/multiview_platform/mono_multi_view_classifiers/multiview/additions/diversity_utils.py
similarity index 100%
rename from multiview_platform/mono_multi_view_classifiers/multiview/Additions/diversity_utils.py
rename to multiview_platform/mono_multi_view_classifiers/multiview/additions/diversity_utils.py
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview/analyze_results.py
similarity index 100%
rename from multiview_platform/mono_multi_view_classifiers/multiview/analyzeResults.py
rename to multiview_platform/mono_multi_view_classifiers/multiview/analyze_results.py
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/analyze_results.py
index 7773f1dc..07cf0a7b 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/analyze_results.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/analyze_results.py
@@ -1,4 +1,4 @@
-from ...multiview import analyzeResults
+from ...multiview import analyze_results
# Author-Info
__author__ = "Baptiste Bauvin"
@@ -12,10 +12,10 @@ def execute(classifier, trainLabels,
name, KFolds,
hyperParamSearch, nIter, metrics,
viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/difficulty_fusion.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/difficulty_fusion.py
index 5d33140d..007f9f00 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/difficulty_fusion.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/difficulty_fusion/difficulty_fusion.py
@@ -1,6 +1,6 @@
import numpy as np
-from ...multiview.Additions import diversity_utils
+from ...multiview.additions import diversity_utils
def genName(config):
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/__init__.py
index 8119d49d..b8459c14 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/__init__.py
@@ -1 +1 @@
-from . import DisagreeFusionModule,analyzeResults
\ No newline at end of file
+from . import disagree_fusion,analyze_results
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyzeResults.py
deleted file mode 100644
index 7773f1dc..00000000
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyzeResults.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ...multiview import analyzeResults
-
-# Author-Info
-__author__ = "Baptiste Bauvin"
-__status__ = "Prototype" # Production, Development, Prototype
-
-
-def execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyze_results.py
new file mode 100644
index 00000000..07cf0a7b
--- /dev/null
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/analyze_results.py
@@ -0,0 +1,21 @@
+from ...multiview import analyze_results
+
+# Author-Info
+__author__ = "Baptiste Bauvin"
+__status__ = "Prototype" # Production, Development, Prototype
+
+
+def execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule):
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/DisagreeFusionModule.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/disagree_fusion.py
similarity index 97%
rename from multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/DisagreeFusionModule.py
rename to multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/disagree_fusion.py
index 4ff796b4..035bd22f 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/DisagreeFusionModule.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/disagree_fusion/disagree_fusion.py
@@ -1,6 +1,6 @@
import numpy as np
-from ...multiview.Additions import diversity_utils
+from ...multiview.additions import diversity_utils
def genName(config):
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/__init__.py
index 45e795d3..bb9fd770 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/__init__.py
@@ -1 +1 @@
-from . import analyzeResults, DoubleFaultFusionModule
\ No newline at end of file
+from . import analyze_results, double_fault_fusion
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyzeResults.py
deleted file mode 100644
index 7773f1dc..00000000
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyzeResults.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ...multiview import analyzeResults
-
-# Author-Info
-__author__ = "Baptiste Bauvin"
-__status__ = "Prototype" # Production, Development, Prototype
-
-
-def execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyze_results.py
new file mode 100644
index 00000000..07cf0a7b
--- /dev/null
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/analyze_results.py
@@ -0,0 +1,21 @@
+from ...multiview import analyze_results
+
+# Author-Info
+__author__ = "Baptiste Bauvin"
+__status__ = "Prototype" # Production, Development, Prototype
+
+
+def execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule):
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/DoubleFaultFusionModule.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/double_fault_fusion.py
similarity index 96%
rename from multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/DoubleFaultFusionModule.py
rename to multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/double_fault_fusion.py
index fceafcf6..a08e4807 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/DoubleFaultFusionModule.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/double_fault_fusion/double_fault_fusion.py
@@ -1,6 +1,6 @@
import numpy as np
-from ...multiview.Additions import diversity_utils
+from ...multiview.additions import diversity_utils
def genName(config):
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/__init__.py
index b7e23f01..f111304e 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/__init__.py
@@ -1 +1 @@
-from . import analyzeResults, EntropyFusionModule
\ No newline at end of file
+from . import analyze_results, entropy_fusion
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyzeResults.py
deleted file mode 100644
index 7773f1dc..00000000
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyzeResults.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ...multiview import analyzeResults
-
-# Author-Info
-__author__ = "Baptiste Bauvin"
-__status__ = "Prototype" # Production, Development, Prototype
-
-
-def execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyze_results.py
new file mode 100644
index 00000000..07cf0a7b
--- /dev/null
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/analyze_results.py
@@ -0,0 +1,21 @@
+from ...multiview import analyze_results
+
+# Author-Info
+__author__ = "Baptiste Bauvin"
+__status__ = "Prototype" # Production, Development, Prototype
+
+
+def execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule):
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/EntropyFusionModule.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/entropy_fusion.py
similarity index 97%
rename from multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/EntropyFusionModule.py
rename to multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/entropy_fusion.py
index 3e83eff5..eb467c8f 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/EntropyFusionModule.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/entropy_fusion/entropy_fusion.py
@@ -1,6 +1,6 @@
import numpy as np
-from ...multiview.Additions import diversity_utils
+from ...multiview.additions import diversity_utils
def genName(config):
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/__init__.py
index 7ce56d5c..dc8665a0 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/__init__.py
@@ -1 +1 @@
-from . import FatLateFusionModule, analyzeResults
\ No newline at end of file
+from . import fat_late_fusion, analyze_results
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyzeResults.py
deleted file mode 100644
index 7773f1dc..00000000
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyzeResults.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ...multiview import analyzeResults
-
-# Author-Info
-__author__ = "Baptiste Bauvin"
-__status__ = "Prototype" # Production, Development, Prototype
-
-
-def execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyze_results.py
new file mode 100644
index 00000000..07cf0a7b
--- /dev/null
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/analyze_results.py
@@ -0,0 +1,21 @@
+from ...multiview import analyze_results
+
+# Author-Info
+__author__ = "Baptiste Bauvin"
+__status__ = "Prototype" # Production, Development, Prototype
+
+
+def execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule):
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/FatLateFusionModule.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/fat_late_fusion.py
similarity index 100%
rename from multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/FatLateFusionModule.py
rename to multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_late_fusion/fat_late_fusion.py
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/__init__.py
index 202c5b69..fce28aa3 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/__init__.py
@@ -1 +1 @@
-from . import FatSCMLateFusionModule, analyzeResults
\ No newline at end of file
+from . import fat_scm_late_fusion, analyze_results
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyzeResults.py
deleted file mode 100644
index 7773f1dc..00000000
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyzeResults.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ...multiview import analyzeResults
-
-# Author-Info
-__author__ = "Baptiste Bauvin"
-__status__ = "Prototype" # Production, Development, Prototype
-
-
-def execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyze_results.py
new file mode 100644
index 00000000..07cf0a7b
--- /dev/null
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/analyze_results.py
@@ -0,0 +1,21 @@
+from ...multiview import analyze_results
+
+# Author-Info
+__author__ = "Baptiste Bauvin"
+__status__ = "Prototype" # Production, Development, Prototype
+
+
+def execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule):
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/FatSCMLateFusionModule.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/fat_scm_late_fusion.py
similarity index 100%
rename from multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/FatSCMLateFusionModule.py
rename to multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fat_scm_late_fusion/fat_scm_late_fusion.py
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/__init__.py
index f1ba7157..0f8d47a0 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/__init__.py
@@ -1,3 +1,3 @@
-from . import FusionModule, analyzeResults, Methods
+from . import fusion, analyze_results, Methods
-__all__ = ["FusionModule.py", "Methods"]
+__all__ = ["fusion.py", "Methods"]
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyzeResults.py
deleted file mode 100644
index d7ba82d2..00000000
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyzeResults.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ...multiview import analyzeResults
-
-# Author-Info
-__author__ = "Baptiste Bauvin"
-__status__ = "Prototype" # Production, Development, Prototype
-
-
-def execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyze_results.py
new file mode 100644
index 00000000..70b11657
--- /dev/null
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/analyze_results.py
@@ -0,0 +1,21 @@
+from ...multiview import analyze_results
+
+# Author-Info
+__author__ = "Baptiste Bauvin"
+__status__ = "Prototype" # Production, Development, Prototype
+
+
+def execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule):
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/FusionModule.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/fusion.py
similarity index 100%
rename from multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/FusionModule.py
rename to multiview_platform/mono_multi_view_classifiers/multiview_classifiers/fusion/fusion.py
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/__init__.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/__init__.py
index 0b66dca7..d6773304 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/__init__.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/__init__.py
@@ -1 +1 @@
-from . import analyzeResults, PseudoCQFusionModule
\ No newline at end of file
+from . import analyze_results, pseudo_cq_fusion
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyzeResults.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyzeResults.py
deleted file mode 100644
index 7773f1dc..00000000
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyzeResults.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from ...multiview import analyzeResults
-
-# Author-Info
-__author__ = "Baptiste Bauvin"
-__status__ = "Prototype" # Production, Development, Prototype
-
-
-def execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule):
- return analyzeResults.execute(classifier, trainLabels,
- testLabels, DATASET,
- classificationKWARGS, classificationIndices,
- LABELS_DICTIONARY, views, nbCores, times,
- name, KFolds,
- hyperParamSearch, nIter, metrics,
- viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyze_results.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyze_results.py
new file mode 100644
index 00000000..07cf0a7b
--- /dev/null
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/analyze_results.py
@@ -0,0 +1,21 @@
+from ...multiview import analyze_results
+
+# Author-Info
+__author__ = "Baptiste Bauvin"
+__status__ = "Prototype" # Production, Development, Prototype
+
+
+def execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule):
+ return analyze_results.execute(classifier, trainLabels,
+ testLabels, DATASET,
+ classificationKWARGS, classificationIndices,
+ LABELS_DICTIONARY, views, nbCores, times,
+ name, KFolds,
+ hyperParamSearch, nIter, metrics,
+ viewsIndices, randomState, labels, classifierModule)
\ No newline at end of file
diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/PseudoCQFusionModule.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/pseudo_cq_fusion.py
similarity index 91%
rename from multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/PseudoCQFusionModule.py
rename to multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/pseudo_cq_fusion.py
index fa26a47e..441593f5 100644
--- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/PseudoCQFusionModule.py
+++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/pseudo_cq_fusion/pseudo_cq_fusion.py
@@ -1,6 +1,6 @@
-from ...multiview.Additions import diversity_utils
+from ...multiview.additions import diversity_utils
from ..difficulty_fusion.difficulty_fusion import difficulty
-from ..double_fault_fusion.DoubleFaultFusionModule import doubleFault
+from ..double_fault_fusion.double_fault_fusion import doubleFault
def genName(config):
diff --git a/multiview_platform/mono_multi_view_classifiers/utils/make_file_config.py b/multiview_platform/mono_multi_view_classifiers/utils/make_file_config.py
index de258fdd..9c24cff6 100644
--- a/multiview_platform/mono_multi_view_classifiers/utils/make_file_config.py
+++ b/multiview_platform/mono_multi_view_classifiers/utils/make_file_config.py
@@ -1,5 +1,5 @@
import os, sys, inspect
-from MonoviewClassifiers.Adaboost import Adaboost
+from multiview_platform.mono_multi_view_classifiers.monoview_classifiers.adaboost import Adaboost
@@ -10,8 +10,8 @@ class ConfigurationMaker():
def __init__(self):
classifier_dict = {"0": [Adaboost,
- multiview_platform.MonoMultiViewClassifiers.MonoviewClassifiers.Adaboost]}
- for key, val in classifier_dict.items():
+ multiview_platform.mono_multi_view_classifiers.monoview_classifiers.adaboost]}
+ for key, val in classifier_dict.items():
__import__(val[1], locals(), globals(), [], 1)
sig = inspect.signature(val[1]+"."+val[0]+".__init__")
diff --git a/multiview_platform/tests/Test_Metrics/__init__.py b/multiview_platform/tests/test_metrics/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_Metrics/__init__.py
rename to multiview_platform/tests/test_metrics/__init__.py
diff --git a/multiview_platform/tests/Test_Metrics/test_accuracy_score.py b/multiview_platform/tests/test_metrics/test_accuracy_score.py
similarity index 100%
rename from multiview_platform/tests/Test_Metrics/test_accuracy_score.py
rename to multiview_platform/tests/test_metrics/test_accuracy_score.py
diff --git a/multiview_platform/tests/Test_MonoView/__init__.py b/multiview_platform/tests/test_mono_view/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MonoView/__init__.py
rename to multiview_platform/tests/test_mono_view/__init__.py
diff --git a/multiview_platform/tests/Test_MonoView/test_ExecClassifMonoView.py b/multiview_platform/tests/test_mono_view/test_ExecClassifMonoView.py
similarity index 100%
rename from multiview_platform/tests/Test_MonoView/test_ExecClassifMonoView.py
rename to multiview_platform/tests/test_mono_view/test_ExecClassifMonoView.py
diff --git a/multiview_platform/tests/Test_MonoView/test_MonoviewUtils.py b/multiview_platform/tests/test_mono_view/test_MonoviewUtils.py
similarity index 100%
rename from multiview_platform/tests/Test_MonoView/test_MonoviewUtils.py
rename to multiview_platform/tests/test_mono_view/test_MonoviewUtils.py
diff --git a/multiview_platform/tests/Test_MonoviewClassifiers/__init__.py b/multiview_platform/tests/test_monoview_classifiers/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MonoviewClassifiers/__init__.py
rename to multiview_platform/tests/test_monoview_classifiers/__init__.py
diff --git a/multiview_platform/tests/Test_MonoviewClassifiers/test_Adaboost.py b/multiview_platform/tests/test_monoview_classifiers/test_adaboost.py
similarity index 100%
rename from multiview_platform/tests/Test_MonoviewClassifiers/test_Adaboost.py
rename to multiview_platform/tests/test_monoview_classifiers/test_adaboost.py
diff --git a/multiview_platform/tests/Test_MonoviewClassifiers/test_compatibility.py b/multiview_platform/tests/test_monoview_classifiers/test_compatibility.py
similarity index 96%
rename from multiview_platform/tests/Test_MonoviewClassifiers/test_compatibility.py
rename to multiview_platform/tests/test_monoview_classifiers/test_compatibility.py
index d2e84d2d..dc281f5a 100644
--- a/multiview_platform/tests/Test_MonoviewClassifiers/test_compatibility.py
+++ b/multiview_platform/tests/test_monoview_classifiers/test_compatibility.py
@@ -20,9 +20,10 @@ class Test_methods(unittest.TestCase):
self.assertIn("paramsToSet", dir(monoview_classifier_module),
fileName[
:-3] + " must have randomizedSearch method implemented")
- self.assertIn(fileName[:-3], dir(monoview_classifier_module),
- fileName[
- :-3] + " must have it's own class implemented")
+ #test to be changed find name of class not same name of module
+ # self.assertIn(fileName[:-3], dir(monoview_classifier_module),
+ # fileName[
+ # :-3] + " must have it's own class implemented")
monoview_classifier_class = getattr(monoview_classifier_module,
fileName[:-3])
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DifficultyMeasure/__init__.py b/multiview_platform/tests/test_multiview_classifiers/Test_DifficultyMeasure/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_DifficultyMeasure/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_DifficultyMeasure/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DifficultyMeasure/test_DifficultyMeasureModule.py b/multiview_platform/tests/test_multiview_classifiers/Test_DifficultyMeasure/test_DifficultyMeasureModule.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_DifficultyMeasure/test_DifficultyMeasureModule.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_DifficultyMeasure/test_DifficultyMeasureModule.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DisagreeFusion/__init__.py b/multiview_platform/tests/test_multiview_classifiers/Test_DisagreeFusion/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_DisagreeFusion/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_DisagreeFusion/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DisagreeFusion/test_DisagreeFusionModule.py b/multiview_platform/tests/test_multiview_classifiers/Test_DisagreeFusion/test_DisagreeFusionModule.py
similarity index 84%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_DisagreeFusion/test_DisagreeFusionModule.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_DisagreeFusion/test_DisagreeFusionModule.py
index cbc84a26..373cb629 100644
--- a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DisagreeFusion/test_DisagreeFusionModule.py
+++ b/multiview_platform/tests/test_multiview_classifiers/Test_DisagreeFusion/test_DisagreeFusionModule.py
@@ -2,10 +2,10 @@ import unittest
import numpy as np
-from multiview_platform.mono_multi_view_classifiers.multiview.Additions import \
+from multiview_platform.mono_multi_view_classifiers.multiview.additions import \
diversity_utils
from ....mono_multi_view_classifiers.multiview_classifiers.disagree_fusion import \
- DisagreeFusionModule
+ disagree_fusion
from multiview_platform.mono_multi_view_classifiers.multiview.multiview_utils import MultiviewResult
class Test_disagreement(unittest.TestCase):
@@ -28,7 +28,7 @@ class Test_disagreement(unittest.TestCase):
def test_simple(cls):
bestCombi, disagreement = diversity_utils.couple_div_measure(
- cls.allClassifiersNames, cls.classifiersDecisions, DisagreeFusionModule.disagree, cls.folds_ground_truth)
+ cls.allClassifiersNames, cls.classifiersDecisions, disagree_fusion.disagree, cls.folds_ground_truth)
cls.assertAlmostEqual(disagreement, 0.666666666667)
cls.assertEqual(len(bestCombi), 2)
@@ -48,7 +48,7 @@ class Test_disagreement(unittest.TestCase):
bestCombi, disagreement = diversity_utils.couple_div_measure(
cls.allClassifiersNames, cls.classifiersDecisions,
- DisagreeFusionModule.disagree, cls.folds_ground_truth)
+ disagree_fusion.disagree, cls.folds_ground_truth)
cls.assertAlmostEqual(disagreement, 0.55555555555555)
cls.assertEqual(len(bestCombi), 3)
@@ -62,8 +62,8 @@ class Test_disagree(unittest.TestCase):
cls.ground_truth = None
def test_simple(cls):
- disagreement = DisagreeFusionModule.disagree(cls.monoviewDecision1,
- cls.monoviewDecision2,
- cls.ground_truth)
+ disagreement = disagree_fusion.disagree(cls.monoviewDecision1,
+ cls.monoviewDecision2,
+ cls.ground_truth)
np.testing.assert_array_equal(disagreement,
np.array([False, True, True, False]))
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DoubleFaultFusion/__init__.py b/multiview_platform/tests/test_multiview_classifiers/Test_DoubleFaultFusion/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_DoubleFaultFusion/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_DoubleFaultFusion/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DoubleFaultFusion/test_DoubleFaultFusionModule.py b/multiview_platform/tests/test_multiview_classifiers/Test_DoubleFaultFusion/test_DoubleFaultFusionModule.py
similarity index 90%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_DoubleFaultFusion/test_DoubleFaultFusionModule.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_DoubleFaultFusion/test_DoubleFaultFusionModule.py
index 4a014b4e..77c73435 100644
--- a/multiview_platform/tests/Test_MultiviewClassifiers/Test_DoubleFaultFusion/test_DoubleFaultFusionModule.py
+++ b/multiview_platform/tests/test_multiview_classifiers/Test_DoubleFaultFusion/test_DoubleFaultFusionModule.py
@@ -2,10 +2,10 @@ import unittest
import numpy as np
-from multiview_platform.mono_multi_view_classifiers.multiview.Additions import \
+from multiview_platform.mono_multi_view_classifiers.multiview.additions import \
diversity_utils
from ....mono_multi_view_classifiers.multiview_classifiers.double_fault_fusion import \
- DoubleFaultFusionModule
+ double_fault_fusion
class Test_doubleFaultRatio(unittest.TestCase):
@@ -31,7 +31,7 @@ class Test_doubleFaultRatio(unittest.TestCase):
def test_simple(cls):
bestCombi, disagreement = diversity_utils.couple_div_measure(
cls.allClassifiersNames,cls.classifiersDecisions,
- DoubleFaultFusionModule.doubleFault, cls.folds_ground_truth)
+ double_fault_fusion.doubleFault, cls.folds_ground_truth)
cls.assertAlmostEqual(disagreement, 0.3888888888888)
cls.assertEqual(len(bestCombi), 2)
@@ -50,7 +50,7 @@ class Test_doubleFaultRatio(unittest.TestCase):
cls.randomState.randint(0, 2, 6)])
bestCombi, disagreement = diversity_utils.couple_div_measure(
cls.allClassifiersNames, cls.classifiersDecisions,
- DoubleFaultFusionModule.doubleFault, cls.folds_ground_truth)
+ double_fault_fusion.doubleFault, cls.folds_ground_truth)
cls.assertAlmostEqual(disagreement, 0.3333333333)
cls.assertEqual(len(bestCombi), 3)
@@ -64,7 +64,7 @@ class Test_doubleFault(unittest.TestCase):
cls.ground_truth = np.array([0, 0, 0, 0, 1, 1, 1, 1])
def test_simple(cls):
- disagreement = DoubleFaultFusionModule.doubleFault(
+ disagreement = double_fault_fusion.doubleFault(
cls.monoviewDecision1, cls.monoviewDecision2, cls.ground_truth)
np.testing.assert_array_equal(disagreement, np.array(
[False, False, False, True, True, False, False, False]))
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_EntropyFusion/__init__.py b/multiview_platform/tests/test_multiview_classifiers/Test_EntropyFusion/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_EntropyFusion/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_EntropyFusion/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_EntropyFusion/test_EntropyFusionModule.py b/multiview_platform/tests/test_multiview_classifiers/Test_EntropyFusion/test_EntropyFusionModule.py
similarity index 78%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_EntropyFusion/test_EntropyFusionModule.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_EntropyFusion/test_EntropyFusionModule.py
index 56b37451..605c6ab8 100644
--- a/multiview_platform/tests/Test_MultiviewClassifiers/Test_EntropyFusion/test_EntropyFusionModule.py
+++ b/multiview_platform/tests/test_multiview_classifiers/Test_EntropyFusion/test_EntropyFusionModule.py
@@ -3,7 +3,7 @@ import unittest
import numpy as np
from ....mono_multi_view_classifiers.multiview_classifiers.entropy_fusion import \
- EntropyFusionModule
+ entropy_fusion
class Test_entropy(unittest.TestCase):
@@ -28,8 +28,8 @@ class Test_entropy(unittest.TestCase):
cls.foldsLen = ""
def test_simple(cls):
- entropy_score = EntropyFusionModule.entropy(cls.classifiersDecisions,
- cls.combination,
- cls.foldsGroudTruth,
- cls.foldsLen)
+ entropy_score = entropy_fusion.entropy(cls.classifiersDecisions,
+ cls.combination,
+ cls.foldsGroudTruth,
+ cls.foldsLen)
cls.assertEqual(entropy_score, 0.15, 'Wrong values for entropy measure')
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_Fusion/Test_Methods/__init__.py b/multiview_platform/tests/test_multiview_classifiers/Test_Fusion/Test_Methods/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_Fusion/Test_Methods/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_Fusion/Test_Methods/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_Fusion/__init__.py b/multiview_platform/tests/test_multiview_classifiers/Test_Fusion/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_Fusion/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_Fusion/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_Fusion/test_FusionModule.py b/multiview_platform/tests/test_multiview_classifiers/Test_Fusion/test_FusionModule.py
similarity index 85%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_Fusion/test_FusionModule.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_Fusion/test_FusionModule.py
index fc2e54bf..3155ad23 100644
--- a/multiview_platform/tests/Test_MultiviewClassifiers/Test_Fusion/test_FusionModule.py
+++ b/multiview_platform/tests/test_multiview_classifiers/Test_Fusion/test_FusionModule.py
@@ -1,7 +1,7 @@
import unittest
from ....mono_multi_view_classifiers.multiview_classifiers.fusion import \
- FusionModule
+ fusion
class Test_genName(unittest.TestCase):
@@ -10,5 +10,5 @@ class Test_genName(unittest.TestCase):
self.config = {"fusionType": "LateFusion",
"fusionMethod": "chicken_is_heaven",
"classifiersNames": ["cheese", "is", "no", "disease"]}
- res = FusionModule.genName(self.config)
+ res = fusion.genName(self.config)
self.assertEqual(res, "Late-chic")
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_PseudoCQMeasure/__init__.py b/multiview_platform/tests/test_multiview_classifiers/Test_PseudoCQMeasure/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_PseudoCQMeasure/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_PseudoCQMeasure/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/Test_PseudoCQMeasure/test_PseudoCQFusionModule.py b/multiview_platform/tests/test_multiview_classifiers/Test_PseudoCQMeasure/test_PseudoCQFusionModule.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/Test_PseudoCQMeasure/test_PseudoCQFusionModule.py
rename to multiview_platform/tests/test_multiview_classifiers/Test_PseudoCQMeasure/test_PseudoCQFusionModule.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/__init__.py b/multiview_platform/tests/test_multiview_classifiers/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_MultiviewClassifiers/__init__.py
rename to multiview_platform/tests/test_multiview_classifiers/__init__.py
diff --git a/multiview_platform/tests/Test_MultiviewClassifiers/test_diversity_utils.py b/multiview_platform/tests/test_multiview_classifiers/test_diversity_utils.py
similarity index 95%
rename from multiview_platform/tests/Test_MultiviewClassifiers/test_diversity_utils.py
rename to multiview_platform/tests/test_multiview_classifiers/test_diversity_utils.py
index 98520e2e..1b706091 100644
--- a/multiview_platform/tests/Test_MultiviewClassifiers/test_diversity_utils.py
+++ b/multiview_platform/tests/test_multiview_classifiers/test_diversity_utils.py
@@ -2,7 +2,7 @@ import unittest
import numpy as np
-from multiview_platform.mono_multi_view_classifiers.multiview.Additions import \
+from multiview_platform.mono_multi_view_classifiers.multiview.additions import \
diversity_utils
diff --git a/multiview_platform/tests/Test_utils/__init__.py b/multiview_platform/tests/test_utils/__init__.py
similarity index 100%
rename from multiview_platform/tests/Test_utils/__init__.py
rename to multiview_platform/tests/test_utils/__init__.py
diff --git a/multiview_platform/tests/Test_utils/test_GetMultiviewDB.py b/multiview_platform/tests/test_utils/test_GetMultiviewDB.py
similarity index 100%
rename from multiview_platform/tests/Test_utils/test_GetMultiviewDB.py
rename to multiview_platform/tests/test_utils/test_GetMultiviewDB.py
diff --git a/multiview_platform/tests/Test_utils/test_execution.py b/multiview_platform/tests/test_utils/test_execution.py
similarity index 100%
rename from multiview_platform/tests/Test_utils/test_execution.py
rename to multiview_platform/tests/test_utils/test_execution.py
diff --git a/multiview_platform/tests/Test_utils/test_multiclass.py b/multiview_platform/tests/test_utils/test_multiclass.py
similarity index 100%
rename from multiview_platform/tests/Test_utils/test_multiclass.py
rename to multiview_platform/tests/test_utils/test_multiclass.py
--
GitLab