From 4771ff699eee5af24b9c1fd25886cad6f816e16c Mon Sep 17 00:00:00 2001
From: Laurent COLBOIS <laurent.colbois@idiap.ch>
Date: Fri, 18 Jun 2021 09:55:40 +0200
Subject: [PATCH] Update path convention in rc

---
 .../config/database/synmultipie/E.py                        | 4 ++--
 .../config/database/synmultipie/P.py                        | 3 ++-
 .../config/database/synmultipie/U.py                        | 3 ++-
 .../config/db_gen/syn_multipie.py                           | 6 +++++-
 .../config/db_gen/uniqueness_ict_0.1.py                     | 4 ----
 .../config/db_gen/uniqueness_no_ict.py                      | 5 ++++-
 6 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_ict_0.1.py

diff --git a/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/E.py b/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/E.py
index 52c6598..9ab5d3a 100644
--- a/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/E.py
+++ b/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/E.py
@@ -1,11 +1,11 @@
+import os
 from bob.extension import rc
 import bob.io.image
 from bob.bio.base.database import CSVToSampleLoaderBiometrics, CSVDataset
-import os
 
 def get_database(protocol):
 
-    image_dir = rc['bob.db.synmultipie.directory']
+    image_dir = os.path.join(rc['bob.synface.synthetic_datasets'], 'synmultipie', 'image')
     csv_dir = os.path.join(rc['bob.paper.ijcb2021_synthetic_dataset.path'],
                            'bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/protocols')
 
diff --git a/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/P.py b/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/P.py
index eb06ab2..2703b03 100644
--- a/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/P.py
+++ b/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/P.py
@@ -1,10 +1,11 @@
+import os
 from bob.extension import rc
 import bob.io.image
 from bob.bio.base.database import CSVToSampleLoaderBiometrics, CSVDataset
 
 def get_database(protocol):
 
-    image_dir = rc['bob.db.synmultipie.directory']
+    image_dir = os.path.join(rc['bob.synface.synthetic_datasets'], 'synmultipie', 'image')
     csv_dir = os.path.join(rc['bob.paper.ijcb2021_synthetic_dataset.path'],
                            'bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/protocols')
 
diff --git a/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/U.py b/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/U.py
index 3de2d8c..3e076e9 100644
--- a/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/U.py
+++ b/bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/U.py
@@ -1,10 +1,11 @@
+import os
 from bob.extension import rc
 import bob.io.image
 from bob.bio.base.database import CSVToSampleLoaderBiometrics, CSVDataset
 
 def get_database(protocol):
 
-    image_dir = rc['bob.db.synmultipie.directory']
+    image_dir = os.path.join(rc['bob.synface.synthetic_datasets'], 'synmultipie', 'image')
     csv_dir = os.path.join(rc['bob.paper.ijcb2021_synthetic_dataset.path'],
                            'bob/paper/ijcb2021_synthetic_dataset/config/database/synmultipie/protocols')
 
diff --git a/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/syn_multipie.py b/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/syn_multipie.py
index 2e17312..5cc5cb6 100644
--- a/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/syn_multipie.py
+++ b/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/syn_multipie.py
@@ -1,7 +1,11 @@
+from bob.extension import rc
+import os
+
 ict=0.1
 seed=0
 pose_scaling=1
 illumination_scaling=1
 expression_scaling=1
 color_variations=0
-num_identities=64+65
\ No newline at end of file
+num_identities=64+65
+output_dir = os.path.join(rc['bob.synface.synthetic_datasets'], 'synmultipie')
\ No newline at end of file
diff --git a/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_ict_0.1.py b/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_ict_0.1.py
deleted file mode 100644
index 7c9d31d..0000000
--- a/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_ict_0.1.py
+++ /dev/null
@@ -1,4 +0,0 @@
-ict=0.1
-seed=0
-task='references'
-num_identities=11000
\ No newline at end of file
diff --git a/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_no_ict.py b/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_no_ict.py
index 350a6c8..48e998b 100644
--- a/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_no_ict.py
+++ b/bob/paper/ijcb2021_synthetic_dataset/config/db_gen/uniqueness_no_ict.py
@@ -1,4 +1,7 @@
+import os
+from bob.extension import rc
 ict=0.0
 seed=0
 task='references'
-num_identities=11000
\ No newline at end of file
+num_identities=11000
+output_dir = os.path.join(rc['bob.synface.synthetic_datasets'], 'uniqueness_no_ict')
\ No newline at end of file
-- 
GitLab