From cd1a3d4306d258ac13c772e24c87a28c0a8837be Mon Sep 17 00:00:00 2001 From: Baptiste Bauvin <bbauvin@gra-login2.graham.sharcnet> Date: Tue, 22 Nov 2022 10:11:16 -0500 Subject: [PATCH] Valid --- .../monoview_classifiers/adaboost_graalpy.py | 3 --- .../monoview_classifiers/adaboost_pregen.py | 4 ---- .../monoview_classifiers/additions/CBBoostUtils.py | 8 -------- .../monoview_classifiers/bagged_spkm.py | 3 --- .../monoview_classifiers/bagging.py | 3 --- .../monoview_classifiers/bagging_pregen.py | 3 --- .../monoview_classifiers/cb_boost.py | 5 ----- .../monoview_classifiers/cb_gradient_boost.py | 3 --- .../monoview_classifiers/cg_desc.py | 3 --- .../monoview_classifiers/cq_boost.py | 3 --- .../monoview_classifiers/decision_tree_pregen.py | 3 --- .../monoview_classifiers/gradient_boosting_pregen.py | 3 --- .../monoview_classifiers/hm_gb_cbound.py | 3 --- .../monoview_classifiers/ib_random_forest.py | 3 --- .../monoview_classifiers/ib_random_scm.py | 3 --- .../multiview_platform/monoview_classifiers/ib_scm.py | 3 --- .../monoview_classifiers/imbalance_bagging.py | 3 --- .../multiview_platform/monoview_classifiers/min_cq.py | 3 --- .../monoview_classifiers/min_cq_graalpy.py | 3 --- .../monoview_classifiers/pregen_gradient_boost.py | 11 ----------- .../monoview_classifiers/random_forest_pregen.py | 3 --- .../monoview_classifiers/scm_mazid.py | 3 --- .../monoview_classifiers/scm_pregen.py | 3 --- .../monoview_classifiers/self_opt_cb.py | 3 --- .../monoview_classifiers/self_opt_cb_pseudo.py | 3 --- .../monoview_classifiers/self_opt_cb_root.py | 3 --- .../multiview_platform/monoview_classifiers/spkm.py | 3 --- 27 files changed, 97 deletions(-) diff --git a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py index 3b3e1158..bca4883e 100644 --- a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py +++ b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py @@ -11,10 +11,7 @@ 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 900769ce..5b32fed3 100644 --- a/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py @@ -16,11 +16,7 @@ __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 70be1480..5b700216 100644 --- a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py +++ b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py @@ -316,19 +316,11 @@ 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 9b3c3a05..ebf32547 100644 --- a/summit/multiview_platform/monoview_classifiers/bagged_spkm.py +++ b/summit/multiview_platform/monoview_classifiers/bagged_spkm.py @@ -11,10 +11,7 @@ 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 8cbb1512..0a89ace2 100644 --- a/summit/multiview_platform/monoview_classifiers/bagging.py +++ b/summit/multiview_platform/monoview_classifiers/bagging.py @@ -16,10 +16,7 @@ __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 60413fa5..4edebd45 100644 --- a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py @@ -16,10 +16,7 @@ __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 9403ddb8..56e980cb 100644 --- a/summit/multiview_platform/monoview_classifiers/cb_boost.py +++ b/summit/multiview_platform/monoview_classifiers/cb_boost.py @@ -77,16 +77,11 @@ 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 7c1311d5..9020de7c 100644 --- a/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py +++ b/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py @@ -23,10 +23,7 @@ __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 f7350a9b..ca04a97d 100644 --- a/summit/multiview_platform/monoview_classifiers/cg_desc.py +++ b/summit/multiview_platform/monoview_classifiers/cg_desc.py @@ -3,10 +3,7 @@ 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 0c5e56aa..d454b991 100644 --- a/summit/multiview_platform/monoview_classifiers/cq_boost.py +++ b/summit/multiview_platform/monoview_classifiers/cq_boost.py @@ -6,10 +6,7 @@ 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 9dd7c3e5..96b0aaa1 100644 --- a/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py @@ -12,10 +12,7 @@ __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 06fa8105..0ac5d519 100644 --- a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py @@ -17,10 +17,7 @@ __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 820f0e8b..24ee1097 100644 --- a/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py +++ b/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py @@ -7,10 +7,7 @@ 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 f0bfffe3..7f4517a1 100644 --- a/summit/multiview_platform/monoview_classifiers/ib_random_forest.py +++ b/summit/multiview_platform/monoview_classifiers/ib_random_forest.py @@ -8,10 +8,7 @@ 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 965e939a..11bd34b6 100644 --- a/summit/multiview_platform/monoview_classifiers/ib_random_scm.py +++ b/summit/multiview_platform/monoview_classifiers/ib_random_scm.py @@ -8,10 +8,7 @@ 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 19fe10a1..d7e38613 100644 --- a/summit/multiview_platform/monoview_classifiers/ib_scm.py +++ b/summit/multiview_platform/monoview_classifiers/ib_scm.py @@ -7,10 +7,7 @@ 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 c141ed2f..f0b34878 100644 --- a/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py +++ b/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py @@ -7,10 +7,7 @@ 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/min_cq.py b/summit/multiview_platform/monoview_classifiers/min_cq.py index 35f06bf3..23298f1c 100644 --- a/summit/multiview_platform/monoview_classifiers/min_cq.py +++ b/summit/multiview_platform/monoview_classifiers/min_cq.py @@ -23,10 +23,7 @@ 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 1cb8d2b3..9c39e5ee 100644 --- a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py +++ b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py @@ -6,10 +6,7 @@ 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 176c2707..3d11cea8 100644 --- a/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py +++ b/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py @@ -17,10 +17,7 @@ __author__ = "Baptiste Bauvin" __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "PGradientBoosting" -<<<<<<< HEAD -======= proto=True ->>>>>>> 258ada8c7e5025f984b03343596557abe8d3f5a4 class CustomDecisionTreeGB(DecisionTreeClassifier): @@ -63,19 +60,11 @@ 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 133474bf..31795606 100644 --- a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py +++ b/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): diff --git a/summit/multiview_platform/monoview_classifiers/scm_mazid.py b/summit/multiview_platform/monoview_classifiers/scm_mazid.py index ddc24b83..f25d6e01 100644 --- a/summit/multiview_platform/monoview_classifiers/scm_mazid.py +++ b/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): """ diff --git a/summit/multiview_platform/monoview_classifiers/scm_pregen.py b/summit/multiview_platform/monoview_classifiers/scm_pregen.py index 8d3e405a..dd2c8d50 100644 --- a/summit/multiview_platform/monoview_classifiers/scm_pregen.py +++ b/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): """ diff --git a/summit/multiview_platform/monoview_classifiers/self_opt_cb.py b/summit/multiview_platform/monoview_classifiers/self_opt_cb.py index 8d1fbcc9..aea3b0a8 100644 --- a/summit/multiview_platform/monoview_classifiers/self_opt_cb.py +++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb.py @@ -1,10 +1,7 @@ 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 e040fb50..80913fc1 100644 --- a/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py +++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb_pseudo.py @@ -1,10 +1,7 @@ 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 88438530..385f3656 100644 --- a/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py +++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb_root.py @@ -1,10 +1,7 @@ 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/spkm.py b/summit/multiview_platform/monoview_classifiers/spkm.py index 5976ccac..7c6f4c7c 100644 --- a/summit/multiview_platform/monoview_classifiers/spkm.py +++ b/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): -- GitLab