lorenzo.volpi
/
QuAcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conf updated

This commit is contained in:
Lorenzo Volpi 2023-12-21 16:47:59 +01:00
parent a8792c3df9
commit 6e52ff1d26
5 changed files with 4456 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TODO.md
View File

@ -50,4 +50,14 @@
- [ ] testare kernel density estimation (alternativa sld) - [ ] testare kernel density estimation (alternativa sld)
- [ ] significatività statistica (lunedì ore 10.00) - [ ] significatività statistica (lunedì ore 10.00)
- [ ] usare un metodo diverso di classificazione sia di partenza che dentro quantificatore per cifar10 - [ ] usare un metodo diverso di classificazione sia di partenza che dentro quantificatore per cifar10
- [ ] valutare altre possibili esplorazioni del caso binario - [ ] valutare altre possibili esplorazioni del caso binario
multiclass:
- [x] aggiungere classe per gestire risultato estimator (ExtendedPrev)
- [x] sistemare return in MCAE e BQAE estimate
- [x] modificare acc e f1 in error.py
- [x] modificare report.py in modo che l'index del dataframe sia una tupla di prevalence
- [x] modificare plot per adattarsi a modifiche report
- [x] aggiungere supporto a multiclass in dataset.py
- [x] aggiungere group_false in ExtensionPolicy
- [ ] modificare BQAE in modo che i quantifier si adattino alla casistica(binary/multi in base a group_false)

330
conf.yaml
View File

