From e49f62e438aed62187a48f3515e15eb307bfc170 Mon Sep 17 00:00:00 2001 From: Baptiste Bauvin <baptiste.bauvin.1@ulaval.ca> Date: Mon, 19 Mar 2018 15:28:43 -0400 Subject: [PATCH] AddedMin to CQ --- .../MultiviewClassifiers/diversity_utils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/diversity_utils.py b/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/diversity_utils.py index 5a34e043..136cbf27 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/diversity_utils.py +++ b/multiview_platform/MonoMultiViewClassifiers/MultiviewClassifiers/diversity_utils.py @@ -84,7 +84,6 @@ def CQ_div_measure(allClassifersNames, viewsIndices, resultsMonoview, measuremen classifiersDecisions, classifiersNames = getClassifiersDecisions(allClassifersNames, viewsIndices, resultsMonoview) - foldsLen = len(resultsMonoview[0][1][6][0]) nbViews = len(viewsIndices) nbClassifiers = len(allClassifersNames) @@ -107,10 +106,8 @@ def CQ_div_measure(allClassifersNames, viewsIndices, resultsMonoview, measuremen classifiersDecisions[viewIndex2, classifierIndex2], foldsGroudTruth) , axis=1) / float(foldsLen) disagreement[binomeIndex] = np.mean(nbDisagree) - # difficulties[binomeIndex] = measurement[1](classifiersDecisions, [classifierIndex1, classifierIndex2], foldsGroudTruth, foldsLen) - # cqMeasures = difficulties/disagreement div_measure[combinationsIndex] /= float(np.mean(disagreement)) - bestCombiIndex = np.argmax(div_measure) + bestCombiIndex = np.argmin(div_measure) bestCombination = combis[bestCombiIndex] return [classifiersNames[viewIndex][index] for viewIndex, index in enumerate(bestCombination)], div_measure[ -- GitLab