From 73051abbc7ec2f5eb04a1d7a7366b59ec03a2102 Mon Sep 17 00:00:00 2001 From: bbauvin <baptiste.bauvin@centrale-marseille.fr> Date: Thu, 19 Oct 2017 12:45:46 -0400 Subject: [PATCH] Minor changes --- Code/MonoMultiViewClassifiers/ExecClassif.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Code/MonoMultiViewClassifiers/ExecClassif.py b/Code/MonoMultiViewClassifiers/ExecClassif.py index 8596a78e..a901413a 100644 --- a/Code/MonoMultiViewClassifiers/ExecClassif.py +++ b/Code/MonoMultiViewClassifiers/ExecClassif.py @@ -70,20 +70,11 @@ def initBenchmark(args): return benchmark -def initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, DATASET, NB_CLASS, kwargsInit): +def initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, NB_CLASS, kwargsInit): if benchmark["Monoview"]: argumentDictionaries["Monoview"] = [] for view in views: for classifier in benchmark["Monoview"]: - # if classifier == "SCM": - # if DATASET.get("View" + str(allViews.index(view))).attrs["binary"]: - # arguments = { - # "args": {classifier + "KWARGS": kwargsInit[classifier + "KWARGSInit"], "feat": view, - # "CL_type": classifier, "nbClass": NB_CLASS}, "viewIndex": allViews.index(view)} - # argumentDictionaries["Monoview"].append(arguments) - # else: - # pass - # else: arguments = { "args": {classifier + "KWARGS": kwargsInit[classifier + "KWARGSInit"], "feat": view, "CL_type": classifier, "nbClass": NB_CLASS}, "viewIndex": allViews.index(view)} @@ -328,7 +319,7 @@ def execClassif(arguments): dataBaseTime = time.time() - start argumentDictionaries = {"Monoview": [], "Multiview": []} - argumentDictionaries = initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, DATASET, NB_CLASS, + argumentDictionaries = initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, NB_CLASS, initKWARGS) directories = execution.genDirecortiesNames(directory, statsIter) -- GitLab