@ -4,158 +4,284 @@ debug_conf: &debug_conf
- acc - acc
OUT_DIR_NAME: output/debug OUT_DIR_NAME: output/debug
DATASET_N_PREVS: 9 DATASET_N_PREVS: 9
DATASET_PREVS:
- 0.5
COMP_ESTIMATORS: COMP_ESTIMATORS:
# - bin_sld - bin_sld_lr
# - mul_sld - mul_sld_lr
# - m3w_sld - m3w_sld_lr
# - bin_sld_gs - d_bin_sld_lr
- mul_kde_gs - d_mul_sld_lr
- m3w_kde_gs - d_m3w_sld_lr
- bin_kde_gs - d_bin_sld_rbf
# - m3w_sld_gs - d_mul_sld_rbf
# - doc - d_m3w_sld_rbf
# - atc_mc - bin_kde_lr
- mul_kde_lr
- m3w_kde_lr
- d_bin_kde_lr
- d_mul_kde_lr
- d_m3w_kde_lr
- d_bin_kde_rbf
- d_mul_kde_rbf
- d_m3w_kde_rbf
# - mandoline
# - rca
- doc
- atc_mc
N_JOBS: -2 N_JOBS: -2
confs: confs:
- DATASET_NAME: imdb - DATASET_NAME: imdb
other_confs: other_confs:
- DATASET_NAME: twitter_gasp
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: CCAT DATASET_TARGET: CCAT
main:
kde_conf: &kde_conf confs: &main_confs
global:
METRICS:
- acc
- f1
OUT_DIR_NAME: output/kde/gs
DATASET_N_PREVS: 9
COMP_ESTIMATORS:
- bin_kde_gs
- mul_kde_gs
- m3w_kde_gs
N_JOBS: -2
confs:
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: CCAT DATASET_TARGET: CCAT
other_confs: other_confs:
- DATASET_NAME: imdb - DATASET_NAME: imdb
test_conf: &test_conf sld_lr_conf: &sld_lr_conf
global:
METRICS:
- acc
- f1
OUT_DIR_NAME: output/test
DATASET_N_PREVS: 9
# DATASET_PREVS:
# - 0.5
COMP_ESTIMATORS:
- bin_sld
- mul_sld
- mul3w_sld
- binc_sld
- mulc_sld
- mul3wc_sld
- binmc_sld
- mulmc_sld
- mul3wmc_sld
- binne_sld
- mulne_sld
- mul3wne_sld
# - bin_sld_gs
# - mul_sld_gs
# - mul3w_sld_gs
- atc_mc
- atc_ne
- doc_feat
- kfcv
confs:
- DATASET_NAME: cifar10
DATASET_TARGET: dog
other_confs:
- DATASET_NAME: rcv1
DATASET_TARGET: GCAT
- DATASET_NAME: imdb
main_conf: &main_conf
global: global:
METRICS: METRICS:
- acc - acc
- f1 - f1
OUT_DIR_NAME: output/main OUT_DIR_NAME: output/sld_lr
DATASET_N_PREVS: 9 DATASET_N_PREVS: 9
N_JOBS: -2
COMP_ESTIMATORS: COMP_ESTIMATORS:
- bin_sld - bin_sld_lr
- mul_sld - mul_sld_lr
- m3w_sld - m3w_sld_lr
- binc_sld - bin_sld_lr_c
- mulc_sld - mul_sld_lr_c
- m3wc_sld - m3w_sld_lr_c
- binmc_sld - bin_sld_lr_mc
- mulmc_sld - mul_sld_lr_mc
- m3wmc_sld - m3w_sld_lr_mc
- binne_sld - bin_sld_lr_ne
- mulne_sld - mul_sld_lr_ne
- m3wne_sld - m3w_sld_lr_ne
- binis_sld - bin_sld_lr_is
- mulis_sld - mul_sld_lr_is
- m3wis_sld - m3w_sld_lr_is
- bin_sld_gs - bin_sld_lr_gs
- mul_sld_gs - mul_sld_lr_gs
- m3w_sld_gs - m3w_sld_lr_gs
- doc - doc
- atc_mc - atc_mc
- gde
- rca
- rca_star
- mandoline
confs: confs: *main_confs
- DATASET_NAME: cifar10
DATASET_TARGET: dog
confs_next: confs_next:
- DATASET_NAME: imdb - DATASET_NAME: imdb
- DATASET_NAME: twitter_gasp
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: CCAT DATASET_TARGET: CCAT
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: GCAT DATASET_TARGET: GCAT
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: MCAT DATASET_TARGET: MCAT
- DATASET_NAME: cifar10
DATASET_TARGET: dog
add_conf: &add_conf d_sld_lr_conf: &d_sld_lr_conf
global: global:
METRICS: METRICS:
- acc - acc
- f1 - f1
OUT_DIR_NAME: output/add/m3w OUT_DIR_NAME: output/d_sld_lr
DATASET_N_PREVS: 9 DATASET_N_PREVS: 9
N_JOBS: -2
COMP_ESTIMATORS: COMP_ESTIMATORS:
- m3w_sld - d_bin_sld_lr
- m3wc_sld - d_mul_sld_lr
- m3wmc_sld - d_m3w_sld_lr
- m3wne_sld - d_bin_sld_lr_c
- m3wis_sld - d_mul_sld_lr_c
- m3w_sld_gs - d_m3w_sld_lr_c
- d_bin_sld_lr_mc
- d_mul_sld_lr_mc
- d_m3w_sld_lr_mc
- d_bin_sld_lr_ne
- d_mul_sld_lr_ne
- d_m3w_sld_lr_ne
- d_bin_sld_lr_is
- d_mul_sld_lr_is
- d_m3w_sld_lr_is
- d_bin_sld_lr_gs
- d_mul_sld_lr_gs
- d_m3w_sld_lr_gs
- doc
- atc_mc
confs: confs: *main_confs
confs_next:
- DATASET_NAME: rcv1
DATASET_TARGET: CCAT
- DATASET_NAME: imdb
- DATASET_NAME: twitter_gasp
- DATASET_NAME: rcv1
DATASET_TARGET: GCAT
- DATASET_NAME: rcv1
DATASET_TARGET: MCAT
- DATASET_NAME: cifar10 - DATASET_NAME: cifar10
DATASET_TARGET: dog DATASET_TARGET: dog
d_sld_rbf_conf: &d_sld_rbf_conf
global:
METRICS:
- acc
- f1
OUT_DIR_NAME: output/d_sld_rbf
DATASET_N_PREVS: 9
N_JOBS: -2
COMP_ESTIMATORS:
- d_bin_sld_rbf
- d_mul_sld_rbf
- d_m3w_sld_rbf
- d_bin_sld_rbf_c
- d_mul_sld_rbf_c
- d_m3w_sld_rbf_c
- d_bin_sld_rbf_mc
- d_mul_sld_rbf_mc
- d_m3w_sld_rbf_mc
- d_bin_sld_rbf_ne
- d_mul_sld_rbf_ne
- d_m3w_sld_rbf_ne
- d_bin_sld_rbf_is
- d_mul_sld_rbf_is
- d_m3w_sld_rbf_is
- d_bin_sld_rbf_gs
- d_mul_sld_rbf_gs
- d_m3w_sld_rbf_gs
- doc
- atc_mc
confs: *main_confs
confs_next: confs_next:
- DATASET_NAME: imdb - DATASET_NAME: imdb
- DATASET_NAME: twitter_gasp
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: CCAT DATASET_TARGET: CCAT
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: GCAT DATASET_TARGET: GCAT
- DATASET_NAME: rcv1 - DATASET_NAME: rcv1
DATASET_TARGET: MCAT DATASET_TARGET: MCAT
- DATASET_NAME: cifar10
DATASET_TARGET: dog
kde_lr_conf: &kde_lr_conf
global:
METRICS:
- acc
- f1
OUT_DIR_NAME: output/kde_lr
DATASET_N_PREVS: 9
COMP_ESTIMATORS:
- bin_kde_lr
- mul_kde_lr
- m3w_kde_lr
- bin_kde_lr_c
- mul_kde_lr_c
- m3w_kde_lr_c
- bin_kde_lr_mc
- mul_kde_lr_mc
- m3w_kde_lr_mc
- bin_kde_lr_ne
- mul_kde_lr_ne
- m3w_kde_lr_ne
- bin_kde_lr_is
- mul_kde_lr_is
- m3w_kde_lr_is
- bin_kde_lr_gs
- mul_kde_lr_gs
- m3w_kde_lr_gs
- doc
- atc_mc
N_JOBS: -2
confs: *main_confs
other_confs:
- DATASET_NAME: imdb
- DATASET_NAME: rcv1
DATASET_TARGET: CCAT
d_kde_lr_conf: &d_kde_lr_conf
global:
METRICS:
- acc
- f1
OUT_DIR_NAME: output/d_kde_lr
DATASET_N_PREVS: 9
COMP_ESTIMATORS:
- d_bin_kde_lr
- d_mul_kde_lr
- d_m3w_kde_lr
- d_bin_kde_lr_c
- d_mul_kde_lr_c
- d_m3w_kde_lr_c
- d_bin_kde_lr_mc
- d_mul_kde_lr_mc
- d_m3w_kde_lr_mc
- d_bin_kde_lr_ne
- d_mul_kde_lr_ne
- d_m3w_kde_lr_ne
- d_bin_kde_lr_is
- d_mul_kde_lr_is
- d_m3w_kde_lr_is
- d_bin_kde_lr_gs
- d_mul_kde_lr_gs
- d_m3w_kde_lr_gs
- doc
- atc_mc
N_JOBS: -2
confs: *main_confs
other_confs:
- DATASET_NAME: imdb
- DATASET_NAME: rcv1
DATASET_TARGET: CCAT
d_kde_rbf_conf: &d_kde_rbf_conf
global:
METRICS:
- acc
- f1
OUT_DIR_NAME: output/d_kde_rbf
DATASET_N_PREVS: 9
COMP_ESTIMATORS:
- d_bin_kde_rbf
- d_mul_kde_rbf
- d_m3w_kde_rbf
- d_bin_kde_rbf_c
- d_mul_kde_rbf_c
- d_m3w_kde_rbf_c
- d_bin_kde_rbf_mc
- d_mul_kde_rbf_mc
- d_m3w_kde_rbf_mc
- d_bin_kde_rbf_ne
- d_mul_kde_rbf_ne
- d_m3w_kde_rbf_ne
- d_bin_kde_rbf_is
- d_mul_kde_rbf_is
- d_m3w_kde_rbf_is
- d_bin_kde_rbf_gs
- d_mul_kde_rbf_gs
- d_m3w_kde_rbf_gs
- doc
- atc_mc
N_JOBS: -2
confs: *main_confs
other_confs:
- DATASET_NAME: imdb
- DATASET_NAME: rcv1
DATASET_TARGET: CCAT
exec: *debug_conf exec: *sld_lr_conf

4
pyproject.toml
View File

@ -17,7 +17,7 @@ abstention = "^0.1.3.1"
[tool.poetry.scripts] [tool.poetry.scripts]
main = "quacc.main:main" main = "quacc.main:main"
run = "run:run" run = "run:run"
panel = "qcpanel.run:run" pnl = "qcpanel.run:run"
dash = "qcdash.app:run" dash = "qcdash.app:run"
sync_up = "remote:sync_code" sync_up = "remote:sync_code"
sync_down = "remote:sync_output" sync_down = "remote:sync_output"
@ -55,7 +55,7 @@ dash-bootstrap-components = "^1.5.0"
gunicorn = "^21.2.0" gunicorn = "^21.2.0"
[tool.pytest.ini_options] [tool.pytest.ini_options]
addopts = "--cov=quacc -rA" addopts = "--cov=quacc -rA --cov-report html"
[build-system] [build-system]
requires = ["poetry-core"] requires = ["poetry-core"]

1141
quacc.log
View File

File diff suppressed because it is too large Load Diff

3074
remote.log
View File

File diff suppressed because it is too large Load Diff