[refactoring2016] Changed the signature

parent 630dcf0e
Pipeline #3733 passed with stages
in 55 minutes and 15 seconds
#!/usr/bin/env python #!/usr/bin/env python
# vim: set fileencoding=utf-8 : # vim: set fileencoding=utf-8 :
from .database import VeinBioFile
from .biowave_test import BiowaveTestBioDatabase from .biowave_test import BiowaveTestBioDatabase
from .verafinger import VerafingerBioDatabase from .verafinger import VerafingerBioDatabase
from .utfvp import UtfvpBioDatabase from .utfvp import UtfvpBioDatabase
......
...@@ -45,7 +45,7 @@ class BiowaveTestBioDatabase(BioDatabase): ...@@ -45,7 +45,7 @@ class BiowaveTestBioDatabase(BioDatabase):
def objects(self, protocol=None, groups=None, purposes=None, model_ids=None, **kwargs): def objects(self, protocol=None, groups=None, purposes=None, model_ids=None, **kwargs):
retval = self.__db.objects(protocol=protocol, groups=groups, purposes=purposes, model_ids=model_ids) retval = self.__db.objects(protocol=protocol, groups=groups, purposes=purposes, model_ids=model_ids)
return [VeinBioFile(f) for f in retval] return [VeinBioFile(client_id=f.client_id, path=f.path, file_id=f.file_id) for f in retval]
# the methodes are derived from: # the methodes are derived from:
# bob.bio.db/bob/bio/db/database.py # bob.bio.db/bob/bio/db/database.py
......
...@@ -11,12 +11,12 @@ from bob.bio.base.database.file import BioFile ...@@ -11,12 +11,12 @@ from bob.bio.base.database.file import BioFile
class VeinBioFile(BioFile): class VeinBioFile(BioFile):
def __init__(self, f): def __init__(self, client_id, path, file_id):
""" """
Initializes this File object with an File equivalent for Initializes this File object with an File equivalent for
VoxForge database. VoxForge database.
""" """
super(VeinBioFile, self).__init__(client_id=f.client_id, path=f.path, file_id=f.id) super(VeinBioFile, self).__init__(client_id=client_id, path=path, file_id=file_id)
self.__f = f self.__f = f
......
...@@ -26,4 +26,4 @@ class UtfvpBioDatabase(BioDatabase): ...@@ -26,4 +26,4 @@ class UtfvpBioDatabase(BioDatabase):
retval = self.__db.objects(groups=groups, protocol=protocol, retval = self.__db.objects(groups=groups, protocol=protocol,
purposes=purposes, model_ids=model_ids, **kwargs) purposes=purposes, model_ids=model_ids, **kwargs)
return [VeinBioFile(f) for f in retval] return [VeinBioFile(client_id=f.client_id, path=f.path, file_id=f.file_id) for f in retval]
...@@ -44,4 +44,4 @@ class VerafingerBioDatabase(BioDatabase): ...@@ -44,4 +44,4 @@ class VerafingerBioDatabase(BioDatabase):
self.low_level_group_names, self.high_level_group_names) self.low_level_group_names, self.high_level_group_names)
retval = self.__db.objects(groups=groups, protocol=protocol, retval = self.__db.objects(groups=groups, protocol=protocol,
purposes=purposes, model_ids=model_ids, **kwargs) purposes=purposes, model_ids=model_ids, **kwargs)
return [VeinBioFile(f) for f in retval] return [VeinBioFile(client_id=f.client_id, path=f.path, file_id=f.file_id) for f in retval]
...@@ -32,8 +32,8 @@ setup( ...@@ -32,8 +32,8 @@ setup(
entry_points={ entry_points={
'bob.bio.database': [ 'bob.bio.database': [
'verafinger = bob.bio.base.configurations.database.verafinger:database', 'verafinger = bob.bio.vein.configurations.database.verafinger:database',
'utfvp = bob.bio.base.configurations.database.utfvp:database', 'utfvp = bob.bio.vein.configurations.database.utfvp:database',
], ],
'bob.bio.preprocessor': [ 'bob.bio.preprocessor': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment