diff --git a/config_files/config_test.yml b/config_files/config_test.yml index 2edb012bd2f148ad0d93ba94fd62ba9e606209cd..e98dc442c64126c478dc9d38794a98f4449bef35 100644 --- a/config_files/config_test.yml +++ b/config_files/config_test.yml @@ -1,7 +1,7 @@ # The base configuration of the benchmark Base : - log: true - name: ["Plausible"] + log: True + name: ["control_vs_malade"] label: "_" type: ".hdf5" views: @@ -18,18 +18,18 @@ Base : # All the classification-realted configuration options Classification: multiclass_method: "oneVersusOne" - split: 0.8 - nb_folds: 2 + split: 0.4 + nb_folds: 5 nb_class: 2 classes: type: ["multiview"] algos_monoview: ["all"] algos_multiview: ["lp_norm_mkl",] - stats_iter: 2 + stats_iter: 5 metrics: ["accuracy_score", "f1_score"] metric_princ: "f1_score" hps_type: "randomized_search" - hps_iter: 2 + hps_iter: 30 ##################################### diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/kernel_learning.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/kernel_learning.py index beb24789784e532ee45f1a37e42b562b3172496f..26c860809ef993e07edb6bd8a949f5340809dcf2 100644 --- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/kernel_learning.py +++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/additions/kernel_learning.py @@ -68,7 +68,7 @@ class KernelConfigDistribution: def __init__(self, seed=42): self.random_state=np.random.RandomState(seed) self.possible_config = { - "additive_chi2": {"gamma": CustomUniform()}, + "chi2": {"gamma": CustomUniform()}, "rbf": {"gamma": CustomUniform()}, } @@ -95,7 +95,7 @@ class KernelDistribution: def __init__(self, seed=42): self.random_state=np.random.RandomState(seed) - self.available_kernels = ["rbf",] + self.available_kernels = ["rbf"] def draw(self, nb_view): return list(self.random_state.choice(self.available_kernels, nb_view)) diff --git a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/lp_norm_mkl.py b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/lp_norm_mkl.py index 72722d01addbfacfde09a8e7b3349cb2a37814d0..8783bf70d97ca3928f4802763f1e702ad77bb94c 100644 --- a/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/lp_norm_mkl.py +++ b/multiview_platform/mono_multi_view_classifiers/multiview_classifiers/lp_norm_mkl.py @@ -31,7 +31,8 @@ class LPNormMKL(KernelClassifier, MKL): return super(LPNormMKL, self).fit(formatted_X, y[train_indices]) def predict(self, X, example_indices=None, view_indices=None): - print(self.C.shape) + # print(self.K_) + # import pdb;pdb.set_trace() new_X, _ = self.format_X(X, example_indices, view_indices) return self.extract_labels(super(LPNormMKL, self).predict(new_X))