diff --git a/bob/bio/face/database/__init__.py b/bob/bio/face/database/__init__.py index c74a3abfcea3798df75cd219d4b92a33587fc4dc..7b1e187e27ec4e7c6a221098becd98915e9f0fc4 100644 --- a/bob/bio/face/database/__init__.py +++ b/bob/bio/face/database/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: set fileencoding=utf-8 : - +from .database import FaceBioFile from .mobio import MobioBioDatabase from .replay import ReplayBioDatabase from .atnt import AtntBioDatabase diff --git a/bob/bio/face/database/arface.py b/bob/bio/face/database/arface.py index 0165931b840f3eb94c6305fa13b02df98a0941f1..262dc90cfb955d6d3b12c84af08101769da3d098 100644 --- a/bob/bio/face/database/arface.py +++ b/bob/bio/face/database/arface.py @@ -33,4 +33,4 @@ class ARFaceBioDatabase(BioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/atnt.py b/bob/bio/face/database/atnt.py index 16226a944eb32744b859f2444eb80e644a6b7bc7..6b93e0e0394162b02b8455d3273cd926ded39575 100644 --- a/bob/bio/face/database/atnt.py +++ b/bob/bio/face/database/atnt.py @@ -33,4 +33,4 @@ class AtntBioDatabase(BioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(f) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/banca.py b/bob/bio/face/database/banca.py index 45de3ddad9e139548afc62050a5874605c6c1e8c..6da0b31202148674cc9eae9becd636494e7d9e9a 100644 --- a/bob/bio/face/database/banca.py +++ b/bob/bio/face/database/banca.py @@ -36,12 +36,12 @@ class BancaBioDatabase(ZTBioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs): retval = self.__db.tobjects(groups=groups, protocol=protocol, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] def zobjects(self, groups=None, protocol=None, **kwargs): retval = self.__db.zobjects(groups=groups, protocol=protocol, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/caspeal.py b/bob/bio/face/database/caspeal.py index d156840843563f4e04ab82443877c0105cfae1eb..620c02ef96851cf3b498734ba51708c20384c85e 100644 --- a/bob/bio/face/database/caspeal.py +++ b/bob/bio/face/database/caspeal.py @@ -33,4 +33,4 @@ class CaspealBioDatabase(BioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/database.py b/bob/bio/face/database/database.py index 8b0014595e96432b1e6f1ee7be7da32574fee756..331e3104d83845af0e2b337b005a71b1c9dcd558 100644 --- a/bob/bio/face/database/database.py +++ b/bob/bio/face/database/database.py @@ -11,13 +11,9 @@ from bob.bio.base.database.file import BioFile class FaceBioFile(BioFile): - def __init__(self, f): + def __init__(self, client_id, path, file_id): """ Initializes this File object with an File equivalent for VoxForge database. """ - super(FaceBioFile, self).__init__(client_id=f.client_id, path=f.path, file_id=f.id) - - self.__f = f - - + super(FaceBioFile, self).__init__(client_id=client_id, path=path, file_id=id) diff --git a/bob/bio/face/database/gbu.py b/bob/bio/face/database/gbu.py index 0e8eab533d02d75730a73d48fabcb27e8e4c7187..a402ba6c0034e78f62263f2bb9217e2fce6f018c 100644 --- a/bob/bio/face/database/gbu.py +++ b/bob/bio/face/database/gbu.py @@ -33,4 +33,4 @@ class GBUBioDatabase(BioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/lfw.py b/bob/bio/face/database/lfw.py index c4039f805eb96f14c284b2c30de73972631f2d11..0a22d09c15b81c9dc68046a1e96f0428e657e6ae 100644 --- a/bob/bio/face/database/lfw.py +++ b/bob/bio/face/database/lfw.py @@ -34,4 +34,4 @@ class LFWBioDatabase(BioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/mobio.py b/bob/bio/face/database/mobio.py index d7d4fd329c0211352d230ccb22b879a4e80e3f04..94c797475f4b815f96e3ef9b61359e488d53064d 100644 --- a/bob/bio/face/database/mobio.py +++ b/bob/bio/face/database/mobio.py @@ -38,12 +38,12 @@ class MobioBioDatabase(ZTBioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(f) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs): retval = self.__db.tobjects(groups=groups, protocol=protocol, model_ids=model_ids, **kwargs) - return [FaceBioFile(f) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] def zobjects(self, groups=None, protocol=None, **kwargs): retval = self.__db.zobjects(groups=groups, protocol=protocol, **kwargs) - return [FaceBioFile(f) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/multipie.py b/bob/bio/face/database/multipie.py index ac726e5f85438bc907f7e875152eac350f674ad8..f6bc0b1018dca177164de5655f519d07e6fcb9b0 100644 --- a/bob/bio/face/database/multipie.py +++ b/bob/bio/face/database/multipie.py @@ -40,9 +40,9 @@ class MultipieBioDatabase(ZTBioDatabase): def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs): retval = self.__db.tobjects(groups=groups, protocol=protocol, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] def zobjects(self, groups=None, protocol=None, **kwargs): retval = self.__db.zobjects(groups=groups, protocol=protocol, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/replay.py b/bob/bio/face/database/replay.py index a9f5555c7c0d5a342e21906806d39edc8fc688b7..3a98d01959dcb949a3329b6bfc2a17da59b4e27f 100644 --- a/bob/bio/face/database/replay.py +++ b/bob/bio/face/database/replay.py @@ -106,9 +106,9 @@ class ReplayBioDatabase(BioDatabase): retval = [] for f in objects: if f.is_real(): - retval.append(FaceBioFile(f)) + retval.append(FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id)) else: - temp = FaceBioFile(f) + temp = FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) temp.client_id = 'attack' retval.append(temp) return retval diff --git a/bob/bio/face/database/scface.py b/bob/bio/face/database/scface.py index 9a9f799ce2d5131f48edf6d75c3108c9b59e2f42..a13d092b41239bbf337ab15f7da1ed13ba2ba8bb 100644 --- a/bob/bio/face/database/scface.py +++ b/bob/bio/face/database/scface.py @@ -36,12 +36,12 @@ class SCFaceBioDatabase(ZTBioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs): retval = self.__db.tobjects(groups=groups, protocol=protocol, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] def zobjects(self, groups=None, protocol=None, **kwargs): retval = self.__db.zobjects(groups=groups, protocol=protocol, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] diff --git a/bob/bio/face/database/xm2vts.py b/bob/bio/face/database/xm2vts.py index 6666bf59afebbd3d416adadbb59b6e234b1c2b11..a6f94ceaeaf914373a5358f1491d494292194ba1 100644 --- a/bob/bio/face/database/xm2vts.py +++ b/bob/bio/face/database/xm2vts.py @@ -33,4 +33,4 @@ class XM2VTSBioDatabase(BioDatabase): def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs): retval = self.__db.objects(groups=groups, protocol=protocol, purposes=purposes, model_ids=model_ids, **kwargs) - return [FaceBioFile(BioFile(client_id=f.client_id, path=f.path, file_id=f.id)) for f in retval] + return [FaceBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval]