diff --git a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py index 1cffadc8e4620fbe3e934a0a5fc1d1781afe63b4..90be76c90e2da3bb4089be3905f8a8dd20352064 100644 --- a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py +++ b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py @@ -21,7 +21,7 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost): def __init__(self, n_max_iterations=100, estimators_generator="Stumps", random_state=42, self_complemented=True, twice_the_same=True, random_start=False, n_stumps=1, c_bound_sol=True, - plotted_metric=metrics.zero_one_loss, save_train_data=False, + plotted_metric=metrics.zero_one_loss, save_train_data=True, test_graph=True, mincq_tracking=False): super(CBBoostClassifier, self).__init__() r""" diff --git a/summit/multiview_platform/monoview_classifiers/bagging.py b/summit/multiview_platform/monoview_classifiers/bagging.py index 59710059d387af08da82f7e0409c6d026e46302b..36b2f04183ef75259d5729498d42cb73ea8c0b9d 100644 --- a/summit/multiview_platform/monoview_classifiers/bagging.py +++ b/summit/multiview_platform/monoview_classifiers/bagging.py @@ -7,8 +7,8 @@ import numpy as np from .. import metrics from .additions.PregenUtils import PregenClassifier -from ..monoview.monoview_utils import CustomRandint, BaseMonoviewClassifier, \ - change_label_to_zero, CustomUniform +from ..monoview.monoview_utils import BaseMonoviewClassifier, change_label_to_zero +from ..utils.hyper_parameter_search import CustomRandint, CustomUniform # Author-Info __author__ = "Baptiste Bauvin" diff --git a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py index fe5d9d8190280ff9ee3e26d121b236a7ac5052ab..e87587f5990af60ce6c25175faefc95bab433450 100644 --- a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py @@ -7,8 +7,8 @@ import numpy as np from .. import metrics from .additions.PregenUtils import PregenClassifier -from ..monoview.monoview_utils import CustomRandint, BaseMonoviewClassifier, \ - change_label_to_zero, CustomUniform +from ..monoview.monoview_utils import BaseMonoviewClassifier, change_label_to_zero +from ..utils.hyper_parameter_search import CustomRandint, CustomUniform # Author-Info __author__ = "Baptiste Bauvin" diff --git a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py index 8865abc861526878e1293da4823642bcdfcdd5af..8ab04091de96d0333c6e151ef7c5546bae6e8fbf 100644 --- a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py @@ -7,8 +7,9 @@ import numpy as np from .. import metrics from .additions.PregenUtils import PregenClassifier -from ..monoview.monoview_utils import CustomRandint, BaseMonoviewClassifier, \ - change_label_to_zero, CustomUniform +from ..monoview.monoview_utils import BaseMonoviewClassifier, change_label_to_zero +from ..utils.hyper_parameter_search import CustomUniform, CustomRandint + # Author-Info __author__ = "Baptiste Bauvin" diff --git a/summit/multiview_platform/monoview_classifiers/min_cq.py b/summit/multiview_platform/monoview_classifiers/min_cq.py index e64d51d6901c24756298596b10694df68469381a..6741cabad98d988f4540020040777bc1d830f2d9 100644 --- a/summit/multiview_platform/monoview_classifiers/min_cq.py +++ b/summit/multiview_platform/monoview_classifiers/min_cq.py @@ -1,4 +1,5 @@ -from ..monoview.monoview_utils import CustomUniform, BaseMonoviewClassifier +from ..monoview.monoview_utils import BaseMonoviewClassifier +from ..utils.hyper_parameter_search import CustomRandint, CustomUniform #### Algorithm code #### diff --git a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py index c17208f74eb7c34d02ab78d258a3e958b21ce8f6..6d1ea085e30f531e666a6b55f231dc97ab6196f0 100644 --- a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py +++ b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py @@ -2,8 +2,8 @@ import numpy as np from .additions.BoostUtils import StumpsClassifiersGenerator from .additions.MinCQUtils import RegularizedBinaryMinCqClassifier -from ..monoview.monoview_utils import BaseMonoviewClassifier, CustomUniform - +from ..monoview.monoview_utils import BaseMonoviewClassifier +from ..utils.hyper_parameter_search import CustomRandint, CustomUniform classifier_class_name = "MinCQGraalpy" diff --git a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py b/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py index d4fb2214e38d60e35eefe05986b8948012326058..36f828b5bd6c6911216a39b02718d467d51a8eab 100644 --- a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py @@ -8,7 +8,8 @@ import numpy as np from .. import metrics from .additions.PregenUtils import PregenClassifier from ..monoview.monoview_utils import CustomRandint, BaseMonoviewClassifier, \ - change_label_to_zero, CustomUniform + change_label_to_zero +from ..utils.hyper_parameter_search import CustomRandint, CustomUniform # Author-Info __author__ = "Baptiste Bauvin" diff --git a/summit/multiview_platform/monoview_classifiers/scm_pregen.py b/summit/multiview_platform/monoview_classifiers/scm_pregen.py index ad184ac329dcfd79edc3076a82e2a13b97f5e6a0..939661ce9c520950cbd4cc0f399866977a59bae8 100644 --- a/summit/multiview_platform/monoview_classifiers/scm_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/scm_pregen.py @@ -4,8 +4,8 @@ import numpy as np from pyscm.scm import SetCoveringMachineClassifier as scm from .additions.PregenUtils import PregenClassifier -from ..monoview.monoview_utils import CustomRandint, CustomUniform, \ - BaseMonoviewClassifier +from ..monoview.monoview_utils import BaseMonoviewClassifier +from ..utils.hyper_parameter_search import CustomRandint, CustomUniform # Author-Info __author__ = "Baptiste Bauvin" diff --git a/summit/multiview_platform/multiview_classifiers/group_scm.py b/summit/multiview_platform/multiview_classifiers/group_scm.py index 6d8fef7e60fd203d2e7d951a8fbe67bd4ca000a1..3391f97931844e377e66c31311ba23c49b891bb8 100644 --- a/summit/multiview_platform/multiview_classifiers/group_scm.py +++ b/summit/multiview_platform/multiview_classifiers/group_scm.py @@ -15,7 +15,7 @@ from sklearn.utils.validation import check_random_state, check_X_y from ..multiview.multiview_utils import BaseMultiviewClassifier from ..utils.hyper_parameter_search import CustomRandint -from ..utils.dataset import get_examples_views_indices +from ..utils.dataset import get_samples_views_indices __author__ = 'maoss2' @@ -283,7 +283,7 @@ class GroupSCM(BaseMultiviewClassifier): view_indices): """Here, we extract the data from the HDF5 dataset file and store all the concatenated views in one variable""" - example_indices, self.view_indices = get_examples_views_indices(dataset, + example_indices, self.view_indices = get_samples_views_indices(dataset, example_indices, view_indices) if self.view_weights is None: