refactor for bob.bio.base!300

bob/bio/vein/database/utfvp.py

@@ -10,13 +10,13 @@ from sklearn.pipeline import make_pipeline
 
 import bob.io.base
 
-from bob.bio.base.database import CSVDataset, CSVToSampleLoaderBiometrics
+from bob.bio.base.database import CSVDatabase, FileSampleLoader
 from bob.bio.vein.database.roi_annotation import ROIAnnotation
 from bob.extension import rc
 from bob.extension.download import get_file
 
 
-class UtfvpDatabase(CSVDataset):
+class UtfvpDatabase(CSVDatabase):
     """
     The University of Twente Finger Vascular Pattern dataset
 
@@ -166,16 +166,16 @@ class UtfvpDatabase(CSVDataset):
 
         super().__init__(
             name="utfvp",
-            dataset_protocol_path=filename,
+            dataset_protocols_path=filename,
             protocol=protocol,
-            csv_to_sample_loader=make_pipeline(
-                CSVToSampleLoaderBiometrics(
+            transformer=make_pipeline(
+                FileSampleLoader(
                     data_loader=bob.io.base.load,
                     dataset_original_directory=rc.get(
                         "bob.bio.vein.utfvp.directory", ""
                     ),
                     extension="",
-                    reference_id_equal_subject_id=False,
+                    template_id_equal_subject_id=False,
                 ),
                 ROIAnnotation(roi_path=rc.get("bob.bio.vein.utfvp.roi", "")),
             ),

bob/bio/vein/database/verafinger_contactless.py

@@ -8,12 +8,12 @@
 
 import bob.io.base
 
-from bob.bio.base.database import CSVDataset, CSVToSampleLoaderBiometrics
+from bob.bio.base.database import CSVDatabase, FileSampleLoader
 from bob.extension import rc
 from bob.extension.download import get_file
 
 
-class VerafingerContactless(CSVDataset):
+class VerafingerContactless(CSVDatabase):
     """
     The VERA Fingervein Contactless database contains 1330 finger vein images of 133 persons,
     with id ranging from 1 to 137 (with 4 defects).
@@ -61,15 +61,15 @@ class VerafingerContactless(CSVDataset):
 
         super().__init__(
             name="verafinger_contactless",
-            dataset_protocol_path=filename,
+            dataset_protocols_path=filename,
             protocol=protocol,
-            csv_to_sample_loader=CSVToSampleLoaderBiometrics(
+            transformer=FileSampleLoader(
                 data_loader=bob.io.base.load,
                 dataset_original_directory=rc.get(
                     "bob.bio.vein.verafinger_contactless.directory", ""
                 ),
                 extension="",
-                reference_id_equal_subject_id=False,
+                template_id_equal_subject_id=False,
             ),
             score_all_vs_all=True,
         )