diff --git a/bob/bio/face/database/casia_africa.py b/bob/bio/face/database/casia_africa.py index 833a18585cdf83f4d84c2bb22af1519cd801a697..e6025110efa6ad3746235c998c54b76d2b16ddf9 100644 --- a/bob/bio/face/database/casia_africa.py +++ b/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, diff --git a/bob/bio/face/database/cbsr_nir_vis_2.py b/bob/bio/face/database/cbsr_nir_vis_2.py index 2d34dc372aa8a4bd65bf7ae47adc793594b634a2..73f3507d9c33c47391342b2b1eb77fa92abefc48 100644 --- a/bob/bio/face/database/cbsr_nir_vis_2.py +++ b/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, diff --git a/bob/bio/face/database/frgc.py b/bob/bio/face/database/frgc.py index 12964a310a3b7f33976b84b99d0063bbf1a53549..0f52f5bb8c87e4a3b3dc4557127172306cfa32a2 100644 --- a/bob/bio/face/database/frgc.py +++ b/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, diff --git a/bob/bio/face/database/meds.py b/bob/bio/face/database/meds.py index 2181f82bcf844ee429cdd990c5b6c1fa6e1bfda6..eefec79d4d6d98b0abba32382bdaf945aab3124e 100644 --- a/bob/bio/face/database/meds.py +++ b/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 [ diff --git a/bob/bio/face/database/mobio.py b/bob/bio/face/database/mobio.py index 7a06b2a6b4384e6bc57d50c58f50dcaaafd6ba13..2f8a209ce5473059c0175a4cfe41f40563af25f0 100644 --- a/bob/bio/face/database/mobio.py +++ b/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. diff --git a/bob/bio/face/database/morph.py b/bob/bio/face/database/morph.py index a1e37074a455d7b0c7ea679608d2432f0362382d..a0ed88252b8e66986e08953193fd76d64daa9ab2 100644 --- a/bob/bio/face/database/morph.py +++ b/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 [ diff --git a/bob/bio/face/database/multipie.py b/bob/bio/face/database/multipie.py index 6a257c046af5a165e2a376a5e12fa2c80999d839..10dd522277d1669596e2c985d864a657c8776961 100644 --- a/bob/bio/face/database/multipie.py +++ b/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, diff --git a/bob/bio/face/database/pola_thermal.py b/bob/bio/face/database/pola_thermal.py index 5a2e6d5c489fb81b20d7afd3d788bf51966ec011..2052f0e4a7f73d331d9e6a19f7e3fe376ef5f1ab 100644 --- a/bob/bio/face/database/pola_thermal.py +++ b/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,