From 06f2ac9309f656631e6c942f359b15fa3b0e659e Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Tue, 19 May 2020 09:51:10 -0400
Subject: [PATCH] Cuisine ok"
---
.../monoview_classifiers/additions/CBBoostUtils.py | 2 +-
summit/multiview_platform/monoview_classifiers/bagging.py | 4 ++--
.../monoview_classifiers/bagging_pregen.py | 4 ++--
.../monoview_classifiers/gradient_boosting_pregen.py | 5 +++--
summit/multiview_platform/monoview_classifiers/min_cq.py | 3 ++-
.../monoview_classifiers/min_cq_graalpy.py | 4 ++--
.../monoview_classifiers/random_forest_pregen.py | 3 ++-
summit/multiview_platform/monoview_classifiers/scm_pregen.py | 4 ++--
summit/multiview_platform/multiview_classifiers/group_scm.py | 4 ++--
9 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
index 1cffadc8..90be76c9 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 59710059..36b2f041 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 fe5d9d81..e87587f5 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 8865abc8..8ab04091 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 e64d51d6..6741caba 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 c17208f7..6d1ea085 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 d4fb2214..36f828b5 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 ad184ac3..939661ce 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 6d8fef7e..3391f979 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:
--
GitLab