Skip to content
Snippets Groups Projects
Commit 73051abb authored by bbauvin's avatar bbauvin
Browse files

Minor changes

parent 514881e6
No related branches found
No related tags found
No related merge requests found
...@@ -70,20 +70,11 @@ def initBenchmark(args): ...@@ -70,20 +70,11 @@ def initBenchmark(args):
return benchmark return benchmark
def initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, DATASET, NB_CLASS, kwargsInit): def initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, NB_CLASS, kwargsInit):
if benchmark["Monoview"]: if benchmark["Monoview"]:
argumentDictionaries["Monoview"] = [] argumentDictionaries["Monoview"] = []
for view in views: for view in views:
for classifier in benchmark["Monoview"]: 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 = { arguments = {
"args": {classifier + "KWARGS": kwargsInit[classifier + "KWARGSInit"], "feat": view, "args": {classifier + "KWARGS": kwargsInit[classifier + "KWARGSInit"], "feat": view,
"CL_type": classifier, "nbClass": NB_CLASS}, "viewIndex": allViews.index(view)} "CL_type": classifier, "nbClass": NB_CLASS}, "viewIndex": allViews.index(view)}
...@@ -328,7 +319,7 @@ def execClassif(arguments): ...@@ -328,7 +319,7 @@ def execClassif(arguments):
dataBaseTime = time.time() - start dataBaseTime = time.time() - start
argumentDictionaries = {"Monoview": [], "Multiview": []} argumentDictionaries = {"Monoview": [], "Multiview": []}
argumentDictionaries = initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, DATASET, NB_CLASS, argumentDictionaries = initMonoviewArguments(benchmark, argumentDictionaries, views, allViews, NB_CLASS,
initKWARGS) initKWARGS)
directories = execution.genDirecortiesNames(directory, statsIter) directories = execution.genDirecortiesNames(directory, statsIter)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment