From 2f8905fb60d488d6b9303ee5fd747b3858528ed3 Mon Sep 17 00:00:00 2001
From: Baptiste Bauvin <baptiste.bauvin@lis-lab.fr>
Date: Wed, 6 Nov 2019 08:21:35 -0500
Subject: [PATCH] MKL adaptation ongoing
---
config_files/config_test.yml | 12 ++++++------
.../additions/kernel_learning.py | 4 ++--
.../multiview_classifiers/lp_norm_mkl.py | 3 ++-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/config_files/config_test.yml b/config_files/config_test.yml
index 2edb012b..e98dc442 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 beb24789..26c86080 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 72722d01..8783bf70 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))
--
GitLab