Skip to content
Snippets Groups Projects
Commit ce3a23ba authored by Dominique Benielli's avatar Dominique Benielli
Browse files

merge

parents 4a5ad743 ff52c4bc
Branches
No related tags found
No related merge requests found
Pipeline #3446 passed
...@@ -110,15 +110,6 @@ cb_boost: ...@@ -110,15 +110,6 @@ cb_boost:
n_max_iterations: [10] n_max_iterations: [10]
n_stumps: [1] n_stumps: [1]
min_cq_graalpy:
mu: [0.01]
n_stumps_per_attribute: [1]
min_cq_graalpy_tree:
mu: [0.01]
n_stumps_per_attribute: [1]
max_depth: [2]
lasso: lasso:
alpha: [1] alpha: [1]
max_iter: [2] max_iter: [2]
...@@ -126,10 +117,6 @@ lasso: ...@@ -126,10 +117,6 @@ lasso:
gradient_boosting: gradient_boosting:
n_estimators: [2] n_estimators: [2]
min_cq:
mu: [0.01]
n_stumps_per_attribute: [1]
###################################### ######################################
# The Multiview Classifier arguments # # The Multiview Classifier arguments #
......
...@@ -5,6 +5,21 @@ from .. import metrics ...@@ -5,6 +5,21 @@ from .. import metrics
def getDBConfigString(name, feat, classification_indices, shape, def getDBConfigString(name, feat, classification_indices, shape,
classLabelsNames, KFolds): classLabelsNames, KFolds):
"""
Parameters
----------
name
feat
classification_indices
shape
classLabelsNames
KFolds
Returns
-------
"""
learningRate = float(len(classification_indices[0])) / ( learningRate = float(len(classification_indices[0])) / (
len(classification_indices[0]) + len(classification_indices[1])) len(classification_indices[0]) + len(classification_indices[1]))
dbConfigString = "Database configuration : \n" dbConfigString = "Database configuration : \n"
......
...@@ -59,6 +59,7 @@ class CBBoost(CBBoostClassifier, BaseMonoviewClassifier): ...@@ -59,6 +59,7 @@ class CBBoost(CBBoostClassifier, BaseMonoviewClassifier):
""" """
return True return True
def getInterpret(self, directory, y_test): def getInterpret(self, directory, y_test):
""" """
return interpretation string return interpretation string
......
...@@ -45,7 +45,7 @@ class CGDesc(ColumnGenerationClassifierQar, BaseMonoviewClassifier): ...@@ -45,7 +45,7 @@ class CGDesc(ColumnGenerationClassifierQar, BaseMonoviewClassifier):
def canProbas(self): def canProbas(self):
"""Used to know if the classifier can return label probabilities""" """Used to know if the classifier can return label probabilities"""
return True return False
def getInterpret(self, directory, y_test): def getInterpret(self, directory, y_test):
return self.getInterpretQar(directory, y_test) return self.getInterpretQar(directory, y_test)
......
...@@ -37,7 +37,7 @@ class CQBoost(ColumnGenerationClassifier, BaseMonoviewClassifier): ...@@ -37,7 +37,7 @@ class CQBoost(ColumnGenerationClassifier, BaseMonoviewClassifier):
def canProbas(self): def canProbas(self):
"""Used to know if the classifier can return label probabilities""" """Used to know if the classifier can return label probabilities"""
return True return False
def getInterpret(self, directory, y_test): def getInterpret(self, directory, y_test):
np.savetxt(directory + "train_metrics.csv", self.train_metrics, np.savetxt(directory + "train_metrics.csv", self.train_metrics,
......
...@@ -61,7 +61,7 @@ class DecisionTreePregen(DecisionTreeClassifier, BaseMonoviewClassifier, ...@@ -61,7 +61,7 @@ class DecisionTreePregen(DecisionTreeClassifier, BaseMonoviewClassifier,
def canProbas(self): def canProbas(self):
"""Used to know if the classifier can return label probabilities""" """Used to know if the classifier can return label probabilities"""
return True return False
def getInterpret(self, directory, y_test): def getInterpret(self, directory, y_test):
interpretString = "" interpretString = ""
......
...@@ -71,7 +71,7 @@ class GradientBoosting(GradientBoostingClassifier, BaseMonoviewClassifier): ...@@ -71,7 +71,7 @@ class GradientBoosting(GradientBoostingClassifier, BaseMonoviewClassifier):
def canProbas(self): def canProbas(self):
"""Used to know if the classifier can return label probabilities""" """Used to know if the classifier can return label probabilities"""
return True return False
def getInterpret(self, directory, y_test): def getInterpret(self, directory, y_test):
interpretString = "" interpretString = ""
......
...@@ -47,7 +47,6 @@ class Lasso(LassoSK, BaseMonoviewClassifier): ...@@ -47,7 +47,6 @@ class Lasso(LassoSK, BaseMonoviewClassifier):
""" """
def __init__(self, random_state=None, alpha=1.0, def __init__(self, random_state=None, alpha=1.0,
max_iter=10, warm_start=False, **kwargs): max_iter=10, warm_start=False, **kwargs):
super(Lasso, self).__init__( super(Lasso, self).__init__(
alpha=alpha, alpha=alpha,
max_iter=max_iter, max_iter=max_iter,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment