diff --git a/Code/Exec.py b/Code/Exec.py index ba70e864a7c10df699ee548354694b0c63dd7a46..f4a06d2f7762ee217f25f24f1b4722ccf60d05f1 100644 --- a/Code/Exec.py +++ b/Code/Exec.py @@ -1,5 +1,5 @@ import sys -from MonoMutliViewClassifiers.ExecClassif import execClassif +from MonoMutliViewClassifiers import ExecClassif -execClassif(sys.argv[1:]) +ExecClassif.execClassif(sys.argv[1:]) diff --git a/Code/MonoMutliViewClassifiers/ExecClassif.py b/Code/MonoMutliViewClassifiers/ExecClassif.py index a4b70ca03ef6cf9d2e537c77e76942f60d1ef8f5..ed53a1f44cdc6b682bb80671efcd7b87112929d9 100644 --- a/Code/MonoMutliViewClassifiers/ExecClassif.py +++ b/Code/MonoMutliViewClassifiers/ExecClassif.py @@ -14,7 +14,7 @@ import matplotlib import h5py # Import own modules -import Multiview +from . import Multiview # import Metrics import MonoviewClassifiers from Multiview.ExecMultiview import ExecMultiview, ExecMultiview_multicore diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py index 1624672405dc64b57c4ed100213169fa22048d7d..ba85738d0c229652055180e9b8ab65a5b774b78c 100644 --- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py +++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py @@ -1,10 +1,10 @@ from sklearn.ensemble import RandomForestClassifier from sklearn.pipeline import Pipeline from sklearn.model_selection import RandomizedSearchCV -import Metrics +from .. import Metrics from scipy.stats import randint import numpy as np -from utils.HyperParameterSearch import genHeatMaps +from ..utils.HyperParameterSearch import genHeatMaps # Author-Info __author__ = "Baptiste Bauvin" diff --git a/Code/MonoMutliViewClassifiers/Multiview/ExecMultiview.py b/Code/MonoMutliViewClassifiers/Multiview/ExecMultiview.py index a9d7bb3c7f648a2697d158fad806112b6d7c0b3f..544c36e9690ac66b7a5920006a7712c0a0e5e2f4 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/ExecMultiview.py +++ b/Code/MonoMutliViewClassifiers/Multiview/ExecMultiview.py @@ -11,9 +11,9 @@ import logging import time import h5py +from ..utils.Dataset import getShape +from ..utils import HyperParameterSearch import Multiview -from utils.Dataset import getShape -from utils.HyperParameterSearch import searchBestSettings # Author-Info __author__ = "Baptiste Bauvin" @@ -59,7 +59,7 @@ def ExecMultiview(directory, DATASET, name, classificationIndices, KFolds, nbCor analysisModule = getattr(classifierPackage, "analyzeResults") if hyperParamSearch != "None": - classifier = searchBestSettings(DATASET, CL_type, metrics, learningIndices, KFolds, randomState, + classifier = HyperParameterSearch.searchBestSettings(DATASET, classifierModule, CL_type, metrics, learningIndices, KFolds, randomState, viewsIndices=viewsIndices, searchingTool=hyperParamSearch, nIter=nIter, **classificationKWARGS) else: diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py index ebfa665de2a284a38b52571db0e20c511bc9b52c..fa282d9c58131534a5a8824c275c7b97b75f93aa 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py @@ -2,7 +2,7 @@ # -*- encoding: utf-8 import numpy as np -from utils.Dataset import getV +from ....utils.Dataset import getV class EarlyFusionClassifier(object): diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py index c2044a81974a0ef13dc86fe2302fb5dd0e5771f3..df9b88e99a5a5924bc07e86b3ba019fc963da727 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/LateFusion.py @@ -9,7 +9,7 @@ from joblib import Parallel, delayed import os import sys -import MonoviewClassifiers +from .... import MonoviewClassifiers import Metrics from utils.Dataset import getV diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py b/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py index 14fc273d5af819cb10e1b3fe021c20b2fe722871..3e8bbb5b50efbf9da3fec8ea8856c1066f3deb3e 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Classifiers/DecisionTree.py @@ -7,7 +7,7 @@ import logging # Add weights -import Metrics +from .... import Metrics class DecisionTree(BaseEstimator, ClassifierMixin): diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Mumbo.py b/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Mumbo.py index a6de51d69affff6fd3a78f64cbb7e7540d5c7c15..c79f4decc2f9a85d8a71dac92d5401ebd81c5a6d 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Mumbo.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Mumbo/Mumbo.py @@ -2,13 +2,13 @@ import numpy as np import math from joblib import Parallel, delayed import itertools -from Classifiers import * import time -import Classifiers import pkgutil import logging from sklearn.metrics import accuracy_score -from utils.Dataset import getV + +import Classifiers +from ...utils.Dataset import getV # Author-Info __author__ = "Baptiste Bauvin" diff --git a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/analyzeResults.py b/Code/MonoMutliViewClassifiers/Multiview/Mumbo/analyzeResults.py index 7a853245cb8d039dbcfc83e76a44a9885f51e12d..e26ff468f7b8530d6ab88c4f3a4657b8c4d910af 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Mumbo/analyzeResults.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Mumbo/analyzeResults.py @@ -6,11 +6,12 @@ matplotlib.use('Agg') import matplotlib.pyplot as plt import operator from datetime import timedelta as hms -import Mumbo -from Classifiers import * import logging -import Metrics -from utils.Dataset import getV, getShape + +# import Mumbo +# from Classifiers import * +from ... import Metrics +from ...utils.Dataset import getV, getShape # Author-Info __author__ = "Baptiste Bauvin" diff --git a/Code/MonoMutliViewClassifiers/Multiview/__init__.py b/Code/MonoMutliViewClassifiers/Multiview/__init__.py index 9ed7abb2569c1349da360979d46564c735752667..c08e37963c400c2db0d195d605ad24901cd23e4e 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/__init__.py +++ b/Code/MonoMutliViewClassifiers/Multiview/__init__.py @@ -1,2 +1,7 @@ -from . import GetMultiviewDb, Mumbo, Fusion, ExecMultiview +from . import GetMultiviewDb, ExecMultiview, Mumbo, Fusion + +# from . import ExecMultiview +# from . import Mumbo +# from . import Fusion + __all__ = ['Fusion', 'Mumbo'] diff --git a/Code/MonoMutliViewClassifiers/utils/Dataset.py b/Code/MonoMutliViewClassifiers/utils/Dataset.py index 0d4d324f092a892c759b9011ae95fd4bd92d6e17..1ce96122099018db9edb7c6669dbbc45887c0ba4 100644 --- a/Code/MonoMutliViewClassifiers/utils/Dataset.py +++ b/Code/MonoMutliViewClassifiers/utils/Dataset.py @@ -1,10 +1,10 @@ from scipy import sparse import numpy as np -import Multiview.GetMultiviewDb as DB import logging import os import sys import select +from ..Multiview import GetMultiviewDb as DB def getV(DATASET, viewIndex, usedIndices=None): diff --git a/Code/MonoMutliViewClassifiers/utils/HyperParameterSearch.py b/Code/MonoMutliViewClassifiers/utils/HyperParameterSearch.py index 97ad9403ee33dce4da8e28b251679998491719c9..ddb0b43459d18cf97153211b5317f37d06a7daaa 100644 --- a/Code/MonoMutliViewClassifiers/utils/HyperParameterSearch.py +++ b/Code/MonoMutliViewClassifiers/utils/HyperParameterSearch.py @@ -1,10 +1,10 @@ import numpy as np import sys -import Multiview -import Metrics import matplotlib.pyplot as plt import itertools +from .. import Metrics + def searchBestSettings(dataset, classifierName, metrics, iLearningIndices, iKFolds, randomState, viewsIndices=None, searchingTool="hyperParamSearch", nIter=1, **kwargs): @@ -22,7 +22,7 @@ def gridSearch(dataset, classifierName, viewsIndices=None, kFolds=None, nIter=1, pass -def randomizedSearch(dataset, classifierName, metrics, learningIndices, KFolds, randomState, viewsIndices=None, nIter=1, +def randomizedSearch(dataset, classifierPackage, classifierName, metrics, learningIndices, KFolds, randomState, viewsIndices=None, nIter=1, nbCores=1, **classificationKWARGS): if viewsIndices is None: viewsIndices = range(dataset.get("Metadata").attrs["nbView"]) @@ -32,7 +32,6 @@ def randomizedSearch(dataset, classifierName, metrics, learningIndices, KFolds, metricKWARGS = dict((index, metricConfig) for index, metricConfig in enumerate(metric[1])) else: metricKWARGS = {} - classifierPackage = getattr(Multiview, classifierName) # Permet d'appeler un module avec une string classifierModule = getattr(classifierPackage, classifierName) classifierClass = getattr(classifierModule, classifierName) if classifierName != "Mumbo": diff --git a/Code/MonoMutliViewClassifiers/utils/__init__.py b/Code/MonoMutliViewClassifiers/utils/__init__.py index a67257f2f22e67607cff5c76e441e3d43c12ec8c..842d824c6b28acf620ca3b31f973f2a924bd9415 100644 --- a/Code/MonoMutliViewClassifiers/utils/__init__.py +++ b/Code/MonoMutliViewClassifiers/utils/__init__.py @@ -1 +1 @@ -from . import Dataset +from . import Dataset, execution, HyperParameterSearch, Transformations diff --git a/Code/Tests/__init__.py b/Code/Tests/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/Code/Tests/poulet.py b/Code/Tests/poulet.py new file mode 100644 index 0000000000000000000000000000000000000000..0733701a5a53560df79ea062fd36038823a52858 --- /dev/null +++ b/Code/Tests/poulet.py @@ -0,0 +1 @@ +print "essai2" \ No newline at end of file diff --git a/Code/__init__.py b/Code/__init__.py index 7ccf8824aeffdbfda0483e30758ef7d6d81e4132..01da5837bef698c1bc4429be51de5d65a25eed43 100644 --- a/Code/__init__.py +++ b/Code/__init__.py @@ -1,2 +1 @@ -__all__ = ['FeatExtraction', 'Monoview', 'Multiview', 'MonoviewClassifiers'] -from . import FeatExtraction, Monoview, Multiview, MonoviewClassifiers \ No newline at end of file +from . import MonoMutliViewClassifiers, Tests, Exec \ No newline at end of file