Updated database interface

bob/bio/face/database/casia_africa.py

@@ -117,8 +117,9 @@ class CasiaAfricaDatabase(CSVDataset):
         )
 
         super().__init__(
-            filename,
-            protocol,
+            name="casia-africa",
+            dataset_protocol_path=filename,
+            protocol=protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=bob.io.base.load,

bob/bio/face/database/cbsr_nir_vis_2.py

@@ -81,8 +81,9 @@ class CBSRNirVis2Database(CSVDataset):
                 raise ValueError("File `{0}` not found".format(str(new_filename)))
 
         super().__init__(
-            filename,
-            protocol,
+            name="cbsr-nir-vis2",
+            dataset_protocol_path=filename,
+            protocol=protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=load,

bob/bio/face/database/frgc.py

@@ -32,8 +32,9 @@ class FRGCDatabase(CSVDataset):
         self.fixed_positions = None
 
         super().__init__(
-            filename,
-            protocol,
+            name="frgc",
+            dataset_protocol_path=filename,
+            protocol=protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=bob.io.base.load,

bob/bio/face/database/meds.py

@@ -104,9 +104,10 @@ class MEDSDatabase(CSVDatasetZTNorm):
         self.annotation_type = "eyes-center"
         self.fixed_positions = None
 
-        database = CSVDataset(
-            filename,
-            protocol,
+        super().__init__(
+            name="meds",
+            dataset_protocol_path=filename,
+            protocol=protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=bob.io.base.load,
@@ -119,8 +120,6 @@ class MEDSDatabase(CSVDatasetZTNorm):
             ),
         )
 
-        super().__init__(database)
-
     @staticmethod
     def urls():
         return [

bob/bio/face/database/mobio.py

@@ -59,9 +59,10 @@ class MobioDatabase(CSVDatasetZTNorm):
         self.annotation_type = "eyes-center"
         self.fixed_positions = None
 
-        database = CSVDataset(
-            filename,
-            protocol,
+        super().__init__(
+            name="mobio",
+            dataset_protocol_path=filename,
+            protocol=protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=bob.io.base.load,
@@ -74,8 +75,6 @@ class MobioDatabase(CSVDatasetZTNorm):
             ),
         )
 
-        super().__init__(database)
-
     @staticmethod
     def protocols():
         # TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.

bob/bio/face/database/morph.py

@@ -68,9 +68,10 @@ class MorphDatabase(CSVDatasetZTNorm):
         self.annotation_type = "eyes-center"
         self.fixed_positions = None
 
-        database = CSVDataset(
-            filename,
-            protocol,
+        super().__init__(
+            name="morph",
+            dataset_protocol_path=filename,
+            protocol=protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=bob.io.base.load,
@@ -83,8 +84,6 @@ class MorphDatabase(CSVDatasetZTNorm):
             ),
         )
 
-        super().__init__(database)
-
     @staticmethod
     def urls():
         return [

bob/bio/face/database/multipie.py

@@ -98,8 +98,9 @@ class MultipieDatabase(CSVDataset):
         self.fixed_positions = None
 
         super().__init__(
-            filename,
-            protocol,
+            name="multipie",
+            dataset_protocol_path=filename,
+            protocol=protocol,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=bob.io.base.load,

bob/bio/face/database/pola_thermal.py

@@ -103,8 +103,9 @@ class PolaThermalDatabase(CSVDataset):
             return bob.io.base.load(path) / 255
 
         super().__init__(
-            filename,
-            protocol,
+            name="polathermal",
+            protocol=protocol,
+            dataset_protocol_path=filename,
             csv_to_sample_loader=make_pipeline(
                 CSVToSampleLoaderBiometrics(
                     data_loader=load,