From 9981d93d086ebf1c6c2e8233fe1a383f94253c32 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Thu, 15 Sep 2016 21:29:04 +0200
Subject: [PATCH] [refactoring2016] modifications in the contructor
---
bob/bio/face/database/__init__.py | 2 +-
bob/bio/face/database/arface.py | 2 +-
bob/bio/face/database/atnt.py | 2 +-
bob/bio/face/database/banca.py | 6 +++---
bob/bio/face/database/caspeal.py | 2 +-
bob/bio/face/database/database.py | 8 ++------
bob/bio/face/database/gbu.py | 2 +-
bob/bio/face/database/lfw.py | 2 +-
bob/bio/face/database/mobio.py | 6 +++---
bob/bio/face/database/multipie.py | 4 ++--
bob/bio/face/database/replay.py | 4 ++--
bob/bio/face/database/scface.py | 6 +++---
bob/bio/face/database/xm2vts.py | 2 +-
13 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/bob/bio/face/database/__init__.py b/bob/bio/face/database/__init__.py
index c74a3abf..7b1e187e 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 0165931b..262dc90c 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 16226a94..6b93e0e0 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 45de3dda..6da0b312 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 d1568408..620c02ef 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 8b001459..331e3104 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 0e8eab53..a402ba6c 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 c4039f80..0a22d09c 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 d7d4fd32..94c79747 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 ac726e5f..f6bc0b10 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 a9f5555c..3a98d019 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 9a9f799c..a13d092b 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 6666bf59..a6f94cea 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]
--
GitLab