Skip to content
Snippets Groups Projects
Commit f056ce44 authored by Baptiste Bauvin's avatar Baptiste Bauvin
Browse files

Merge branch 'develop' into private_algos

parents 832d5450 57500543
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,7 @@ class Adaboost(AdaBoostClassifier, BaseMonoviewClassifier): ...@@ -40,6 +40,7 @@ class Adaboost(AdaBoostClassifier, BaseMonoviewClassifier):
self.weird_strings = {"base_estimator": "class_name"} self.weird_strings = {"base_estimator": "class_name"}
self.plotted_metric = metrics.zero_one_loss self.plotted_metric = metrics.zero_one_loss
self.plotted_metric_name = "zero_one_loss" self.plotted_metric_name = "zero_one_loss"
self.base_estimator_config = base_estimator_config
self.step_predictions = None self.step_predictions = None
def fit(self, X, y, sample_weight=None): def fit(self, X, y, sample_weight=None):
......
...@@ -99,6 +99,8 @@ class BaseClassifier(BaseEstimator, ): ...@@ -99,6 +99,8 @@ class BaseClassifier(BaseEstimator, ):
if "config" in self.weird_strings[param_name]: if "config" in self.weird_strings[param_name]:
string += "( with " + self.get_params()[ string += "( with " + self.get_params()[
param_name].params_to_string() + ")" param_name].params_to_string() + ")"
elif self.get_params()[param_name] is None:
return "None"
else: else:
return str(self.get_params()[param_name]) return str(self.get_params()[param_name])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment