diff --git a/config_files/config_test.yml b/config_files/config_test.yml index f05f4cad771622de0cf3c4918d68553a765f6c8b..862062fa9bb84514d8bc99b6daa7afa06b3940be 100644 --- a/config_files/config_test.yml +++ b/config_files/config_test.yml @@ -20,12 +20,12 @@ Classification: multiclass_method: "oneVersusOne" split: 0.4 nb_folds: 2 - nb_class: 3 + nb_class: 2 classes: - type: ["monoview"] - algos_monoview: ["decision_tree",] + type: ["multiview"] + algos_monoview: ["decision_tree","bayesian_inference_fusion"] algos_multiview: ["svm_jumbo_fusion"] - stats_iter: 2 + stats_iter: 1 metrics: ["accuracy_score", "f1_score"] metric_princ: "f1_score" hps_type: "randomized_search-equiv" @@ -132,7 +132,7 @@ weighted_linear_early_fusion: splitter: ["best"] entropy_fusion: - classifier_names: [["decision_tree"]] + classifiers_names: [["decision_tree"]] classifier_configs: decision_tree: max_depth: [1] @@ -140,7 +140,7 @@ entropy_fusion: splitter: ["best"] disagree_fusion: - classifier_names: [["decision_tree"]] + classifiers_names: [["decision_tree"]] classifier_configs: decision_tree: max_depth: [1] @@ -149,7 +149,7 @@ disagree_fusion: double_fault_fusion: - classifier_names: [["decision_tree"]] + classifiers_names: [["decision_tree"]] classifier_configs: decision_tree: max_depth: [1] @@ -157,7 +157,7 @@ double_fault_fusion: splitter: ["best"] difficulty_fusion: - classifier_names: [["decision_tree"]] + classifiers_names: [["decision_tree"]] classifier_configs: decision_tree: max_depth: [1] @@ -165,7 +165,7 @@ difficulty_fusion: splitter: ["best"] scm_late_fusion: - classifier_names: [["decision_tree"]] + classifiers_names: [["decision_tree"]] p: 0.1 max_rules: 10 model_type: 'conjunction' @@ -176,7 +176,7 @@ scm_late_fusion: splitter: ["best"] majority_voting_fusion: - classifier_names: [["decision_tree", "decision_tree", "decision_tree", ]] + classifiers_names: [["decision_tree", "decision_tree", "decision_tree", ]] classifier_configs: decision_tree: max_depth: [1] @@ -184,7 +184,7 @@ majority_voting_fusion: splitter: ["best"] bayesian_inference_fusion: - classifier_names: [["decision_tree", "decision_tree", "decision_tree", ]] + classifiers_names: [["decision_tree", "decision_tree", "decision_tree", ]] classifier_configs: decision_tree: max_depth: [1] @@ -192,7 +192,7 @@ bayesian_inference_fusion: splitter: ["best"] weighted_linear_late_fusion: - classifier_names: [["decision_tree", "decision_tree", "decision_tree", ]] + classifiers_names: [["decision_tree", "decision_tree", "decision_tree", ]] classifier_configs: decision_tree: max_depth: [1] @@ -222,5 +222,4 @@ mvml: kernel_configs: gamma: [0.1] -svm_jumbo_fusion: - degree: [1] + diff --git a/multiview_platform/mono_multi_view_classifiers/exec_classif.py b/multiview_platform/mono_multi_view_classifiers/exec_classif.py index 5206ed13db65d43c40f27dc7cc13d8b5f53b3a90..f51bb61994bf7835274bae7170089dd406290fd9 100644 --- a/multiview_platform/mono_multi_view_classifiers/exec_classif.py +++ b/multiview_platform/mono_multi_view_classifiers/exec_classif.py @@ -107,6 +107,7 @@ def init_multiview_exps(classifier_names, views_dictionary, nb_class, kwargs_ini views_dictionary=views_dictionary, framework="multiview") else: + print(classifier_name) arguments = get_path_dict(kwargs_init[classifier_name]) multiview_arguments += [gen_single_multiview_arg_dictionary(classifier_name, arguments, @@ -161,8 +162,12 @@ def init_monoview_exps(classifier_names, def gen_single_monoview_arg_dictionary(classifier_name, arguments, nb_class, view_index, view_name): - return {classifier_name: dict((key, value[0]) for key, value in arguments[ - classifier_name].items()), + if classifier_name in arguments: + classifier_config = dict((key, value[0]) for key, value in arguments[ + classifier_name].items()) + else: + classifier_config = {} + return {classifier_name: classifier_config, "view_name": view_name, "view_index": view_index, "classifier_name": classifier_name, @@ -375,7 +380,10 @@ def init_kwargs(args, classifiers_names, framework="monoview"): raise AttributeError( classifiers_name + " is not implemented in monoview_classifiers, " "please specify the name of the file in monoview_classifiers") - kwargs[classifiers_name] = args[classifiers_name] + if classifiers_name in args: + kwargs[classifiers_name] = args[classifiers_name] + else: + kwargs[classifiers_name] = {} logging.debug("Done:\t Initializing monoview classifiers arguments") return kwargs diff --git a/multiview_platform/mono_multi_view_classifiers/result_analysis.py b/multiview_platform/mono_multi_view_classifiers/result_analysis.py index ebfcf694b253e16ab0ebf5a548011e8282d00c5b..eff380ac884fae9be36d93606b019987fab4d68a 100644 --- a/multiview_platform/mono_multi_view_classifiers/result_analysis.py +++ b/multiview_platform/mono_multi_view_classifiers/result_analysis.py @@ -685,7 +685,7 @@ def publish_tracebacks(directory, database_name, labels_names, tracebacks, flag) with open(os.path.join(directory, time.strftime( "%Y_%m_%d-%H_%M_%S") + "-" + database_name + "-" + "_vs_".join( labels_names) + "-iter"+str(flag[0])+"-"+str(flag[1][0])+"vs"+ - str(flag[1][1])+"tacebacks.txt"), "w") as traceback_file: + str(flag[1][1])+"-tacebacks.txt"), "w") as traceback_file: failed_list = save_dict_to_text(tracebacks, traceback_file) flagged_list = [_ + "-iter"+str(flag[0])+"-"+str(flag[1][0])+"vs"+ str(flag[1][1]) for _ in failed_list]