diff --git a/bob/bio/vein/algorithm/MiuraMatch.py b/bob/bio/vein/algorithm/MiuraMatch.py index aed08693e1eb9f0e9046873adb4bf210a29393fd..2019be91fb07a84afd49b7704bb89b17b17b7198 100644 --- a/bob/bio/vein/algorithm/MiuraMatch.py +++ b/bob/bio/vein/algorithm/MiuraMatch.py @@ -4,44 +4,44 @@ import numpy import scipy.signal -from bob.bio.base.pipelines.vanilla_biometrics import BioAlgorithm +from bob.bio.base.pipelines import BioAlgorithm class MiuraMatch(BioAlgorithm): """Finger vein matching: match ratio via cross-correlation - The method is based on "cross-correlation" between a model and a probe image. - It convolves the binary image(s) representing the model with the binary image - representing the probe (rotated by 180 degrees), and evaluates how they - cross-correlate. If the model and probe are very similar, the output of the - correlation corresponds to a single scalar and approaches a maximum. The - value is then normalized by the sum of the pixels lit in both binary images. - Therefore, the output of this method is a floating-point number in the range - :math:`[0, 0.5]`. The higher, the better match. - - In case model and probe represent images from the same vein structure, but - are misaligned, the output is not guaranteed to be accurate. To mitigate this - aspect, Miura et al. proposed to add a *small* cropping factor to the model - image, assuming not much information is available on the borders (``ch``, for - the vertical direction and ``cw``, for the horizontal direction). This allows - the convolution to yield searches for different areas in the probe image. The - maximum value is then taken from the resulting operation. The convolution - result is normalized by the pixels lit in both the cropped model image and - the matching pixels on the probe that yield the maximum on the resulting - convolution. - - For this to work properly, input images are supposed to be binary in nature, - with zeros and ones. - - Based on [MNM04]_ and [MNM05]_ - - Parameters: - - ch (:py:class:`int`, optional): Maximum search displacement in y-direction. - - cw (:py:class:`int`, optional): Maximum search displacement in x-direction. - - """ + The method is based on "cross-correlation" between a model and a probe image. + It convolves the binary image(s) representing the model with the binary image + representing the probe (rotated by 180 degrees), and evaluates how they + cross-correlate. If the model and probe are very similar, the output of the + correlation corresponds to a single scalar and approaches a maximum. The + value is then normalized by the sum of the pixels lit in both binary images. + Therefore, the output of this method is a floating-point number in the range + :math:`[0, 0.5]`. The higher, the better match. + + In case model and probe represent images from the same vein structure, but + are misaligned, the output is not guaranteed to be accurate. To mitigate this + aspect, Miura et al. proposed to add a *small* cropping factor to the model + image, assuming not much information is available on the borders (``ch``, for + the vertical direction and ``cw``, for the horizontal direction). This allows + the convolution to yield searches for different areas in the probe image. The + maximum value is then taken from the resulting operation. The convolution + result is normalized by the pixels lit in both the cropped model image and + the matching pixels on the probe that yield the maximum on the resulting + convolution. + + For this to work properly, input images are supposed to be binary in nature, + with zeros and ones. + + Based on [MNM04]_ and [MNM05]_ + + Parameters: + + ch (:py:class:`int`, optional): Maximum search displacement in y-direction. + + cw (:py:class:`int`, optional): Maximum search displacement in x-direction. + + """ def __init__( self, diff --git a/bob/bio/vein/config/database/fv3d.py b/bob/bio/vein/config/database/fv3d.py index 234788162eb7dc55a48c9e9e0bf36ee485fece76..2324d339f125670e8757d4854773ee917cc320b8 100644 --- a/bob/bio/vein/config/database/fv3d.py +++ b/bob/bio/vein/config/database/fv3d.py @@ -13,7 +13,7 @@ the link. from bob.extension import rc from bob.bio.vein.database.fv3d import Database -from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector +from bob.bio.base.pipelines import DatabaseConnector import logging @@ -29,7 +29,9 @@ if "protocol" not in locals(): protocol = "central" legacy_database = Database( - original_directory=_fv3d_directory, original_extension=".png", protocol=protocol, + original_directory=_fv3d_directory, + original_extension=".png", + protocol=protocol, ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with fv3d database settings @@ -39,7 +41,7 @@ database = DatabaseConnector( legacy_database, annotation_type=None, fixed_positions=None ) """ -The database interface wrapped for vanilla-biometrics +The database interface wrapped for pipeline simple .. warning:: diff --git a/bob/bio/vein/config/database/protocol_fv3d/central.py b/bob/bio/vein/config/database/protocol_fv3d/central.py index 4ad9276707571797ee7f5e622aa72adbada3615b..401a3a90963a4d2044c8a6b0f7e1b6deb3913801 100644 --- a/bob/bio/vein/config/database/protocol_fv3d/central.py +++ b/bob/bio/vein/config/database/protocol_fv3d/central.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> central fv3d +# $ bob bio pipeline simple <pipeline> central fv3d # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> central fv3d +# $ bob bio pipeline simple -p <pipeline> central fv3d # The protocol resource must be specified before the database resource. @@ -20,4 +20,4 @@ # This will be the default protocol if none is specified. -protocol = 'central' +protocol = "central" diff --git a/bob/bio/vein/config/database/protocol_fv3d/left.py b/bob/bio/vein/config/database/protocol_fv3d/left.py index a4364f5b4ad190cd56883cae9f8ec564b3d288d7..e2eebac8c1c2e6cfc1e7c6d5966f43df626e992e 100644 --- a/bob/bio/vein/config/database/protocol_fv3d/left.py +++ b/bob/bio/vein/config/database/protocol_fv3d/left.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> left fv3d +# $ bob bio pipeline simple<pipeline> left fv3d # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> left fv3d +# $ bob bio pipeline simple -p <pipeline> left fv3d # The protocol resource must be specified before the database resource. @@ -18,4 +18,4 @@ # Available protocols are: # 'central', 'left', 'right', 'stitched' -protocol = 'left' +protocol = "left" diff --git a/bob/bio/vein/config/database/protocol_fv3d/right.py b/bob/bio/vein/config/database/protocol_fv3d/right.py index e33db7ff9bb7b0da262a576cf23cf71246e8c2b9..9693dd168c5082e0091d3254d35da26bb2f9728b 100644 --- a/bob/bio/vein/config/database/protocol_fv3d/right.py +++ b/bob/bio/vein/config/database/protocol_fv3d/right.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> right fv3d +# $ bob bio pipeline simple <pipeline> right fv3d # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> right fv3d +# $ bob bio pipeline simple -p <pipeline> right fv3d # The protocol resource must be specified before the database resource. @@ -18,4 +18,4 @@ # Available protocols are: # 'central', 'left', 'right', 'stitched' -protocol = 'right' +protocol = "right" diff --git a/bob/bio/vein/config/database/protocol_fv3d/stitched.py b/bob/bio/vein/config/database/protocol_fv3d/stitched.py index faf2b1e82b1c4bc821d1cbe8df71ea25213b3059..d88f0f6d81ca37ec839313bbf57edec37ca62ce2 100644 --- a/bob/bio/vein/config/database/protocol_fv3d/stitched.py +++ b/bob/bio/vein/config/database/protocol_fv3d/stitched.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> stitched fv3d +# $ bob bio pipeline simple <pipeline> stitched fv3d # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> stitched fv3d +# $ bob bio pipeline simple -p <pipeline> stitched fv3d # The protocol resource must be specified before the database resource. @@ -18,4 +18,4 @@ # Available protocols are: # 'central', 'left', 'right', 'stitched' -protocol = 'stitched' +protocol = "stitched" diff --git a/bob/bio/vein/config/database/protocol_putvein/palm_lr_1.py b/bob/bio/vein/config/database/protocol_putvein/palm_lr_1.py index 3a3b9d4c233abba92e0fe934a934a3ebe2fff0d1..bcc6e23bd7cce24d6514c512c99c35fa8f074866 100644 --- a/bob/bio/vein/config/database/protocol_putvein/palm_lr_1.py +++ b/bob/bio/vein/config/database/protocol_putvein/palm_lr_1.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple <pipeline> wrist-LR-1 putvein # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple -p <pipeline> wrist-LR-1 putvein # The protocol resource must be specified before the database resource. @@ -22,5 +22,4 @@ # 'wrist-L_4', 'wrist-LR_4', 'wrist-R_4', 'wrist-RL_4', 'wrist-R_BEAT_4' -protocol = 'palm-LR_1' - +protocol = "palm-LR_1" diff --git a/bob/bio/vein/config/database/protocol_putvein/palm_lr_4.py b/bob/bio/vein/config/database/protocol_putvein/palm_lr_4.py index 0bab7564b26c6edb7911767d6a5ec152148450a0..3b2a508cf3444d852cfb59d67c8b1cb4e53722e0 100644 --- a/bob/bio/vein/config/database/protocol_putvein/palm_lr_4.py +++ b/bob/bio/vein/config/database/protocol_putvein/palm_lr_4.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple <pipeline> wrist-LR-1 putvein # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple -p <pipeline> wrist-LR-1 putvein # The protocol resource must be specified before the database resource. @@ -22,5 +22,4 @@ # 'wrist-L_4', 'wrist-LR_4', 'wrist-R_4', 'wrist-RL_4', 'wrist-R_BEAT_4' -protocol = 'palm-LR_4' - +protocol = "palm-LR_4" diff --git a/bob/bio/vein/config/database/protocol_putvein/wrist_lr_1.py b/bob/bio/vein/config/database/protocol_putvein/wrist_lr_1.py index d861f463d58d63e7655cf89e479ab3e4937d6bf1..a5f3c2d535e6ceb3e2c497807a14ad12402f5caa 100644 --- a/bob/bio/vein/config/database/protocol_putvein/wrist_lr_1.py +++ b/bob/bio/vein/config/database/protocol_putvein/wrist_lr_1.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple <pipeline> wrist-LR-1 putvein # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple -p <pipeline> wrist-LR-1 putvein # The protocol resource must be specified before the database resource. @@ -24,5 +24,4 @@ # This will be the default protocol if none is specified. -protocol = 'wrist-LR_1' - +protocol = "wrist-LR_1" diff --git a/bob/bio/vein/config/database/protocol_putvein/wrist_lr_4.py b/bob/bio/vein/config/database/protocol_putvein/wrist_lr_4.py index 03580a596127ffb4601c189976212afb9f4be89e..853887d873be0908fc7f4b4ac577e570ede0e4e3 100644 --- a/bob/bio/vein/config/database/protocol_putvein/wrist_lr_4.py +++ b/bob/bio/vein/config/database/protocol_putvein/wrist_lr_4.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple <pipeline> wrist-LR-1 putvein # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> wrist-LR-1 putvein +# $ bob bio pipeline simple -p <pipeline> wrist-LR-1 putvein # The protocol resource must be specified before the database resource. @@ -22,5 +22,4 @@ # 'wrist-L_4', 'wrist-LR_4', 'wrist-R_4', 'wrist-RL_4', 'wrist-R_BEAT_4' -protocol = 'wrist-LR_4' - +protocol = "wrist-LR_4" diff --git a/bob/bio/vein/config/database/protocol_verafinger/cropped_full.py b/bob/bio/vein/config/database/protocol_verafinger/cropped_full.py index 2001253d3ebaeb4e9f9f0573221fe62f28057c62..b487a8bdeadacb757e1116179eb40d643ab5921a 100644 --- a/bob/bio/vein/config/database/protocol_verafinger/cropped_full.py +++ b/bob/bio/vein/config/database/protocol_verafinger/cropped_full.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> Cropped-Full verafinger +# $ bob bio pipeline simple <pipeline> Cropped-Full verafinger # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> Cropped-Full verafinger +# $ bob bio pipeline simple -p <pipeline> Cropped-Full verafinger # The protocol resource must be specified before the database resource. @@ -19,4 +19,4 @@ # 'B', 'Cropped-B', 'Cropped-Fifty', 'Cropped-Full', 'Cropped-Nom', 'Fifty', # 'Full', 'Nom' -protocol = 'Cropped-Full' +protocol = "Cropped-Full" diff --git a/bob/bio/vein/config/database/protocol_verafinger/cropped_nom.py b/bob/bio/vein/config/database/protocol_verafinger/cropped_nom.py index 2f5b8616cb7d1b3e44503832c1bed911fd730647..b2a317ae1cbffdf8bf6552c5216c9ea4038be2b0 100644 --- a/bob/bio/vein/config/database/protocol_verafinger/cropped_nom.py +++ b/bob/bio/vein/config/database/protocol_verafinger/cropped_nom.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> Cropped-Nom verafinger +# $ bob bio pipeline simple <pipeline> Cropped-Nom verafinger # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> Cropped-Nom verafinger +# $ bob bio pipeline simple -p <pipeline> Cropped-Nom verafinger # The protocol resource must be specified before the database resource. @@ -19,4 +19,4 @@ # 'B', 'Cropped-B', 'Cropped-Fifty', 'Cropped-Full', 'Cropped-Nom', 'Fifty', # 'Full', 'Nom' -protocol = 'Cropped-Nom' +protocol = "Cropped-Nom" diff --git a/bob/bio/vein/config/database/protocol_verafinger/full.py b/bob/bio/vein/config/database/protocol_verafinger/full.py index 25b72d7c4a528b6681b99ce1ab54a08cc84f0ce2..7a62bf5e6ebbc2917e773edbd638937349d8ec3d 100644 --- a/bob/bio/vein/config/database/protocol_verafinger/full.py +++ b/bob/bio/vein/config/database/protocol_verafinger/full.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> Full verafinger +# $ bob bio pipeline simple <pipeline> Full verafinger # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> Full verafinger +# $ bob bio pipeline simple -p <pipeline> Full verafinger # The protocol resource must be specified before the database resource. @@ -19,4 +19,4 @@ # 'B', 'Cropped-B', 'Cropped-Fifty', 'Cropped-Full', 'Cropped-Nom', 'Fifty', # 'Full', 'Nom' -protocol = 'Full' +protocol = "Full" diff --git a/bob/bio/vein/config/database/protocol_verafinger/nom.py b/bob/bio/vein/config/database/protocol_verafinger/nom.py index c76cdad9f9ab476d018244ec0e4b76f0edb9a24e..1a763f06c1974558d9b5d573b88956fdbc953ba5 100644 --- a/bob/bio/vein/config/database/protocol_verafinger/nom.py +++ b/bob/bio/vein/config/database/protocol_verafinger/nom.py @@ -8,9 +8,9 @@ # It is defined as a resource in the setup file of this package. # Usage: -# $ bob bio pipelines vanilla-biometrics <pipeline> Nom verafinger +# $ bob bio pipeline simple <pipeline> Nom verafinger # or: -# $ bob bio pipelines vanilla-biometrics -p <pipeline> Nom verafinger +# $ bob bio pipeline simple -p <pipeline> Nom verafinger # The protocol resource must be specified before the database resource. @@ -21,4 +21,4 @@ # This will be the default protocol if none is specified. -protocol = 'Nom' +protocol = "Nom" diff --git a/bob/bio/vein/config/database/putvein.py b/bob/bio/vein/config/database/putvein.py index 39d7d72be96b398bae804a1e3107dddf11b07522..f07282db9a9fbd2821f602cb1ed4af535708bfb7 100644 --- a/bob/bio/vein/config/database/putvein.py +++ b/bob/bio/vein/config/database/putvein.py @@ -18,7 +18,7 @@ the link. from bob.extension import rc from bob.bio.vein.database.putvein import PutveinBioDatabase -from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector +from bob.bio.base.pipelines import DatabaseConnector import logging @@ -33,7 +33,9 @@ if "protocol" not in locals(): protocol = "wrist-LR_1" legacy_database = PutveinBioDatabase( - original_directory=_putvein_directory, original_extension=".bmp", protocol=protocol, + original_directory=_putvein_directory, + original_extension=".bmp", + protocol=protocol, ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with PUT Vein database settings @@ -44,7 +46,7 @@ database = DatabaseConnector( ) """ -The database interface wrapped for vanilla-biometrics +The database interface wrapped for pipeline simple .. warning:: diff --git a/bob/bio/vein/config/database/verafinger.py b/bob/bio/vein/config/database/verafinger.py index b4919c7398ff21f71cd3ebb8180d48dbb0e4e44e..3f866be61942aea97822e1c9dd297c25a075f7dc 100644 --- a/bob/bio/vein/config/database/verafinger.py +++ b/bob/bio/vein/config/database/verafinger.py @@ -14,7 +14,7 @@ the link. from bob.extension import rc from bob.bio.vein.database.verafinger import Database -from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector +from bob.bio.base.pipelines import DatabaseConnector import logging @@ -40,7 +40,7 @@ database = DatabaseConnector( fixed_positions=None, ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with Verafinger -database settings, wrapped with the vanilla-biometrics database connector. +database settings, wrapped with the pipeline simple database connector. .. warning:: diff --git a/bob/bio/vein/config/maximum_curvature.py b/bob/bio/vein/config/maximum_curvature.py index 8a31f170f051e0859e00fc80f73b7b166d82d3f6..eec8370569d965eb75a8348e22c71d01545183fa 100644 --- a/bob/bio/vein/config/maximum_curvature.py +++ b/bob/bio/vein/config/maximum_curvature.py @@ -17,8 +17,8 @@ import os from bob.bio.base.transformers import PreprocessorTransformer from bob.bio.base.transformers import ExtractorTransformer -from bob.bio.base.pipelines.vanilla_biometrics import ( - VanillaBiometricsPipeline, +from bob.bio.base.pipelines import ( + PipelineSimple, BioAlgorithmLegacy, ) from sklearn.pipeline import make_pipeline @@ -77,4 +77,4 @@ Defaults taken from [TV13]_. biometric_algorithm = MiuraMatch() transformer = make_pipeline(wrap(["sample"], preprocessor), wrap(["sample"], extractor)) -pipeline = VanillaBiometricsPipeline(transformer, biometric_algorithm) +pipeline = PipelineSimple(transformer, biometric_algorithm) diff --git a/bob/bio/vein/config/principal_curvature.py b/bob/bio/vein/config/principal_curvature.py index ffde68aa49d1763936942730525605fc33e85b9f..4fd3856707cf9b3d88a5506a03faf3f34f308339 100644 --- a/bob/bio/vein/config/principal_curvature.py +++ b/bob/bio/vein/config/principal_curvature.py @@ -71,11 +71,11 @@ else: legacy_temp_dir = tempfile.TemporaryDirectory().name -from bob.bio.base.pipelines.vanilla_biometrics import ( - VanillaBiometricsPipeline, +from bob.bio.base.pipelines import ( + PipelineSimple, BioAlgorithmLegacy, ) biometric_algorithm = MiuraMatch(ch=18, cw=28) -pipeline = VanillaBiometricsPipeline(transformer, biometric_algorithm) +pipeline = PipelineSimple(transformer, biometric_algorithm) diff --git a/bob/bio/vein/config/repeated_line_tracking.py b/bob/bio/vein/config/repeated_line_tracking.py index 5d5cc879d26fbfee1ff083ba50958605545d2c41..8e0989638f3b11a0404bc5581c819a7e6e0b242b 100644 --- a/bob/bio/vein/config/repeated_line_tracking.py +++ b/bob/bio/vein/config/repeated_line_tracking.py @@ -16,8 +16,8 @@ import os from bob.bio.base.transformers import PreprocessorTransformer from bob.bio.base.transformers import ExtractorTransformer -from bob.bio.base.pipelines.vanilla_biometrics import ( - VanillaBiometricsPipeline, +from bob.bio.base.pipelines import ( + PipelineSimple, BioAlgorithmLegacy, ) from sklearn.pipeline import make_pipeline @@ -73,4 +73,4 @@ Defaults taken from [TV13]_. biometric_algorithm = MiuraMatch(ch=65, cw=55) transformer = make_pipeline(wrap(["sample"], preprocessor), wrap(["sample"], extractor)) -pipeline = VanillaBiometricsPipeline(transformer, biometric_algorithm) +pipeline = PipelineSimple(transformer, biometric_algorithm) diff --git a/bob/bio/vein/config/wide_line_detector.py b/bob/bio/vein/config/wide_line_detector.py index b35b2460aadcdb312c254883072105a51ab410e6..747057713863d6a564e9fced63b79a7f1d3da71b 100644 --- a/bob/bio/vein/config/wide_line_detector.py +++ b/bob/bio/vein/config/wide_line_detector.py @@ -16,8 +16,8 @@ import os from bob.bio.base.transformers import PreprocessorTransformer from bob.bio.base.transformers import ExtractorTransformer -from bob.bio.base.pipelines.vanilla_biometrics import ( - VanillaBiometricsPipeline, +from bob.bio.base.pipelines import ( + PipelineSimple, BioAlgorithmLegacy, ) from sklearn.pipeline import make_pipeline @@ -78,4 +78,4 @@ Defaults taken from [TV13]_. biometric_algorithm = MiuraMatch(ch=18, cw=28) transformer = make_pipeline(wrap(["sample"], preprocessor), wrap(["sample"], extractor)) -pipeline = VanillaBiometricsPipeline(transformer, biometric_algorithm) +pipeline = PipelineSimple(transformer, biometric_algorithm) diff --git a/bob/bio/vein/database/utfvp.py b/bob/bio/vein/database/utfvp.py index 5424358db01efa93b5b78740a29faf49c84ed95b..2fbcaadfb8164abf4899b306edec32a5690a7018 100644 --- a/bob/bio/vein/database/utfvp.py +++ b/bob/bio/vein/database/utfvp.py @@ -158,9 +158,9 @@ class UtfvpDatabase(CSVDataset): # Downloading model if not exists urls = UtfvpDatabase.urls() filename = get_file( - "utfvp_csv.tar.gz", + "utfvp.tar.gz", urls, - file_hash="1e14c681901c69f99ebe3017566ca1463fb2c6a2952afed4463ba12e331927c3", + file_hash="526045842fcee46eec3415bfc8ac34d3", ) super().__init__( @@ -173,13 +173,10 @@ class UtfvpDatabase(CSVDataset): dataset_original_directory=rc.get( "bob.bio.vein.utfvp.directory", "" ), - extension='', - reference_id_equal_subject_id=False + extension="", + reference_id_equal_subject_id=False, ), - ROIAnnotation( - roi_path=rc.get( - "bob.bio.vein.utfvp.roi", "" - )), + ROIAnnotation(roi_path=rc.get("bob.bio.vein.utfvp.roi", "")), ), allow_scoring_with_all_biometric_references=True, ) @@ -187,12 +184,27 @@ class UtfvpDatabase(CSVDataset): @staticmethod def protocols(): # TODO: Until we have (if we have) a function that dumps the protocols, let's use this one. - return ["nom", "full", "1vsall", - "nomLeftRing", "nomRightRing", "nomLeftMiddle", "nomRightMiddle", "nomLeftIndex", "nomRightIndex", - "fullLeftRing", "fullRightRing", "fullLeftMiddle", "fullRightMiddle", "fullLeftIndex", "fullRightIndex"] + return [ + "nom", + "full", + "1vsall", + "nomLeftRing", + "nomRightRing", + "nomLeftMiddle", + "nomRightMiddle", + "nomLeftIndex", + "nomRightIndex", + "fullLeftRing", + "fullRightRing", + "fullLeftMiddle", + "fullRightMiddle", + "fullLeftIndex", + "fullRightIndex", + ] @staticmethod def urls(): - return ["https://www.idiap.ch/software/bob/databases/latest/utfvp_csv-1e14c681.tar.gz", - "http://www.idiap.ch/software/bob/databases/latest/utfvp_csv-1e14c681.tar.gz", - ] + return [ + "https://www.idiap.ch/software/bob/databases/latest/utfvp-557bfdd2.tar.gz", + "http://www.idiap.ch/software/bob/databases/latest/utfvp-557bfdd2.tar.gz", + ] diff --git a/bob/bio/vein/database/verafinger_contactless.py b/bob/bio/vein/database/verafinger_contactless.py index 51673309d179c3095b35a0f4748c0ffb261df039..e2095bdfeaaab82905e7847e736b62f533705fb5 100644 --- a/bob/bio/vein/database/verafinger_contactless.py +++ b/bob/bio/vein/database/verafinger_contactless.py @@ -56,7 +56,7 @@ class VerafingerContactless(CSVDataset): filename = get_file( "verafinger_contactless.tar.gz", urls, - file_hash="c664a83b8fcba3396b010c4d3e60e425e14b32111c4b955892072e5d687485bd", + file_hash="46045cd006b1cddbf98bdb184d9e3cca", ) super().__init__( @@ -68,8 +68,8 @@ class VerafingerContactless(CSVDataset): dataset_original_directory=rc.get( "bob.bio.vein.verafinger_contactless.directory", "" ), - extension='', - reference_id_equal_subject_id=False + extension="", + reference_id_equal_subject_id=False, ), allow_scoring_with_all_biometric_references=True, ) @@ -81,6 +81,7 @@ class VerafingerContactless(CSVDataset): @staticmethod def urls(): - return ["https://www.idiap.ch/software/bob/databases/latest/verafinger_contactless-c664a83b.tar.gz", - "http://www.idiap.ch/software/bob/databases/latest/verafinger_contactless-c664a83b.tar.gz", - ] + return [ + "https://www.idiap.ch/software/bob/databases/latest/verafinger_contactless-ee484b3b.tar.gz", + "http://www.idiap.ch/software/bob/databases/latest/verafinger_contactless-ee484b3b.tar.gz", + ] diff --git a/doc/baselines.rst b/doc/baselines.rst index 61018d91f1d077be827c234b5c44e8fadbf58732..0fd05d7ff2869fb8f679432c1579fd6fd7d1aacb 100644 --- a/doc/baselines.rst +++ b/doc/baselines.rst @@ -11,7 +11,7 @@ Executing Baseline Algorithms In this section we introduce the baselines available in this pakcage. To execute one of then in the databases available just run the following command:: -$ bob bio pipelines vanilla-biometrics [DATABASE_NAME] [BASELINE] +$ bob bio pipeline simple [DATABASE_NAME] [BASELINE] .. note:: Both, `[DATABASE_NAME]` and `[BASELINE]` can be either python resources or @@ -31,7 +31,7 @@ protocol, do the following: .. code-block:: sh - $ bob bio pipelines vanilla-biometrics verafinger rlt -vv -c + $ bob bio pipeline simple verafinger rlt -vv -c .. tip:: @@ -41,13 +41,13 @@ protocol, do the following: .. code-block:: sh - $ bob bio pipelines vanilla-biometrics verafinger rlt -vv -c -l local-parallel + $ bob bio pipeline simple verafinger rlt -vv -c -l local-parallel To run on the Idiap SGE grid use: .. code-block:: sh - $ bob bio pipelines vanilla-biometrics verafinger rlt -vv -c -l sge + $ bob bio pipeline simple rlt -vv -c -l sge This command line selects and runs the following implementations for the @@ -92,7 +92,7 @@ protocol like above, do the following: .. code-block:: sh - $ bob bio pipelines vanilla-biometrics verafinger mc -vv -c + $ bob bio pipeline simple verafinger mc -vv -c This command line selects and runs the following implementations for the @@ -133,7 +133,7 @@ protocol like above, do the following: .. code-block:: sh - $ bob bio pipelines vanilla-biometrics verafinger wld -vv -c + $ bob bio pipeline simple verafinger wld -vv -c This command line selects and runs the following implementations for the @@ -246,7 +246,7 @@ Now, re-run the experiment using your modified database descriptor: .. code-block:: sh - $ bob bio pipelines vanilla-biometrics ./verafinger_full.py wld -vv -c + $ bob bio pipeline simple ./verafinger_full.py wld -vv -c Notice we replace the use of the registered configuration file named