diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostGraalpy.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostGraalpy.py index 7f0251a350feae7e6b11ac16f8b7859b09dedf8a..7097231eb4cf6943208fd19a8c2fbcf354d313c8 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostGraalpy.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostGraalpy.py @@ -143,13 +143,13 @@ class AdaBoostGP(BaseEstimator, ClassifierMixin, BaseBoost): class AdaboostGraalpy(AdaBoostGP, BaseMonoviewClassifier): - def __init__(self, random_state=None, n_iterations=200, n_stumps=10, **kwargs): + def __init__(self, random_state=None, n_iterations=200, n_stumps=1, **kwargs): super(AdaboostGraalpy, self).__init__( n_iterations=n_iterations, n_stumps=n_stumps ) - self.param_names = [] - self.distribs = [] + self.param_names = ["n_iterations",] + self.distribs = [CustomRandint(low=1, high=500)] self.classed_params = [] self.weird_strings = {} self.n_stumps = n_stumps diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregen.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregen.py index 08a8f5029defa32e8062cabce8df37e17d400dae..ad523bdefdd0dea7defb167137e21f8bfc768e93 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregen.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/AdaboostPregen.py @@ -17,7 +17,7 @@ __status__ = "Prototype" # Production, Development, Prototype class AdaboostPregen(AdaBoostClassifier, BaseBoost, BaseMonoviewClassifier): def __init__(self, random_state=None, n_estimators=50, - base_estimator=None, n_stumps=10, self_complemeted=True , **kwargs): + base_estimator=None, n_stumps=1, self_complemeted=True , **kwargs): super(AdaboostPregen, self).__init__( random_state=random_state, n_estimators=n_estimators, diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CGDesc.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CGDesc.py index 6773cc5c66b9d565b4086949c1e5f52be56bba4a..209baad9e07d9ce57d6dab33d49ff4e69f89724d 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CGDesc.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CGDesc.py @@ -5,7 +5,7 @@ from ..Monoview.Additions.QarBoostUtils import ColumnGenerationClassifierQar class CGDesc(ColumnGenerationClassifierQar, BaseMonoviewClassifier): - def __init__(self, random_state=None, n_max_iterations=500, n_stumps_per_attribute=10, **kwargs): + def __init__(self, random_state=None, n_max_iterations=500, n_stumps_per_attribute=1, **kwargs): super(CGDesc, self).__init__(n_max_iterations=n_max_iterations, random_state=random_state, self_complemented=True, diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoost.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoost.py index 0ecdd66618095e0054e943e292d89e632a0aafa7..c1b59f11083af32cbe6d91ee5a147a12994c48e6 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoost.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/CQBoost.py @@ -7,7 +7,7 @@ import os class CQBoost(ColumnGenerationClassifier, BaseMonoviewClassifier): - def __init__(self, random_state=None, mu=0.01, epsilon=1e-06, n_stumps=10, **kwargs): + def __init__(self, random_state=None, mu=0.01, epsilon=1e-06, n_stumps=1, **kwargs): super(CQBoost, self).__init__( random_state=random_state, mu=mu, diff --git a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/MinCQGraalpy.py b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/MinCQGraalpy.py index b1bf1dfed06f3f55efd2bf043f397e6e55efbc6a..ae27aa91c57c040e3c021e551dd989ec343035f6 100644 --- a/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/MinCQGraalpy.py +++ b/multiview_platform/MonoMultiViewClassifiers/MonoviewClassifiers/MinCQGraalpy.py @@ -240,7 +240,9 @@ class RegularizedBinaryMinCqClassifier(MinCqClassifier): n_examples, n_voters = np.shape(classification_matrix) if self.zeta == 0: - ftf = classification_matrix.T.dot(classification_matrix) + print(classification_matrix.shape) + np.transpose(classification_matrix) + ftf = np.dot(np.transpose(classification_matrix),classification_matrix) else: I = np.eye(n_examples) L = build_laplacian(X, n_neighbors=self.n_neighbors) @@ -324,11 +326,11 @@ def build_laplacian(X, n_neighbors=None): class MinCQGraalpy(RegularizedBinaryMinCqClassifier, BaseMonoviewClassifier): - def __init__(self, random_state=None, mu=0.01, self_complemented=True, n_stumps_per_attribute=10 , **kwargs): + def __init__(self, random_state=None, mu=0.01, self_complemented=True, n_stumps_per_attribute=1, **kwargs): super(MinCQGraalpy, self).__init__(mu=mu, estimators_generator=StumpsClassifiersGenerator(n_stumps_per_attribute=n_stumps_per_attribute, self_complemented=self_complemented), ) - self.param_names = ["mu"] + self.param_names = ["mu",] self.distribs = [CustomUniform(loc=0.5, state=2.0, multiplier="e-"), ] self.n_stumps_per_attribute = n_stumps_per_attribute