diff --git a/multiview_platform/mono_multi_view_classifiers/__init__.py b/multiview_platform/mono_multi_view_classifiers/__init__.py index bc67607717be8c5dbd47cebdb5b9d31ede486341..9e2c30f3a193aff8b3a8c59f345c15dcff74c7ed 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 b38a276f6420eca9a64120d9cc07fe455b754e10..a91c51983934ed2ff1e7d4e51514cf61132097dc 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 7773f1dcec38f4aba808ec6fc8bd8aa806af1230..07cf0a7b2790efb3847b4895a5f1abb7e9c58a9c 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 5d33140d74fcc69a88e8590e7510c3bc20a30b0d..007f9f009fce9beaf2877243ade81dfb86374d14 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 8119d49d7195a60791dbc61792b1274d8dbab4d9..b8459c144e15702c25f6e01a4418aabed408b6a3 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 7773f1dcec38f4aba808ec6fc8bd8aa806af1230..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..07cf0a7b2790efb3847b4895a5f1abb7e9c58a9c --- /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 4ff796b42e8e710cb6d61a65663e63c6dc333a58..035bd22f350071864b7ee03ee2e122106b6c0059 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 45e795d300e0e14811b3216e3baa1a494b918262..bb9fd7705bad32bf53c4e5588f49d0e3846065b9 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 7773f1dcec38f4aba808ec6fc8bd8aa806af1230..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..07cf0a7b2790efb3847b4895a5f1abb7e9c58a9c --- /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 fceafcf644567a919eaffc5038d70f805edf4b6e..a08e48073057376daf7e0545a4bac8d6a454d07d 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 b7e23f0190c1157ab68c6b67ae97d3283df821ed..f111304ec1a97d3f03b21250b681f0da2c1c7be3 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 7773f1dcec38f4aba808ec6fc8bd8aa806af1230..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..07cf0a7b2790efb3847b4895a5f1abb7e9c58a9c --- /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 3e83eff5c1eac7ad258daae3dbb5b9c7a27373ec..eb467c8f9c8684a02fbd42d69c33cb1001ad2820 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 7ce56d5cfbfa0cafef78ff23bb9f16f014271871..dc8665a06cb54657c49364482cfdcdbc046ca244 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 7773f1dcec38f4aba808ec6fc8bd8aa806af1230..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..07cf0a7b2790efb3847b4895a5f1abb7e9c58a9c --- /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 202c5b697d47664bcc3ed2220b4b5f00c8d731f5..fce28aa3a7727ea6998ab5f0f2e2b61f31ada922 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 7773f1dcec38f4aba808ec6fc8bd8aa806af1230..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..07cf0a7b2790efb3847b4895a5f1abb7e9c58a9c --- /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 f1ba71576cf52fa5e37a975d302fa5f0d1bbc569..0f8d47a0e70080f0e3db6dc2957ad10dad0079a2 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 d7ba82d2382483982fc174401ae6d9f51e19f301..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..70b11657f805e88568cc261a543a3a65f55abbab --- /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 0b66dca798c8fdcd4fc43494565e8030194042da..d6773304b2c117c67cdf8399b4840a4e54f76f03 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 7773f1dcec38f4aba808ec6fc8bd8aa806af1230..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..07cf0a7b2790efb3847b4895a5f1abb7e9c58a9c --- /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 fa26a47e736cdcace540f1befbc7358a875ad0e3..441593f5a8ac8355e875541de463464be005e47c 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 de258fddc484f7524ff388a5c3318e44be176a9f..9c24cff6b94af2fbf7baf6d10dd5691e03d05586 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 d2e84d2da0deba4aa660c6e388430b7dd155b37b..dc281f5ad1eff49547acc2a31e112cd18be8d083 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 cbc84a26a9cb85558d908fdaea98be5a3d53f41c..373cb6296e83f56083e3ab22bcfebcc7a91258b1 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 4a014b4e41b99f707ca86ddbe8ef539c0488bc88..77c73435cd06300ab20809599e72e640cfbe4dc1 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 56b374513aba498c63f7c4f0c2728ab4e4c906c1..605c6ab82d27e83116ba5d584204063e1475d894 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 fc2e54bf6eb2ec3862a2ed1dd0d245616158fb44..3155ad23dc8a60774351e2fa017f442c1841b524 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 98520e2e790826534e2e5c2ccd684ebb7eff7086..1b70609141096f5d6d3870393cdffb2334a0a19b 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