From 9d7267fada8c4be995dff70d029023b8046a39c5 Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Wed, 20 May 2020 09:02:56 -0400
Subject: [PATCH] Trying stuff with cb_boost
---
config_files/config_cuisine.yml | 10 ++++----
.../monoview_classifiers/adaboost.py | 1 +
.../additions/CBBoostUtils.py | 24 ++++++++++++-------
summit/multiview_platform/utils/base.py | 2 +-
4 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/config_files/config_cuisine.yml b/config_files/config_cuisine.yml
index 2ff90a34..f4ed64cd 100644
--- a/config_files/config_cuisine.yml
+++ b/config_files/config_cuisine.yml
@@ -1,10 +1,10 @@
# The base configuration of the benchmark
log: True
-name: ["lives_14view_EMF"]
+name: ["ionosphere"]
label: "_"
file_type: ".hdf5"
views:
-pathf: "/home/baptiste/Documents/Datasets/Alexis/data/"
+pathf: "/home/baptiste/Documents/Datasets/UCI/both"
nice: 0
random_state: 42
nb_cores: 1
@@ -20,9 +20,9 @@ multiclass_method: "oneVersusOne"
split: 0.75
nb_folds: 5
nb_class: 2
-classes: ["multi_clustered", "EMF"]
-type: ["multiview","monoview"]
-algos_monoview: ["scm_mazid", "decision_tree"]
+classes:
+type: ["monoview"]
+algos_monoview: ["cb_boost",]
algos_multiview: ["group_scm"]
stats_iter: 2
metrics:
diff --git a/summit/multiview_platform/monoview_classifiers/adaboost.py b/summit/multiview_platform/monoview_classifiers/adaboost.py
index 82b380f7..cd8ce3db 100644
--- a/summit/multiview_platform/monoview_classifiers/adaboost.py
+++ b/summit/multiview_platform/monoview_classifiers/adaboost.py
@@ -40,6 +40,7 @@ class Adaboost(AdaBoostClassifier, BaseMonoviewClassifier):
self.weird_strings = {"base_estimator": "class_name"}
self.plotted_metric = metrics.zero_one_loss
self.plotted_metric_name = "zero_one_loss"
+ self.base_estimator_config = base_estimator_config
self.step_predictions = None
def fit(self, X, y, sample_weight=None):
diff --git a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
index 90be76c9..88ec05ac 100644
--- a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
+++ b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
@@ -93,11 +93,11 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost):
# Print dynamically the step and the error of the current classifier
self.it = k
- print(
- "Resp. bound : {}/{}".format(
- k + 2,
- self.n_max_iterations),
- end="\r")
+ # print(
+ # "Resp. bound : {}/{}".format(
+ # k + 2,
+ # self.n_max_iterations),
+ # end="\r")
# Find the best (weight, voter) couple.
self.q, new_voter_index = self._find_new_voter(y_kernel_matrix,
@@ -115,7 +115,9 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost):
self.update_info_containers(formatted_y, voter_perf, k)
self.estimators_generator.choose(self.chosen_columns_)
-
+ # print(np.array(self.try_).shape)
+ # np.savetxt("/home/baptiste/Documents/try_.csv", np.array(self.try_))
+ # np.savetxt("/home/baptiste/Documents/try_2.csv", np.array(self.try_2))
self.nb_opposed_voters = self.check_opposed_voters()
if self.save_train_data:
self.X_train = self.classification_matrix[:, self.chosen_columns_]
@@ -256,7 +258,8 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost):
self.previous_vote = self.new_voter
self.norm.append(np.linalg.norm(self.previous_vote) ** 2)
-
+ self.try_ = []
+ self.try_2=[]
self.q = 1
self.weights_.append(self.q)
@@ -344,6 +347,9 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost):
previous_sum = np.multiply(y,
self.previous_vote.reshape(m, 1))
margin_old = np.sum(previous_sum)
+ worst_example = 0
+ # worst_example = np.argmin(previous_sum)
+
bad_margins = np.where(np.sum(y_kernel_matrix, axis=0) <= 0.0)[0]
@@ -373,7 +379,9 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost):
return "No more pertinent voters", 0
else:
best_hyp_index = np.argmin(masked_c_bounds)
-
+ # self.try_.append(np.ravel(previous_sum) )
+ #
+ # self.try_2.append(np.reshape(previous_sum ** 2, (87,)) + (2 * sols[best_hyp_index]*y_kernel_matrix[:, best_hyp_index]*np.reshape(previous_sum, (87, ))))
self.c_bounds.append(masked_c_bounds[best_hyp_index])
self.margins.append(math.sqrt(self.A2s[best_hyp_index] / m))
self.disagreements.append(0.5 * self.B1s[best_hyp_index] / m)
diff --git a/summit/multiview_platform/utils/base.py b/summit/multiview_platform/utils/base.py
index 8dcaaf81..e0a1d9ad 100644
--- a/summit/multiview_platform/utils/base.py
+++ b/summit/multiview_platform/utils/base.py
@@ -53,7 +53,7 @@ class BaseClassifier(BaseEstimator, ):
"""
return ", ".join(
[param_name + " : " + self.to_str(param_name) for param_name in
- self.param_names])
+ self.param_names if param_name is not None])
def get_config(self):
"""
--
GitLab