diff --git a/bob/bio/vein/configurations/utfvp.py b/bob/bio/vein/configurations/utfvp.py index eb742b099ed2e56113d005c70ebd34ffc8e63c7a..6b40cc56f670662c451852e13f734ce83a0bc817 100644 --- a/bob/bio/vein/configurations/utfvp.py +++ b/bob/bio/vein/configurations/utfvp.py @@ -22,7 +22,10 @@ from bob.bio.vein.database import UtfvpBioDatabase utfvp_directory = "[YOUR_UTFVP_DIRECTORY]" """Value of ``~/.bob_bio_databases.txt`` for this database""" -database = UtfvpBioDatabase(original_directory = utfvp_directory) +database = UtfvpBioDatabase( + original_directory = utfvp_directory, + original_extension = '.png', + ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with UTFVP settings .. warning:: diff --git a/bob/bio/vein/configurations/verafinger.py b/bob/bio/vein/configurations/verafinger.py index f0b9abacc7006de92f0e0bc4421f9ef37fbaa170..9b642101ecfc00ea4879a2e6e1c2541c3652f2fc 100644 --- a/bob/bio/vein/configurations/verafinger.py +++ b/bob/bio/vein/configurations/verafinger.py @@ -20,7 +20,10 @@ from bob.bio.vein.database import VerafingerBioDatabase verafinger_directory = "[YOUR_VERAFINGER_DIRECTORY]" """Value of ``~/.bob_bio_databases.txt`` for this database""" -database = VerafingerBioDatabase(original_directory = verafinger_directory) +database = VerafingerBioDatabase( + original_directory = verafinger_directory, + original_extension = '.png', + ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with Verafinger database settings diff --git a/bob/bio/vein/database/utfvp.py b/bob/bio/vein/database/utfvp.py index 8fe5a5a31b2017c6f9a566d01b9e40078374e90b..b8f09a049d3cfea5a8216b27d4ea6ccc4cb75aa6 100644 --- a/bob/bio/vein/database/utfvp.py +++ b/bob/bio/vein/database/utfvp.py @@ -3,7 +3,7 @@ # Tue 27 Sep 2016 16:49:05 CEST from .database import VeinBioFile -from bob.bio.base.database import BioDatabase, BioFile +from bob.bio.base.database import BioDatabase class UtfvpBioDatabase(BioDatabase): diff --git a/bob/bio/vein/database/verafinger.py b/bob/bio/vein/database/verafinger.py index a33e2e42cab7c4a9b5a4f509a3c8a0733a4924fd..23d3ff269d74257aeeb20af97616b10633fb7fb8 100644 --- a/bob/bio/vein/database/verafinger.py +++ b/bob/bio/vein/database/verafinger.py @@ -4,7 +4,7 @@ from .database import VeinBioFile -from bob.bio.base.database import BioDatabase, BioFile +from bob.bio.base.database import BioDatabase class VerafingerBioDatabase(BioDatabase): diff --git a/bob/bio/vein/tests/test_databases.py b/bob/bio/vein/tests/test_databases.py index 3903a351645c77b2781a6ff2922c2a7ba6f9c73d..08c7c5563b6635d677175f5f6b85dc6f311513bf 100644 --- a/bob/bio/vein/tests/test_databases.py +++ b/bob/bio/vein/tests/test_databases.py @@ -6,14 +6,16 @@ from nose.plugins.skip import SkipTest import bob.bio.base from bob.bio.base.test.utils import db_available -from bob.bio.base.test.test_database_implementations import check_database, check_database_zt +from bob.bio.base.test.test_database_implementations import check_database @db_available('utfvp') def test_utfvp(): - database = bob.bio.base.load_resource('utfvp', 'database', preferred_package='bob.bio.vein') + module = bob.bio.base.load_resource('utfvp', 'config', + preferred_package='bob.bio.vein') try: - check_database(database, protocol='nomLeftRing', groups=('dev', 'eval')) + check_database(module.database, protocol=module.protocol, + groups=('dev', 'eval')) except IOError as e: raise SkipTest( "The database could not queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e) @@ -21,9 +23,11 @@ def test_utfvp(): @db_available('verafinger') def test_verafinger(): - database = bob.bio.base.load_resource('verafinger', 'database', preferred_package='bob.bio.vein') + module = bob.bio.base.load_resource('verafinger', 'config', + preferred_package='bob.bio.vein') try: - check_database(database, protocol='Fifty', groups=('dev', 'eval')) + check_database(module.database, protocol='Fifty', groups=('dev', + 'eval')) except IOError as e: raise SkipTest( "The database could not queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)