diff --git a/multiview_platform/MonoMultiViewClassifiers/Monoview/MonoviewUtils.py b/multiview_platform/MonoMultiViewClassifiers/Monoview/MonoviewUtils.py index 9f4260d720b010fdcfb60965230847542a8eaba1..77be240546d97401c5a84197915da3fab122b15e 100644 --- a/multiview_platform/MonoMultiViewClassifiers/Monoview/MonoviewUtils.py +++ b/multiview_platform/MonoMultiViewClassifiers/Monoview/MonoviewUtils.py @@ -166,6 +166,9 @@ class BaseMonoviewClassifier(object): ", feature importance : " + str(featureImportance) + "\n" return interpretString + def get_name_for_fusion(self): + return self.__class__.__name__[:4] + def get_names(classed_list): return np.array([object_.__class__.__name__ for object_ in classed_list]) diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv2.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv2.py index ea98bf3ee4df3d995f06582b1050b9672513589a..98a9d6534a39219ecadede1f4524923f03cee4fe 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv2.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv2.py @@ -79,6 +79,9 @@ class CQBoostv2(ColumnGenerationClassifierv2, BaseMonoviewClassifier): def getInterpret(self, directory): return getInterpretBase(self, directory, "CQBoostv2", self.weights_,) + def get_name_for_fusion(self): + return "CQB2" + def formatCmdArgs(args): """Used to format kwargs for the parsed args""" diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv21.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv21.py index ce990e813b44eebafbc5b043c3a506b1c4416070..516c7bb0c0fdb873c456a5d51fefd906ec1e53de 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv21.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoostv21.py @@ -261,6 +261,9 @@ class CQBoostv21(CqBoostClassifierv21, BaseMonoviewClassifier): def getInterpret(self, directory): return getInterpretBase(self, directory, "CQBoostv21", self.weights_, self.break_cause) + def get_name_for_fusion(self): + return "CQ21" + def formatCmdArgs(args): """Used to format kwargs for the parsed args""" diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC.py index 7c02053f1a1c4727448199a0eeeaba97c3be8ecd..bda1bf705445b406c7e64bf4c8d01e72c3dd1e07 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC.py @@ -23,6 +23,9 @@ class QarBoostNC(ColumnGenerationClassifierQar, BaseMonoviewClassifier): def getInterpret(self, directory): return getInterpretBase(self, directory, "QarBoostNC", self.weights_, self.break_cause) + def get_name_for_fusion(self): + return "QBNC" + def formatCmdArgs(args): """Used to format kwargs for the parsed args""" diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC2.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC2.py index 1f1d9fd8cb156345bfbacb8e69f1d2e7ba4959fa..35cce384515527c75e6034fce0d8b1298e53a4ee 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC2.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostNC2.py @@ -23,6 +23,9 @@ class QarBoostNC2(ColumnGenerationClassifierQar, BaseMonoviewClassifier): def getInterpret(self, directory): return getInterpretBase(self, directory, "QarBoostNC2", self.weights_, self.break_cause) + def get_name_for_fusion(self): + return "QBN2" + def formatCmdArgs(args): """Used to format kwargs for the parsed args""" diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv2.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv2.py index 4fe7364c4c5d576d31ee8a15c91318d290a5efab..5b8b234e5e1a51975d7e17ebb68049244d491112 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv2.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv2.py @@ -23,6 +23,9 @@ class QarBoostv2(ColumnGenerationClassifierQar, BaseMonoviewClassifier): def getInterpret(self, directory): return getInterpretBase(self, directory, "QarBoostv2", self.weights_, self.break_cause) + def get_name_for_fusion(self): + return "QBv2" + def formatCmdArgs(args): """Used to format kwargs for the parsed args""" diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv3.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv3.py index b9f5e73ca290b9d404548d9cee4d931c5e915a99..d14e66ff4628b3a4fafaf1c5efc54c33c05ee325 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv3.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/QarBoostv3.py @@ -50,6 +50,9 @@ class QarBoostv3(ColumnGenerationClassifierQar3, BaseMonoviewClassifier): def getInterpret(self, directory): return getInterpretBase(self, directory, "QarBoostv3", self.weights_, self.break_cause) + def get_name_for_fusion(self): + return "QBv3" + def formatCmdArgs(args): """Used to format kwargs for the parsed args""" kwargsDict = {} diff --git a/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/Fusion/FusionModule.py b/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/Fusion/FusionModule.py index a222a5996ddea3d127f31a18160c8c926c2b5cdb..975403008fa0511787c345759fdd01076062c89f 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/Fusion/FusionModule.py +++ b/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/Fusion/FusionModule.py @@ -23,7 +23,9 @@ def genName(config): classifierRedNames = [classifierName[:4] for classifierName in config["classifiersNames"]] return "Late-" + str(config["fusionMethod"][:4])#+"-"+"-".join(classifierRedNames) elif config["fusionType"] == "EarlyFusion": - return "Early-" + config["fusionMethod"][:4] + "-" + config["classifiersNames"][:4] + monoview_short_name = getattr(getattr(MonoviewClassifiers, config["classifiersNames"]), + config["classifiersNames"])().get_name_for_fusion() + return "Early-" + config["fusionMethod"][:4] + "-" + monoview_short_name def getBenchmark(benchmark, args=None): diff --git a/multiview_platform/MonoMultiViewClassifiers/ResultAnalysis.py b/multiview_platform/MonoMultiViewClassifiers/ResultAnalysis.py index f148f7e521071b33cd04e2c13fe34187d99dc92f..8905d16b014c47940a2a8b10397cc58281672ceb 100644 --- a/multiview_platform/MonoMultiViewClassifiers/ResultAnalysis.py +++ b/multiview_platform/MonoMultiViewClassifiers/ResultAnalysis.py @@ -425,6 +425,7 @@ def publishIterBiclassMetricsScores(iterResults, directory, labelsDictionary, cl testSTDs = np.std(testScores, axis=1) nbResults = len(trainMeans) reversedClassifiersDict = dict((value, key) for key, value in classifiersDict.items()) + # import pdb;pdb.set_trace() names = [reversedClassifiersDict[i] for i in range(len(classifiersDict))] size=nbResults if nbResults<minSize: diff --git a/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py b/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py index 5726b95f2a0113b76474ed6f03c45bc7553c9daf..9a9f486fb5eec6598d7f5b9d1b851d0cefbaecb6 100644 --- a/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py +++ b/multiview_platform/MonoMultiViewClassifiers/utils/GetMultiviewDb.py @@ -53,11 +53,11 @@ def makeMeNoisy(viewData, randomState, percentage=15): def getPlausibleDBhdf5(features, pathF, name, NB_CLASS=3, LABELS_NAME="", randomState=None, full=True, nbView=3, - nbClass=2, datasetLength=347, randomStateInt=None): + nbClass=2, datasetLength=34, randomStateInt=None): """Used to generate a plausible dataset to test the algorithms""" randomStateInt = 42 randomState = np.random.RandomState(randomStateInt) - nbFeatures = 100 + nbFeatures = 10 if not os.path.exists(os.path.dirname(pathF + "Plausible.hdf5")): try: os.makedirs(os.path.dirname(pathF + "Plausible.hdf5"))