conf updated

.vscode/launch.json

@@ -19,7 +19,7 @@
             "request": "launch",
             "program": "C:\\Users\\Lorenzo Volpi\\source\\tesi\\quacc\\main_test.py",
             "console": "integratedTerminal",
-            "justMyCode": true
+            "justMyCode": false
         },
     ]
 }

TODO.html

@@ -127,7 +127,7 @@ verbose=True).fit(V_tr)</li>
 <p><input class="task-list-item-checkbox" checked=""type="checkbox"> aggiungere etichette in shift plot</p>
 </li>
 <li class="task-list-item enabled">
-<p><input class="task-list-item-checkbox"type="checkbox"> sistemare exact_train quapy</p>
+<p><input class="task-list-item-checkbox" checked=""type="checkbox"> sistemare exact_train quapy</p>
 </li>
 <li class="task-list-item enabled">
 <p><input class="task-list-item-checkbox"type="checkbox"> testare anche su imbd</p>

TODO.md

@@ -38,5 +38,5 @@
 - [x] realizzare grid search per task specifico partendo da GridSearchQ
 - [x] provare PACC come quantificatore
 - [x] aggiungere etichette in shift plot
-- [ ] sistemare exact_train quapy
+- [x] sistemare exact_train quapy
 - [ ] testare anche su imbd

conf.yaml

@@ -4,12 +4,13 @@ debug_conf: &debug_conf
     - acc
     DATASET_N_PREVS: 5
     DATASET_PREVS:
-    - 0.2
+    # - 0.2
     - 0.5
-    - 0.8
+    # - 0.8
 
   confs:
-    - DATASET_NAME: imdb
+    - DATASET_NAME: rcv1
+      DATASET_TARGET: CCAT
 
   plot_confs:
     debug:
@@ -99,33 +100,116 @@ main_conf: &main_conf
     - acc
     - f1
     DATASET_N_PREVS: 9
+    DATASET_DIR_UPDATE: true
 
-  confs:
+  confs_competed:
     - DATASET_NAME: rcv1
       DATASET_TARGET: CCAT
-  confs_bck:
     - DATASET_NAME: imdb
+  confs:
     - DATASET_NAME: rcv1
       DATASET_TARGET: GCAT
     - DATASET_NAME: rcv1
       DATASET_TARGET: MCAT
 
   plot_confs:
+    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
-      - ref
+      - 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
+
+  plot_confs_torepeat:
+    gs_vs_qgs:
+      # to repeat on rcv1_CCAT and imdb
+      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:
+      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
-      - ref
       - atc_mc
       - atc_ne
     all_vs_atc:
@@ -136,7 +220,6 @@ main_conf: &main_conf
       - mul_sld
       - mul_sld_bcts
       - mul_sld_gs
-      - ref
       - atc_mc
       - atc_ne
     best_vs_all:
@@ -145,10 +228,9 @@ main_conf: &main_conf
       - bin_sld_gs
       - mul_sld_bcts
       - mul_sld_gs
-      - ref
       - kfcv
       - atc_mc
       - atc_ne
       - doc_feat
 
-exec: *debug_conf
+exec: *main_conf