From 1e87420af7e42b46c33d4ea42ca53ba37e114143 Mon Sep 17 00:00:00 2001
From: Lorenzo Volpi <lorenzo.volpi@outlook.com>
Date: Sun, 26 Nov 2023 16:35:10 +0100
Subject: [PATCH] conf updated

---
 conf.yaml      | 159 +++++++++++++++++++++++--------------------------
 pyproject.toml |  16 ++++-
 2 files changed, 89 insertions(+), 86 deletions(-)

diff --git a/conf.yaml b/conf.yaml
index c7cc2b8..279de49 100644
--- a/conf.yaml
+++ b/conf.yaml
@@ -1,63 +1,53 @@
 debug_conf: &debug_conf
   global:
     METRICS: 
-    - acc
+      - acc
     OUT_DIR_NAME: output/debug
     DATASET_N_PREVS: 9
+    COMP_ESTIMATORS:
+      - bin_sld
+      - mul_sld
+      - m3w_sld
+      - atc_mc
+      - doc
 
   confs:
     - DATASET_NAME: imdb
-    # - DATASET_NAME: rcv1
-    #   DATASET_TARGET: CCAT
-
-  plot_confs:
-    debug_gs:
-      PLOT_ESTIMATORS:
-        - binis_sld
-        - mulis_sld
-        - doc
-        - atc_mc
-        - gde
-
-mc_conf: &mc_conf
-  global:
-    METRICS: 
-    - acc
-    DATASET_N_PREVS: 9
-
-  confs:
+  other_confs:
     - DATASET_NAME: rcv1
       DATASET_TARGET: CCAT
-    # - DATASET_NAME: imdb
+      
 
-  plot_confs:
-    confidence:
-      PLOT_ESTIMATORS:
-        - bin_sld_gs
-        - mul_sld_gs
-        - atc_mc
-      PLOT_STDEV: true
+kde_conf: &kde_conf
+  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
+      - atc_mc
+      - doc
+
+  confs:
+    - DATASET_NAME: imdb
+  other_confs:
+    - DATASET_NAME: rcv1
+      DATASET_TARGET: CCAT
 
 test_conf: &test_conf
   global:
     METRICS: 
-    - acc
-    - f1
+      - acc
+      - f1
     OUT_DIR_NAME: output/test
     DATASET_N_PREVS: 9
     # DATASET_PREVS:
     # - 0.5
-
-  confs:
-    # - DATASET_NAME: rcv1
-    #   DATASET_TARGET: GCAT
-    # - DATASET_NAME: imdb
-    - DATASET_NAME: cifar10
-      DATASET_TARGET: dog
-
-  plot_confs:
-    main:
-      PLOT_ESTIMATORS:
+    COMP_ESTIMATORS:
       - bin_sld
       - mul_sld
       - mul3w_sld
@@ -78,14 +68,47 @@ test_conf: &test_conf
       - 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:
     METRICS: 
-    - acc
-    - f1
+      - acc
+      - f1
     OUT_DIR_NAME: output/main
     DATASET_N_PREVS: 9
+    COMP_ESTIMATORS:
+      - 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
 
   confs:
     - DATASET_NAME: cifar10
@@ -99,42 +122,21 @@ main_conf: &main_conf
     - DATASET_NAME: rcv1
       DATASET_TARGET: MCAT
 
-  plot_confs:
-    main:
-      PLOT_ESTIMATORS:
-        - 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
-
 add_conf: &add_conf
 
   global:
     METRICS: 
-    - acc
-    - f1
+      - acc
+      - f1
     OUT_DIR_NAME: output/add/m3w
     DATASET_N_PREVS: 9
+    COMP_ESTIMATORS:
+      - m3w_sld
+      - m3wc_sld
+      - m3wmc_sld
+      - m3wne_sld
+      - m3wis_sld
+      - m3w_sld_gs
 
   confs:
     - DATASET_NAME: cifar10
@@ -148,14 +150,5 @@ add_conf: &add_conf
     - DATASET_NAME: rcv1
       DATASET_TARGET: MCAT
 
-  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
+exec: *debug_conf
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index f753086..36cec09 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,6 +22,19 @@ sync_up = "remote:sync_code"
 sync_down = "remote:sync_output"
 merge_data = "merge_data:run"
 
+[tool.poe]
+poetry_command = ""
+
+[tool.poe.tasks]
+ilona = "ssh volpi@ilona.isti.cnr.it"
+
+[tool.poe.tasks.logr]
+shell = """
+    scp {$HOST}:~/tesi/quacc.log ~/tesi/remote.log &> /dev/null
+    ssh {$HOST} tail -n 0 -f /home/volpi/tesi/quacc.log >> ~/tesi/remote.log
+"""
+interpreter="fish"
+env = { HOST = "volpi@ilona.isti.cnr.it" }
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"
@@ -43,7 +56,4 @@ addopts = "--cov=quacc --capture=tee-sys"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[virtualenvs]
-in-project = true
-prefer-active-python = true