Valid

summit/multiview_platform/monoview_classifiers/random_forest_pregen.py

@@ -17,10 +17,7 @@ __status__ = "Prototype"  # Production, Development, Prototype
 
 
 classifier_class_name = "RandomForestPregen"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class RandomForestPregen(RandomForestClassifier, BaseMonoviewClassifier,
                     PregenClassifier):

summit/multiview_platform/monoview_classifiers/scm_mazid.py

@@ -9,10 +9,7 @@ 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):
     """

summit/multiview_platform/monoview_classifiers/scm_pregen.py

@@ -12,10 +12,7 @@ __author__ = "Baptiste Bauvin"
 __status__ = "Prototype"  # Production, Development, Prototype
 
 classifier_class_name = "SCMPregen"
-<<<<<<< HEAD
-=======
 proto=True
->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4
 
 class SCMPregen(BaseMonoviewClassifier, PregenClassifier, scm):
     """

summit/multiview_platform/monoview_classifiers/self_opt_cb.py

 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,

summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py

 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,

summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py

 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,

summit/multiview_platform/monoview_classifiers/spkm.py

@@ -9,10 +9,7 @@ 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):