diff --git a/summit/__init__.py b/summit/__init__.py
index fbe62a5795ba99a83170a4a3751ae90c9b1e3d58..9e2c30f3a193aff8b3a8c59f345c15dcff74c7ed 100644
--- a/summit/__init__.py
+++ b/summit/__init__.py
@@ -1,6 +1,4 @@
+from . import exec_classif, result_analysis, metrics, monoview_classifiers, \
+ monoview, multiview, utils, multiview_classifiers
-
-__version__ = "0.0.0.0"
-__url__ = "https://gitlab.lis-lab.fr/baptiste.bauvin/summit"
-
-from . import multiview_platform, execute
+__all__ = ['metrics', 'monoview', 'monoview_classifiers', 'multiview', 'utils']
diff --git a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py
index 6cf2425bf9e86d8441800011310726237e89f12f..3b3e11583e3b8994490e027eba7ec952d17f8dd2 100644
--- a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py
+++ b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py
@@ -11,6 +11,10 @@ from ..monoview.monoview_utils import CustomRandint, \
BaseMonoviewClassifier, change_label_to_minus, change_label_to_zero
classifier_class_name = "AdaboostGraalpy"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class AdaBoostGP(BaseEstimator, ClassifierMixin, BaseBoost):
"""Scikit-Learn compatible AdaBoost classifier. Original code by Pascal Germain, adapted by Jean-Francis Roy.
diff --git a/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py b/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py
index 43589981b438e1a12cc4b54f2cdb956c63f15a8e..900769ceacbf99a56406756f9a46a64437304bd8 100644
--- a/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py
@@ -16,7 +16,11 @@ __status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "AdaboostPregen"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class AdaboostPregen(AdaBoostClassifier, BaseMonoviewClassifier,
PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
index 8d473e08dc916d7b0cd5b83b8a0a5c5eb4a6831d..70be1480e063da82123cea3183078a7eb85bcd5a 100644
--- a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
+++ b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py
@@ -316,11 +316,19 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost):
def init_hypotheses(self, X, y):
"""Inintialization for the hyptotheses used to build the boosted vote"""
+<<<<<<< HEAD
if self.estimators_generator is "Stumps":
self.estimators_generator = StumpsClassifiersGenerator(
n_stumps_per_attribute=self.n_stumps,
self_complemented=self.self_complemented)
if self.estimators_generator is "Trees":
+=======
+ if self.estimators_generator == "Stumps":
+ self.estimators_generator = StumpsClassifiersGenerator(
+ n_stumps_per_attribute=self.n_stumps,
+ self_complemented=self.self_complemented)
+ if self.estimators_generator == "Trees":
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
self.estimators_generator = TreeClassifiersGenerator(
n_trees=self.n_stumps, max_depth=self.max_depth,
self_complemented=self.self_complemented)
diff --git a/summit/multiview_platform/monoview_classifiers/bagged_spkm.py b/summit/multiview_platform/monoview_classifiers/bagged_spkm.py
index 1a74f06469edd987078627c676581ba0bead2eb3..9b3c3a05cff95c7ee8e0e8950ece10e15604c27f 100644
--- a/summit/multiview_platform/monoview_classifiers/bagged_spkm.py
+++ b/summit/multiview_platform/monoview_classifiers/bagged_spkm.py
@@ -11,6 +11,10 @@ from ..utils.hyper_parameter_search import CustomRandint
from ..monoview_classifiers.spkm import SPKM
classifier_class_name = "BaggedSPKM"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class BaggedSPKM(BaseMonoviewClassifier, SPKMlikeSklearn):
diff --git a/summit/multiview_platform/monoview_classifiers/bagging.py b/summit/multiview_platform/monoview_classifiers/bagging.py
index 56c51b77701c16f1fce442c69e0635e2a30f6199..8cbb15121a854c6ba82b105603c53fcc1ad92a83 100644
--- a/summit/multiview_platform/monoview_classifiers/bagging.py
+++ b/summit/multiview_platform/monoview_classifiers/bagging.py
@@ -16,6 +16,10 @@ __status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "Bagging"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class Bagging(BaggingClassifier, BaseMonoviewClassifier,):
"""
diff --git a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py
index f4c7c1a631fc346540bfc215e111582abc78034e..60413fa539bc1952385ce4ed00bfa7fffb99fed1 100644
--- a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py
@@ -16,6 +16,10 @@ __status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "BaggingPregen"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class BaggingPregen(BaggingClassifier, BaseMonoviewClassifier,
PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/cb_boost.py b/summit/multiview_platform/monoview_classifiers/cb_boost.py
index bd91c954785047c3fbe4e128faa6e1cbec606cde..9403ddb8373fdc94eb92a8caa238e5f4bb7687ae 100644
--- a/summit/multiview_platform/monoview_classifiers/cb_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/cb_boost.py
@@ -77,8 +77,16 @@ class CBBoost(CBBoostClassifier, BaseMonoviewClassifier):
-------
"""
+<<<<<<< HEAD
interpret_string = self.getInterpretCBBoost(directory, base_file_name, y_test)
interpret_string += self.get_feature_importance(directory, base_file_name)
+=======
+ interpret_string = self.getInterpretCBBoost(directory, base_file_name,
+ y_test)
+ interpret_string += self.get_feature_importance(directory,
+ base_file_name,
+ feature_ids)
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
return interpret_string
def get_name_for_fusion(self):
diff --git a/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py b/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py
index b9c1c71fb72069a9c9f5b7e5bb69e39e30e455bc..7c1311d5a407d9f169414c97ff886e7691151308 100644
--- a/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py
@@ -23,6 +23,10 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "CBGradientBoosting"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class CustomDecisionTreeGB(DecisionTreeClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/cg_desc.py b/summit/multiview_platform/monoview_classifiers/cg_desc.py
index a42547fcf05f0f914c8a2f5a87382150384b7a99..f7350a9b0d7225cdf8d02b0a6d8485ab8f9128b5 100644
--- a/summit/multiview_platform/monoview_classifiers/cg_desc.py
+++ b/summit/multiview_platform/monoview_classifiers/cg_desc.py
@@ -3,6 +3,10 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier, CustomRandint
classifier_class_name = "CGDesc"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class CGDesc(ColumnGenerationClassifierQar, BaseMonoviewClassifier):
"""
diff --git a/summit/multiview_platform/monoview_classifiers/cq_boost.py b/summit/multiview_platform/monoview_classifiers/cq_boost.py
index 202829ebd01be9c3f9253b1058ff4bc4aff86c02..0c5e56aad0a9577cf4def5d67833025f0a5a532e 100644
--- a/summit/multiview_platform/monoview_classifiers/cq_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/cq_boost.py
@@ -6,6 +6,10 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier
from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
classifier_class_name = "CQBoost"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class CQBoost(ColumnGenerationClassifier, BaseMonoviewClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py b/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py
index bbcb76f256087e070968e80466d34d24ae59c877..9dd7c3e51a6b134e280172ef27d06eb546a9605a 100644
--- a/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py
@@ -12,6 +12,10 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "DecisionTreePregen"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class DecisionTreePregen(DecisionTreeClassifier, BaseMonoviewClassifier,
PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py
index 1b302cc155fc24b3e116ae7f336787d20b729cda..06fa81053adbac6981b0d5b22ef688468e174f6d 100644
--- a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py
@@ -17,6 +17,10 @@ __status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "GradientBoostingPregen"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class GradientBoostingPregen(GradientBoostingClassifier, BaseMonoviewClassifier,
PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py b/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py
index cc1f1e1145bc8afcaa43afc23d9ea0dd2e8cfe43..820f0e8bd7c37e7d429527a59cd43377e9290898 100644
--- a/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py
+++ b/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py
@@ -7,6 +7,10 @@ import numpy.ma as ma
import math
classifier_class_name = "CBBoostGradientBoosting"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class CBBoostGradientBoosting(CBBoostClassifier, BaseMonoviewClassifier):
"""
diff --git a/summit/multiview_platform/monoview_classifiers/ib_random_forest.py b/summit/multiview_platform/monoview_classifiers/ib_random_forest.py
index 2a96fa95b994607c76370dcac280f752d392cb59..f0bfffe360807b5bffd955806e053f30cc361b00 100644
--- a/summit/multiview_platform/monoview_classifiers/ib_random_forest.py
+++ b/summit/multiview_platform/monoview_classifiers/ib_random_forest.py
@@ -8,6 +8,10 @@ from ..utils.base import base_boosting_estimators
from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
classifier_class_name = "IBRF"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class IBRF(BaseMonoviewClassifier, BalancedBaggingClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/ib_random_scm.py b/summit/multiview_platform/monoview_classifiers/ib_random_scm.py
index f6a2e6e9d3b8bb1f69bf9418f907824af158695d..965e939aa83a0d97c73980eff50e915cd4a53ede 100644
--- a/summit/multiview_platform/monoview_classifiers/ib_random_scm.py
+++ b/summit/multiview_platform/monoview_classifiers/ib_random_scm.py
@@ -8,6 +8,10 @@ from ..utils.base import base_boosting_estimators
from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
classifier_class_name = "IBRSCM"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class IBRSCM(BaseMonoviewClassifier, BalancedBaggingClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/ib_scm.py b/summit/multiview_platform/monoview_classifiers/ib_scm.py
index aadbae57fc64d4cfe4193d7c2e4cbec3c53d601a..19fe10a132cb6d2a2f7fb17b26779b073392ea90 100644
--- a/summit/multiview_platform/monoview_classifiers/ib_scm.py
+++ b/summit/multiview_platform/monoview_classifiers/ib_scm.py
@@ -7,6 +7,10 @@ from ..utils.base import base_boosting_estimators
from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
classifier_class_name = "IBSCM"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class IBSCM(BaseMonoviewClassifier, BalancedBaggingClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py b/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py
index 525b52aa69411affa604807993413f85dab04433..c141ed2f5667aa6501c5c02a3fd346d50840c311 100644
--- a/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py
+++ b/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py
@@ -7,6 +7,10 @@ from ..utils.base import base_boosting_estimators
from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
classifier_class_name = "ImbalanceBagging"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class ImbalanceBagging(BaseMonoviewClassifier, BalancedBaggingClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/knn.py b/summit/multiview_platform/monoview_classifiers/knn.py
index c23d4d3f910449d4abefc810bf64a110f58b05ae..0281e4fc465ae2dd5b37aa400a9cb32ba40602f8 100644
--- a/summit/multiview_platform/monoview_classifiers/knn.py
+++ b/summit/multiview_platform/monoview_classifiers/knn.py
@@ -8,6 +8,7 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "KNN"
+proto=True
class KNN(KNeighborsClassifier, BaseMonoviewClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/min_cq.py b/summit/multiview_platform/monoview_classifiers/min_cq.py
index dfc294af52a9843b4fe89dc14816ebb67fba7a2a..35f06bf3900bbbae705f4c628caca3dde538145d 100644
--- a/summit/multiview_platform/monoview_classifiers/min_cq.py
+++ b/summit/multiview_platform/monoview_classifiers/min_cq.py
@@ -23,6 +23,10 @@ from .additions.BoostUtils import ConvexProgram as QP
classifier_class_name = "MinCQ"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
# from majority_vote import MajorityVote
# from voter import StumpsVotersGenerator, KernelVotersGenerator
diff --git a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py
index 6d1ea085e30f531e666a6b55f231dc97ab6196f0..1cb8d2b3f6501c030d42d99d1166f6c98029c4ec 100644
--- a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py
+++ b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py
@@ -6,6 +6,10 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier
from ..utils.hyper_parameter_search import CustomRandint, CustomUniform
classifier_class_name = "MinCQGraalpy"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class MinCQGraalpy(RegularizedBinaryMinCqClassifier, BaseMonoviewClassifier):
"""
diff --git a/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py b/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py
index f9de6c819fc6a972a26469c47dc5261f032f84a8..176c27073f6acc6c03ad9d9d1eafee99ab289c0a 100644
--- a/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py
+++ b/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py
@@ -17,6 +17,10 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "PGradientBoosting"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class CustomDecisionTreeGB(DecisionTreeClassifier):
@@ -59,11 +63,19 @@ class PGradientBoosting(GradientBoostingClassifier, BaseMonoviewClassifier, Base
def pregen_voters(self, X, y=None, generator="Stumps"):
if y is not None:
neg_y = change_label_to_minus(y)
+<<<<<<< HEAD
if generator is "Stumps":
self.estimators_generator = StumpsClassifiersGenerator(
n_stumps_per_attribute=self.n_stumps,
self_complemented=self.self_complemented)
elif generator is "Trees":
+=======
+ if generator == "Stumps":
+ self.estimators_generator = StumpsClassifiersGenerator(
+ n_stumps_per_attribute=self.n_stumps,
+ self_complemented=self.self_complemented)
+ elif generator == "Trees":
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
self.estimators_generator = TreeClassifiersGenerator(
n_trees=self.n_stumps, max_depth=self.max_depth_pregen)
self.estimators_generator.fit(X, neg_y)
diff --git a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py b/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py
index fe54b17a000c125ced979563f308d47e5b85a7b5..133474bf3e34cd90fa76d830c93b536a382e5ee9 100644
--- a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py
@@ -17,6 +17,10 @@ __status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "RandomForestPregen"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class RandomForestPregen(RandomForestClassifier, BaseMonoviewClassifier,
PregenClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/scm_mazid.py b/summit/multiview_platform/monoview_classifiers/scm_mazid.py
index 023e92a34cf3ab93adce3432e8088a4a0d481228..ddc24b83e7a834175c821ef0f71529a4cb1146bd 100644
--- a/summit/multiview_platform/monoview_classifiers/scm_mazid.py
+++ b/summit/multiview_platform/monoview_classifiers/scm_mazid.py
@@ -9,6 +9,10 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier
from ..utils.hyper_parameter_search import CustomUniform, CustomRandint
classifier_class_name = 'DecisionStumpSCMNew'
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class DecisionStumpSCMNew(BaseMonoviewClassifier):
"""
diff --git a/summit/multiview_platform/monoview_classifiers/scm_pregen.py b/summit/multiview_platform/monoview_classifiers/scm_pregen.py
index 939661ce9c520950cbd4cc0f399866977a59bae8..8d3e405a71b4ac8cae0632a72a4e609a66966609 100644
--- a/summit/multiview_platform/monoview_classifiers/scm_pregen.py
+++ b/summit/multiview_platform/monoview_classifiers/scm_pregen.py
@@ -12,6 +12,10 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "SCMPregen"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class SCMPregen(BaseMonoviewClassifier, PregenClassifier, scm):
"""
diff --git a/summit/multiview_platform/monoview_classifiers/self_opt_cb.py b/summit/multiview_platform/monoview_classifiers/self_opt_cb.py
index 711e2629923c16b64eb21543115939acd3aabd75..8d1fbcc9426788bdff30446143199bc2337a691a 100644
--- a/summit/multiview_platform/monoview_classifiers/self_opt_cb.py
+++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb.py
@@ -1,6 +1,10 @@
from .additions.SelOptCB import SelfOptCBBoostClassifier
classifier_class_name = "SelfOptCBBoostBaseStump"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class SelfOptCBBoostBaseStump(SelfOptCBBoostClassifier):
def __init__(self, n_max_iterations=10, random_state=42, twice_the_same=True,
diff --git a/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py b/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py
index 18f028c8d4912c86f8d0b5d3629c23b502fbf290..e040fb50c38dee8b5ae0afa27d67fc0c69eb799f 100644
--- a/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py
+++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py
@@ -1,6 +1,10 @@
from .additions.SelOptCB import SelfOptCBBoostClassifier
classifier_class_name = "SelfOptCBBoostBaseStump"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class SelfOptCBBoostBaseStump(SelfOptCBBoostClassifier):
def __init__(self, n_max_iterations=10, random_state=42, twice_the_same=True,
diff --git a/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py b/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py
index d7f671f0341c2d8a7fa76eaa377f16352fe44630..8843853019386b18554aa82a6ecd3abf3b0ae7c1 100644
--- a/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py
+++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py
@@ -1,6 +1,10 @@
from .additions.SelOptCB import SelfOptCBBoostClassifier
classifier_class_name = "SelfOptCBBoostBaseStump"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class SelfOptCBBoostBaseStump(SelfOptCBBoostClassifier):
def __init__(self, n_max_iterations=10, random_state=42, twice_the_same=True,
diff --git a/summit/multiview_platform/monoview_classifiers/sgd.py b/summit/multiview_platform/monoview_classifiers/sgd.py
index 312a2bf26b91afb2d857716837c2eddf99883e9d..18314c0685aad9409d101a91615dcf7f5b53a184 100644
--- a/summit/multiview_platform/monoview_classifiers/sgd.py
+++ b/summit/multiview_platform/monoview_classifiers/sgd.py
@@ -8,6 +8,7 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "SGD"
+proto=True
class SGD(SGDClassifier, BaseMonoviewClassifier):
diff --git a/summit/multiview_platform/monoview_classifiers/spkm.py b/summit/multiview_platform/monoview_classifiers/spkm.py
index 4c9aeebd6fbc04aed146367e5dcbbbdb42b47b93..5976ccac2a1f7665659b4e76acada7e640ff6ff4 100644
--- a/summit/multiview_platform/monoview_classifiers/spkm.py
+++ b/summit/multiview_platform/monoview_classifiers/spkm.py
@@ -9,6 +9,10 @@ from ..utils.hyper_parameter_search import CustomRandint
from ..utils.dataset import get_samples_views_indices
classifier_class_name = "SPKM"
+<<<<<<< HEAD
+=======
+proto=True
+>>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
class SPKM(BaseMonoviewClassifier, SPKMlikeSklearn):
diff --git a/summit/multiview_platform/monoview_classifiers/svm_linear.py b/summit/multiview_platform/monoview_classifiers/svm_linear.py
index e6f7fb1e2d9f05cd44f41e2db151c9ab27dfdf68..48e4d17b8a5f4f38067adc981e0576db84ed3433 100644
--- a/summit/multiview_platform/monoview_classifiers/svm_linear.py
+++ b/summit/multiview_platform/monoview_classifiers/svm_linear.py
@@ -8,7 +8,7 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "SVMLinear"
-
+proto=True
class SVMLinear(SVCClassifier, BaseMonoviewClassifier):
"""
diff --git a/summit/multiview_platform/monoview_classifiers/svm_poly.py b/summit/multiview_platform/monoview_classifiers/svm_poly.py
index c1c9da6e8c9f09d4663e83356927be92ed2e4d44..7d950e9403b45578b61c4f2468f5c73b0d0e2465 100644
--- a/summit/multiview_platform/monoview_classifiers/svm_poly.py
+++ b/summit/multiview_platform/monoview_classifiers/svm_poly.py
@@ -11,7 +11,7 @@ __author__ = "Baptiste Bauvin"
__status__ = "Prototype" # Production, Development, Prototype
classifier_class_name = "SVMPoly"
-
+proto=True
class SVMPoly(SVCClassifier, BaseMonoviewClassifier):
"""
diff --git a/summit/multiview_platform/multiview/multiview_utils.py b/summit/multiview_platform/multiview/multiview_utils.py
index 93a56639cd72514ab179357731838dd4aaf925db..19fb7ee87a4c2e90fdd3b7be23b33486cc022aa8 100644
--- a/summit/multiview_platform/multiview/multiview_utils.py
+++ b/summit/multiview_platform/multiview/multiview_utils.py
@@ -140,7 +140,9 @@ def get_available_monoview_classifiers(need_probas=False):
available_classifiers = [module_name
for module_name in dir(monoview_classifiers)
if not (
- module_name.startswith("__") or module_name == "additions")]
+ module_name.startswith("__") or
+ module_name == "additions" or
+ hasattr(getattr(monoview_classifiers, module_name), "proto"))]
if need_probas:
proba_classifiers = []
for module_name in available_classifiers: