diff --git a/config_files/config.yml b/config_files/config.yml index 22a51e7214341a2df96002f19cf33d1456b68876..4baa1dae8537a94d62db23c4acb26a5dd1623c97 100644 --- a/config_files/config.yml +++ b/config_files/config.yml @@ -110,15 +110,6 @@ cb_boost: n_max_iterations: [10] 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: alpha: [1] max_iter: [2] @@ -126,10 +117,6 @@ lasso: gradient_boosting: n_estimators: [2] -min_cq: - mu: [0.01] - n_stumps_per_attribute: [1] - ###################################### # The Multiview Classifier arguments # diff --git a/multiview_platform/mono_multi_view_classifiers/monoview/analyze_result.py b/multiview_platform/mono_multi_view_classifiers/monoview/analyze_result.py index cb93b1bfa0ece8e54928adcc0d735c47da7a9fbc..faecdbc295611068d49d9e1cdce2aafacfe75ff4 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview/analyze_result.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview/analyze_result.py @@ -5,6 +5,21 @@ from .. import metrics def getDBConfigString(name, feat, classification_indices, shape, classLabelsNames, KFolds): + """ + + Parameters + ---------- + name + feat + classification_indices + shape + classLabelsNames + KFolds + + Returns + ------- + + """ learningRate = float(len(classification_indices[0])) / ( len(classification_indices[0]) + len(classification_indices[1])) dbConfigString = "Database configuration : \n" diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cb_boost.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cb_boost.py index 6955a79e97c9dc73f024227b36e2a5f897adad58..4f094aac6f5e715c15d2f4fc2ec4d53f5b390bf0 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cb_boost.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cb_boost.py @@ -59,6 +59,7 @@ class CBBoost(CBBoostClassifier, BaseMonoviewClassifier): """ return True + def getInterpret(self, directory, y_test): """ return interpretation string diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cg_desc.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cg_desc.py index 85e8cdca5ad2d37ba16a48fd2d04f1b32e97f0b0..e0d8cac9bf54fe4d5efa2c6e14f778220ca2461d 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cg_desc.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cg_desc.py @@ -45,7 +45,7 @@ class CGDesc(ColumnGenerationClassifierQar, BaseMonoviewClassifier): def canProbas(self): """Used to know if the classifier can return label probabilities""" - return True + return False def getInterpret(self, directory, y_test): return self.getInterpretQar(directory, y_test) diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cq_boost.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cq_boost.py index 7984a428a16b77ef1a293f4812cd3085a2156bad..8d8d6e5601ac42e48486f607452c8dc849b26b13 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cq_boost.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/cq_boost.py @@ -37,7 +37,7 @@ class CQBoost(ColumnGenerationClassifier, BaseMonoviewClassifier): def canProbas(self): """Used to know if the classifier can return label probabilities""" - return True + return False def getInterpret(self, directory, y_test): np.savetxt(directory + "train_metrics.csv", self.train_metrics, diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree_pregen.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree_pregen.py index 5f5ee1c3dbe1644d542c265a1c4b23b597114857..4b67520ec79f2617bf68c0923facbddbb0686ea8 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree_pregen.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/decision_tree_pregen.py @@ -61,7 +61,7 @@ class DecisionTreePregen(DecisionTreeClassifier, BaseMonoviewClassifier, def canProbas(self): """Used to know if the classifier can return label probabilities""" - return True + return False def getInterpret(self, directory, y_test): interpretString = "" diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/gradient_boosting.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/gradient_boosting.py index 7fd870f08577bfb4b13698284b0d8434c8ad205c..14d2670bec0f84c50c6c0afdd023d8f1c93274fe 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/gradient_boosting.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/gradient_boosting.py @@ -71,7 +71,7 @@ class GradientBoosting(GradientBoostingClassifier, BaseMonoviewClassifier): def canProbas(self): """Used to know if the classifier can return label probabilities""" - return True + return False def getInterpret(self, directory, y_test): interpretString = "" diff --git a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py index 0e8b3c41e7d2404eecc52b393b0ce74a0de0e329..5f1361bf6652112da8bc8a3d8a1b4f06628d3d8f 100644 --- a/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py +++ b/multiview_platform/mono_multi_view_classifiers/monoview_classifiers/lasso.py @@ -47,7 +47,6 @@ class Lasso(LassoSK, BaseMonoviewClassifier): """ def __init__(self, random_state=None, alpha=1.0, max_iter=10, warm_start=False, **kwargs): - super(Lasso, self).__init__( alpha=alpha, max_iter=max_iter,