From 856cff27510887662947f48234a9711bcae91c61 Mon Sep 17 00:00:00 2001 From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr> Date: Wed, 19 Feb 2020 20:35:39 +0100 Subject: [PATCH] Added base config tests passing --- .../mono_multi_view_classifiers/exec_classif.py | 2 -- .../monoview/exec_classif_mono_view.py | 5 +++++ .../monoview_classifiers/decision_tree.py | 3 ++- .../mono_multi_view_classifiers/utils/configuration.py | 3 +-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/multiview_platform/mono_multi_view_classifiers/exec_classif.py b/multiview_platform/mono_multi_view_classifiers/exec_classif.py index 4ed3f665..54a4a52e 100644 --- a/multiview_platform/mono_multi_view_classifiers/exec_classif.py +++ b/multiview_platform/mono_multi_view_classifiers/exec_classif.py @@ -816,7 +816,6 @@ def exec_classif(arguments): os.environ['OPENBLAS_NUM_THREADS'] = '1' stats_iter = args["stats_iter"] hyper_param_search = args["hps_type"] - multiclass_method = args["multiclass_method"] cl_type = args["type"] monoview_algos = args["algos_monoview"] multiview_algos = args["algos_multiview"] @@ -825,7 +824,6 @@ def exec_classif(arguments): args["name"]) if not args["add_noise"]: args["noise_std"]=[0.0] - print(dataset_list) for dataset_name in dataset_list: noise_results = [] for noise_std in args["noise_std"]: diff --git a/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py b/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py index 97852298..61cfc04d 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview/exec_classif_mono_view.py @@ -97,6 +97,11 @@ def exec_monoview(directory, X, Y, name, labels_names, classification_indices, random_state) classifier.fit(X_train, y_train) # NB_CORES=nbCores, + print(y_train) + print(X_train[:, 6]) + print(X_train[:, 6]<=41.0) + quit() + print(X_test.shape) logging.debug("Done:\t Training") logging.debug("Start:\t Predicting") diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree.py index dd018940..d4efc971 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree.py @@ -32,7 +32,8 @@ class DecisionTree(DecisionTreeClassifier, BaseMonoviewClassifier): # return True def get_interpretation(self, directory, y_test): - interpretString = "" + interpretString = "First featrue : \n\t{} <= {}\n".format(self.tree_.feature[0], + self.tree_.threshold[0]) interpretString += self.get_feature_importance(directory) return interpretString diff --git a/multiview_platform/mono_multi_view_classifiers/utils/configuration.py b/multiview_platform/mono_multi_view_classifiers/utils/configuration.py index 1d43abc8..0233b2d9 100644 --- a/multiview_platform/mono_multi_view_classifiers/utils/configuration.py +++ b/multiview_platform/mono_multi_view_classifiers/utils/configuration.py @@ -36,7 +36,6 @@ def pass_default_config(log=True, noise_std=0.0, res_dir="../results/", track_tracebacks=False, - multiclass_method="oneVersusOne", split=0.49, nb_folds=5, nb_class=None, @@ -66,7 +65,6 @@ def pass_default_config(log=True, :param noise_std: :param res_dir: :param track_tracebacks: - :param multiclass_method: :param split: :param nb_folds: :param nb_class: @@ -81,6 +79,7 @@ def pass_default_config(log=True, :param hps_iter: :return: """ + print(locals()["name"]) args = dict((key, value) for key, value in locals().items() if key !="kwargs") args = dict(args, **kwargs) return args -- GitLab