From ea1e2d28138acdfa1f3df7e864682b08f854545c Mon Sep 17 00:00:00 2001 From: Alejandro Moreo Date: Mon, 20 May 2024 10:15:05 +0200 Subject: [PATCH] more baselines, kde, and dm --- LeQua2024/baselines.py | 8 +++++++- LeQua2024/run_baselines.sh | 2 +- quapy/plot.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/LeQua2024/baselines.py b/LeQua2024/baselines.py index 0903eb2..2a12fdb 100644 --- a/LeQua2024/baselines.py +++ b/LeQua2024/baselines.py @@ -37,12 +37,18 @@ def wrap_params(cls_params:dict, prefix:str): def baselines(): q_params = wrap_params(lr_params, 'classifier') + kde_params = {**q_params, 'bandwidth': np.linspace(0.01, 0.20, 20)} + dm_params = {**q_params, 'nbins': [2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 64]} yield CC(new_cls()), "CC", q_params yield ACC(new_cls()), "ACC", q_params yield PCC(new_cls()), "PCC", q_params yield PACC(new_cls()), "PACC", q_params - yield KDEyML(new_cls()), "KDEy-ML", {**q_params, 'bandwidth': np.linspace(0.01, 0.20, 20)} + yield SLD(new_cls()), "SLD", q_params + yield KDEyML(new_cls()), "KDEy-ML", kde_params + yield KDEyHD(new_cls()), "KDEy-HD", kde_params + # yield KDEyCS(new_cls()), "KDEy-CS", kde_params + yield DMy(new_cls()), "DMy", dm_params def main(args): diff --git a/LeQua2024/run_baselines.sh b/LeQua2024/run_baselines.sh index c348ca5..445870b 100755 --- a/LeQua2024/run_baselines.sh +++ b/LeQua2024/run_baselines.sh @@ -25,7 +25,7 @@ fi for task in T1 T2 T3 T4 ; do -# PYTHONPATH=.:scripts/:.. python3 baselines.py $task data/ + PYTHONPATH=.:scripts/:.. python3 baselines.py $task data/ TEST_SAMPLES=data/lequa2024/$task/public/test_samples diff --git a/quapy/plot.py b/quapy/plot.py index cdc3bd5..78911ec 100644 --- a/quapy/plot.py +++ b/quapy/plot.py @@ -1,6 +1,6 @@ from collections import defaultdict import matplotlib.pyplot as plt -from matplotlib.cm import get_cmap +from matplotlib.pyplot import get_cmap import numpy as np from matplotlib import cm from scipy.stats import ttest_ind_from_stats