From b0b59ef3ed5bf41288ed7c43204edb2e1cb6c63c Mon Sep 17 00:00:00 2001
From: Lorenzo Volpi <lorenzo.volpi@outlook.com>
Date: Wed, 22 Nov 2023 19:26:54 +0100
Subject: [PATCH] conf updated

---
 conf.yaml | 204 ++++++++++++++++++++----------------------------------
 1 file changed, 75 insertions(+), 129 deletions(-)

diff --git a/conf.yaml b/conf.yaml
index 2b91abd..7dcb010 100644
--- a/conf.yaml
+++ b/conf.yaml
@@ -6,16 +6,18 @@ debug_conf: &debug_conf
     DATASET_N_PREVS: 9
 
   confs:
-    - DATASET_NAME: rcv1
-      DATASET_TARGET: CCAT
+    - DATASET_NAME: imdb
+    # - DATASET_NAME: rcv1
+    #   DATASET_TARGET: CCAT
 
   plot_confs:
     debug_gs:
       PLOT_ESTIMATORS:
-        - mul_sld
-        - mul3w_sld
+        - binis_sld
+        - mulis_sld
+        - doc
         - atc_mc
-      PLOT_STDEV: true
+        - gde
 
 mc_conf: &mc_conf
   global:
@@ -47,9 +49,11 @@ test_conf: &test_conf
     # - 0.5
 
   confs:
-    - DATASET_NAME: rcv1
-      DATASET_TARGET: GCAT
+    # - DATASET_NAME: rcv1
+    #   DATASET_TARGET: GCAT
     # - DATASET_NAME: imdb
+    - DATASET_NAME: cifar10
+      DATASET_TARGET: dog
 
   plot_confs:
     main:
@@ -66,9 +70,9 @@ test_conf: &test_conf
       - binne_sld
       - mulne_sld
       - mul3wne_sld
-      - bin_sld_gs
-      - mul_sld_gs
-      - mul3w_sld_gs
+      # - bin_sld_gs
+      # - mul_sld_gs
+      # - mul3w_sld_gs
       - atc_mc
       - atc_ne
       - doc_feat
@@ -82,134 +86,76 @@ main_conf: &main_conf
     - f1
     OUT_DIR_NAME: output/main
     DATASET_N_PREVS: 9
-    DATASET_DIR_UPDATE: true
 
   confs:
+    - DATASET_NAME: cifar10
+      DATASET_TARGET: dog
+  confs_next:
+    - DATASET_NAME: imdb
     - DATASET_NAME: rcv1
       DATASET_TARGET: CCAT
-    - DATASET_NAME: imdb
-  confs_next:
     - DATASET_NAME: rcv1
       DATASET_TARGET: GCAT
     - DATASET_NAME: rcv1
       DATASET_TARGET: MCAT
 
   plot_confs:
-    gs_vs_qgs:
+    main:
       PLOT_ESTIMATORS:
