[refactoring2016] modifications in the contructor

bob/bio/face/database/__init__.py

 #!/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

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]

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]

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]

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]

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)

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]

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]

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]

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]
 

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

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]

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]