From 33d75dc86620b5187bbb05f24c3bb1f2e7c33b9a Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Mon, 14 Jun 2021 16:46:29 +0200
Subject: [PATCH] Updated DB interface
---
bob/bio/face/database/casia_africa.py | 5 ++---
bob/bio/face/database/cbsr_nir_vis_2.py | 4 ++--
bob/bio/face/database/frgc.py | 5 ++---
bob/bio/face/database/meds.py | 5 ++---
bob/bio/face/database/mobio.py | 4 ++--
bob/bio/face/database/morph.py | 5 ++---
bob/bio/face/database/multipie.py | 5 ++---
bob/bio/face/database/pola_thermal.py | 5 ++---
8 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/bob/bio/face/database/casia_africa.py b/bob/bio/face/database/casia_africa.py
index 34dc60f8..23a696fd 100644
--- a/bob/bio/face/database/casia_africa.py
+++ b/bob/bio/face/database/casia_africa.py
@@ -126,11 +126,10 @@ class CasiaAfricaDatabase(CSVDataset):
),
EyesAnnotations(),
),
+ annotation_type=annotation_type,
+ fixed_positions=fixed_positions,
)
- self.annotation_type = annotation_type
- self.fixed_positions = fixed_positions
-
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
diff --git a/bob/bio/face/database/cbsr_nir_vis_2.py b/bob/bio/face/database/cbsr_nir_vis_2.py
index bab3a4f7..581ca39a 100644
--- a/bob/bio/face/database/cbsr_nir_vis_2.py
+++ b/bob/bio/face/database/cbsr_nir_vis_2.py
@@ -90,9 +90,9 @@ class CBSRNirVis2Database(CSVDataset):
),
EyesAnnotations(),
),
+ annotation_type=annotation_type,
+ fixed_positions=fixed_positions,
)
- self.annotation_type = annotation_type
- self.fixed_positions = fixed_positions
@staticmethod
def protocols():
diff --git a/bob/bio/face/database/frgc.py b/bob/bio/face/database/frgc.py
index a2831f6e..8403ac91 100644
--- a/bob/bio/face/database/frgc.py
+++ b/bob/bio/face/database/frgc.py
@@ -42,11 +42,10 @@ class FRGCDatabase(CSVDataset):
),
EyesAnnotations(),
),
+ annotation_type=annotation_type,
+ fixed_positions=fixed_positions,
)
- self.annotation_type = annotation_type
- self.fixed_positions = fixed_positions
-
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
diff --git a/bob/bio/face/database/meds.py b/bob/bio/face/database/meds.py
index 397cc69e..5286de56 100644
--- a/bob/bio/face/database/meds.py
+++ b/bob/bio/face/database/meds.py
@@ -115,11 +115,10 @@ class MEDSDatabase(CSVDatasetZTNorm):
),
EyesAnnotations(),
),
+ annotation_type=annotation_type,
+ fixed_positions=fixed_positions,
)
- self.annotation_type = annotation_type
- self.fixed_positions = fixed_positions
-
@staticmethod
def urls():
return [
diff --git a/bob/bio/face/database/mobio.py b/bob/bio/face/database/mobio.py
index 729e9a88..94dbe5d7 100644
--- a/bob/bio/face/database/mobio.py
+++ b/bob/bio/face/database/mobio.py
@@ -70,9 +70,9 @@ class MobioDatabase(CSVDatasetZTNorm):
),
EyesAnnotations(),
),
+ annotation_type=annotation_type,
+ fixed_positions=fixed_positions,
)
- self.annotation_type = annotation_type
- self.fixed_positions = fixed_positions
@staticmethod
def protocols():
diff --git a/bob/bio/face/database/morph.py b/bob/bio/face/database/morph.py
index 391292dd..b922f49b 100644
--- a/bob/bio/face/database/morph.py
+++ b/bob/bio/face/database/morph.py
@@ -79,11 +79,10 @@ class MorphDatabase(CSVDatasetZTNorm):
),
EyesAnnotations(),
),
+ annotation_type=annotation_type,
+ fixed_positions=fixed_positions,
)
- self.annotation_type = annotation_type
- self.fixed_positions = fixed_positions
-
@staticmethod
def urls():
return [
diff --git a/bob/bio/face/database/multipie.py b/bob/bio/face/database/multipie.py
index 6bfed594..888e1d7d 100644
--- a/bob/bio/face/database/multipie.py
+++ b/bob/bio/face/database/multipie.py
@@ -108,11 +108,10 @@ class MultipieDatabase(CSVDataset):
),
MultiposeAnnotations(),
),
+ annotation_type=["eyes-center", "left-profile", "right-profile"],
+ fixed_positions=None,
)
- self.annotation_type = ["eyes-center", "left-profile", "right-profile"]
- self.fixed_positions = None
-
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
diff --git a/bob/bio/face/database/pola_thermal.py b/bob/bio/face/database/pola_thermal.py
index cb1808a0..5b4063e7 100644
--- a/bob/bio/face/database/pola_thermal.py
+++ b/bob/bio/face/database/pola_thermal.py
@@ -111,11 +111,10 @@ class PolaThermalDatabase(CSVDataset):
),
EyesAnnotations(),
),
+ annotation_type=annotation_type,
+ fixed_positions=fixed_positions,
)
- self.annotation_type = annotation_type
- self.fixed_positions = fixed_positions
-
@staticmethod
def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
--
GitLab