-      - mul_sld_gs
-      - bin_sld_gs
-      - mul_sld_gsq
-      - bin_sld_gsq
-      - atc_mc
-      - atc_ne
-      PLOT_STDEV: true
-  plot_confs_completed:
-    max_conf_vs_atc_pacc:
-      PLOT_ESTIMATORS:
-      - bin_pacc
-      - binmc_pacc
-      - mul_pacc
-      - mulmc_pacc
-      - atc_mc
-      PLOT_STDEV: true
-    max_conf_vs_entropy_pacc:
-      PLOT_ESTIMATORS:
-      - binmc_pacc
-      - binne_pacc
-      - mulmc_pacc
-      - mulne_pacc
-      - atc_mc
-      PLOT_STDEV: true
-    gs_vs_atc:
-      PLOT_ESTIMATORS:
-      - mul_sld_gs
-      - bin_sld_gs
-      - mul_pacc_gs
-      - bin_pacc_gs
-      - atc_mc
-      - atc_ne
-      PLOT_STDEV: true
-    gs_vs_all:
-      PLOT_ESTIMATORS:
-      - mul_sld_gs
-      - bin_sld_gs
-      - mul_pacc_gs
-      - bin_pacc_gs
-      - atc_mc
-      - doc_feat
-      - kfcv
-      PLOT_STDEV: true
-    gs_vs_qgs:
-      PLOT_ESTIMATORS:
-      - mul_sld_gs
-      - bin_sld_gs
-      - mul_sld_gsq
-      - bin_sld_gsq
-      - atc_mc
-      - atc_ne
-      PLOT_STDEV: true
-    cc_vs_other:
-      PLOT_ESTIMATORS:
-      - mul_cc
-      - bin_cc
-      - mul_sld
-      - bin_sld
-      - mul_pacc
-      - bin_pacc
-      PLOT_STDEV: true
-    max_conf_vs_atc:
-      PLOT_ESTIMATORS:
-      - bin_sld
-      - binmc_sld
-      - mul_sld
-      - mulmc_sld
-      - atc_mc
-      PLOT_STDEV: true
-    max_conf_vs_entropy:
-      PLOT_ESTIMATORS:
-      - binmc_sld
-      - binne_sld
-      - mulmc_sld
-      - mulne_sld
-      - atc_mc
-      PLOT_STDEV: true
-    sld_vs_pacc:
-      PLOT_ESTIMATORS:
-      - bin_sld
-      - mul_sld
-      - bin_pacc
-      - mul_pacc
-      - atc_mc
-      PLOT_STDEV: true
-  plot_confs_other:
-    best_vs_atc:
-      PLOT_ESTIMATORS:
-      - mul_sld_bcts
-      - mul_sld_gs
-      - bin_sld_bcts
-      - bin_sld_gs
-      - atc_mc
-      - atc_ne
-    all_vs_atc:
-      PLOT_ESTIMATORS:
-      - bin_sld
-      - bin_sld_bcts
-      - bin_sld_gs
-      - mul_sld
-      - mul_sld_bcts
-      - mul_sld_gs
-      - atc_mc
-      - atc_ne
-    best_vs_all:
-      PLOT_ESTIMATORS:
-      - bin_sld_bcts
-      - bin_sld_gs
-      - mul_sld_bcts
-      - mul_sld_gs
-      - kfcv
-      - atc_mc
-      - atc_ne
-      - doc_feat
+        - bin_sld
+        - mul_sld
+        - m3w_sld
+        - binc_sld
+        - mulc_sld
+        - m3wc_sld
+        - binmc_sld
+        - mulmc_sld
+        - m3wmc_sld
+        - binne_sld
+        - mulne_sld
+        - m3wne_sld
+        - binis_sld
+        - mulis_sld
+        - m3wis_sld
+        - bin_sld_gs
+        - mul_sld_gs
+        - m3w_sld_gs
+        - doc
+        - atc_mc
+        - gde
+        - rca
+        - rca_star
+        - mandoline
 
-exec: *test_conf
\ No newline at end of file
+add_conf: &add_conf
+
+  global:
+    METRICS: 
+    - acc
+    - f1
+    OUT_DIR_NAME: output/add/m3w
+    DATASET_N_PREVS: 9
+
+  confs:
+    - DATASET_NAME: rcv1
+      DATASET_TARGET: CCAT
+  confs_next:
+    - DATASET_NAME: imdb
+    - DATASET_NAME: rcv1
+      DATASET_TARGET: GCAT
+    - DATASET_NAME: rcv1
+      DATASET_TARGET: MCAT
+    - DATASET_NAME: cifar10
+      DATASET_TARGET: dog
+
+  plot_confs:
+    main:
+      PLOT_ESTIMATORS:
+        - m3w_sld
+        - m3wc_sld
+        - m3wmc_sld
+        - m3wne_sld
+        - m3wis_sld
+        - m3w_sld_gs
+
+exec: *add_conf
\ No newline at end of file