diff --git a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py index 6cf2425bf9e86d8441800011310726237e89f12f..bca4883e1fec7627a030f1cf3c2a23ffb8c11e69 100644 --- a/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py +++ b/summit/multiview_platform/monoview_classifiers/adaboost_graalpy.py @@ -11,6 +11,7 @@ from ..monoview.monoview_utils import CustomRandint, \ BaseMonoviewClassifier, change_label_to_minus, change_label_to_zero classifier_class_name = "AdaboostGraalpy" +proto=True 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..5b32fed3b440d7d95668a7b8bf63c9dafb0e3513 100644 --- a/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/adaboost_pregen.py @@ -16,7 +16,7 @@ __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "AdaboostPregen" - +proto=True 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..5b700216c63a79f2331f380917c561e503f2fe57 100644 --- a/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py +++ b/summit/multiview_platform/monoview_classifiers/additions/CBBoostUtils.py @@ -316,11 +316,11 @@ class CBBoostClassifier(BaseEstimator, ClassifierMixin, BaseBoost): def init_hypotheses(self, X, y): """Inintialization for the hyptotheses used to build the boosted vote""" - if self.estimators_generator is "Stumps": + 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 is "Trees": + if self.estimators_generator == "Trees": 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..ebf32547b66d3ab0ceddfd5727ce6c716f71ea2e 100644 --- a/summit/multiview_platform/monoview_classifiers/bagged_spkm.py +++ b/summit/multiview_platform/monoview_classifiers/bagged_spkm.py @@ -11,6 +11,7 @@ from ..utils.hyper_parameter_search import CustomRandint from ..monoview_classifiers.spkm import SPKM classifier_class_name = "BaggedSPKM" +proto=True class BaggedSPKM(BaseMonoviewClassifier, SPKMlikeSklearn): diff --git a/summit/multiview_platform/monoview_classifiers/bagging.py b/summit/multiview_platform/monoview_classifiers/bagging.py index 56c51b77701c16f1fce442c69e0635e2a30f6199..0a89ace2b1b2e659825792e072aa3d51d4090006 100644 --- a/summit/multiview_platform/monoview_classifiers/bagging.py +++ b/summit/multiview_platform/monoview_classifiers/bagging.py @@ -16,6 +16,7 @@ __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "Bagging" +proto=True 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..4edebd456caf2e322f2c045807b9221aedb5333d 100644 --- a/summit/multiview_platform/monoview_classifiers/bagging_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/bagging_pregen.py @@ -16,6 +16,7 @@ __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "BaggingPregen" +proto=True 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..56e980cb2a5bf5b58c955af297f2c478a2951536 100644 --- a/summit/multiview_platform/monoview_classifiers/cb_boost.py +++ b/summit/multiview_platform/monoview_classifiers/cb_boost.py @@ -77,8 +77,11 @@ class CBBoost(CBBoostClassifier, BaseMonoviewClassifier): ------- """ - 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) 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..9020de7c074a4cdd5480e7cb8e4c0de7175c2132 100644 --- a/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py +++ b/summit/multiview_platform/monoview_classifiers/cb_gradient_boost.py @@ -23,6 +23,7 @@ __author__ = "Baptiste Bauvin" __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "CBGradientBoosting" +proto=True 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..ca04a97d4439ae5f9acbeaafa26e1fc12c315045 100644 --- a/summit/multiview_platform/monoview_classifiers/cg_desc.py +++ b/summit/multiview_platform/monoview_classifiers/cg_desc.py @@ -3,6 +3,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier, CustomRandint classifier_class_name = "CGDesc" +proto=True 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..d454b991249001b2d72fec0b836393d7b3f63b85 100644 --- a/summit/multiview_platform/monoview_classifiers/cq_boost.py +++ b/summit/multiview_platform/monoview_classifiers/cq_boost.py @@ -6,6 +6,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier from ..utils.hyper_parameter_search import CustomRandint, CustomUniform classifier_class_name = "CQBoost" +proto=True 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..96b0aaa1498b8fbf2d73afebd4c7287a0607713c 100644 --- a/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/decision_tree_pregen.py @@ -12,6 +12,7 @@ __author__ = "Baptiste Bauvin" __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "DecisionTreePregen" +proto=True 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..0ac5d519372fed4de2bec9de9adad9473bc12b35 100644 --- a/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/gradient_boosting_pregen.py @@ -17,6 +17,7 @@ __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "GradientBoostingPregen" +proto=True 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..24ee1097af7672e967d5485502acc696772972a3 100644 --- a/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py +++ b/summit/multiview_platform/monoview_classifiers/hm_gb_cbound.py @@ -7,6 +7,7 @@ import numpy.ma as ma import math classifier_class_name = "CBBoostGradientBoosting" +proto=True 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..7f4517a1bcdef4d0642dd73b42e727206349d0a7 100644 --- a/summit/multiview_platform/monoview_classifiers/ib_random_forest.py +++ b/summit/multiview_platform/monoview_classifiers/ib_random_forest.py @@ -8,6 +8,7 @@ from ..utils.base import base_boosting_estimators from ..utils.hyper_parameter_search import CustomRandint, CustomUniform classifier_class_name = "IBRF" +proto=True 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..11bd34b6b011c67a95920b59290195047518777d 100644 --- a/summit/multiview_platform/monoview_classifiers/ib_random_scm.py +++ b/summit/multiview_platform/monoview_classifiers/ib_random_scm.py @@ -8,6 +8,7 @@ from ..utils.base import base_boosting_estimators from ..utils.hyper_parameter_search import CustomRandint, CustomUniform classifier_class_name = "IBRSCM" +proto=True 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..d7e38613fb8d041aff663f016c169756b16356ee 100644 --- a/summit/multiview_platform/monoview_classifiers/ib_scm.py +++ b/summit/multiview_platform/monoview_classifiers/ib_scm.py @@ -7,6 +7,7 @@ from ..utils.base import base_boosting_estimators from ..utils.hyper_parameter_search import CustomRandint, CustomUniform classifier_class_name = "IBSCM" +proto=True 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..f0b34878aa95fdcff44495659063ac5d2a545679 100644 --- a/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py +++ b/summit/multiview_platform/monoview_classifiers/imbalance_bagging.py @@ -7,6 +7,7 @@ from ..utils.base import base_boosting_estimators from ..utils.hyper_parameter_search import CustomRandint, CustomUniform classifier_class_name = "ImbalanceBagging" +proto=True 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..23298f1c9c14d2019fffb6d48a4329ce8ba9bdcf 100644 --- a/summit/multiview_platform/monoview_classifiers/min_cq.py +++ b/summit/multiview_platform/monoview_classifiers/min_cq.py @@ -23,6 +23,7 @@ from .additions.BoostUtils import ConvexProgram as QP classifier_class_name = "MinCQ" +proto=True # 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..9c39e5ee90fd7a5e0e87b846f48a32b794193aa4 100644 --- a/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py +++ b/summit/multiview_platform/monoview_classifiers/min_cq_graalpy.py @@ -6,6 +6,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier from ..utils.hyper_parameter_search import CustomRandint, CustomUniform classifier_class_name = "MinCQGraalpy" +proto=True 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..3d11cea8d66c6543644aea518df765bb0356be77 100644 --- a/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py +++ b/summit/multiview_platform/monoview_classifiers/pregen_gradient_boost.py @@ -17,6 +17,7 @@ __author__ = "Baptiste Bauvin" __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "PGradientBoosting" +proto=True class CustomDecisionTreeGB(DecisionTreeClassifier): @@ -59,11 +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) - if generator is "Stumps": + if generator == "Stumps": self.estimators_generator = StumpsClassifiersGenerator( n_stumps_per_attribute=self.n_stumps, self_complemented=self.self_complemented) - elif generator is "Trees": + elif generator == "Trees": 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..31795606365c88109cd3c80c0f61443d7441840e 100644 --- a/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/random_forest_pregen.py @@ -17,6 +17,7 @@ __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "RandomForestPregen" +proto=True 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..f25d6e01dd24f4f207a3ea7616bce9cc1ee27985 100644 --- a/summit/multiview_platform/monoview_classifiers/scm_mazid.py +++ b/summit/multiview_platform/monoview_classifiers/scm_mazid.py @@ -9,6 +9,7 @@ from ..monoview.monoview_utils import BaseMonoviewClassifier from ..utils.hyper_parameter_search import CustomUniform, CustomRandint classifier_class_name = 'DecisionStumpSCMNew' +proto=True 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..dd2c8d50b02b2634310012bc8b19b3b0c44475b7 100644 --- a/summit/multiview_platform/monoview_classifiers/scm_pregen.py +++ b/summit/multiview_platform/monoview_classifiers/scm_pregen.py @@ -12,6 +12,7 @@ __author__ = "Baptiste Bauvin" __status__ = "Prototype" # Production, Development, Prototype classifier_class_name = "SCMPregen" +proto=True 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..aea3b0a89677210fb435deef140955a810ed3d8b 100644 --- a/summit/multiview_platform/monoview_classifiers/self_opt_cb.py +++ b/summit/multiview_platform/monoview_classifiers/self_opt_cb.py @@ -1,6 +1,7 @@ from .additions.SelOptCB import SelfOptCBBoostClassifier classifier_class_name = "SelfOptCBBoostBaseStump" +proto=True 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..80913fc1891ffa31701a18a2deb568e17fac6e0e 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,7 @@ from .additions.SelOptCB import SelfOptCBBoostClassifier classifier_class_name = "SelfOptCBBoostBaseStump" +proto=True 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..385f3656d60705c0a8b8dd7a2687b11ce957aa45 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,7 @@ from .additions.SelOptCB import SelfOptCBBoostClassifier classifier_class_name = "SelfOptCBBoostBaseStump" +proto=True 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..7c6f4c7ce1f59cdc8a0fc5819680d37c5216c74b 100644 --- a/summit/multiview_platform/monoview_classifiers/spkm.py +++ b/summit/multiview_platform/monoview_classifiers/spkm.py @@ -9,6 +9,7 @@ from ..utils.hyper_parameter_search import CustomRandint from ..utils.dataset import get_samples_views_indices classifier_class_name = "SPKM" +proto=True 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: