From 24bda38f8ad9ea1422e1b779597862c503be1d65 Mon Sep 17 00:00:00 2001
From: Amir Mohammadi <amir.mohammadi@idiap.ch>
Date: Tue, 30 Aug 2016 15:05:17 +0200
Subject: [PATCH] update filesets dummy database
---
bob/bio/base/test/dummy/fileset.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/bob/bio/base/test/dummy/fileset.py b/bob/bio/base/test/dummy/fileset.py
index 9c829bd2..570f2eb0 100644
--- a/bob/bio/base/test/dummy/fileset.py
+++ b/bob/bio/base/test/dummy/fileset.py
@@ -1,4 +1,4 @@
-from bob.bio.db import ZTBioDatabase, BioFileSet, BioFile, AtntBioDatabase
+from bob.bio.db import ZTBioDatabase, BioFileSet, BioFile
from bob.bio.base.test.utils import atnt_database_directory
@@ -14,7 +14,8 @@ class DummyDatabase(ZTBioDatabase):
training_depends_on_protocol=False,
models_depend_on_protocol=False
)
- self.__db = AtntBioDatabase()
+ import bob.db.atnt
+ self.__db = bob.db.atnt.Database()
def uses_probe_file_sets(self):
return True
@@ -33,11 +34,11 @@ class DummyDatabase(ZTBioDatabase):
file_sets.append(file_set)
return file_sets
- def model_ids(self, groups=None, protocol=None, gender=None):
- return self.__db.model_ids(groups, protocol, gender)
+ def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
+ return self.__db.model_ids(groups, protocol)
def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, **kwargs):
- return self.__db.objects(groups, protocol, purposes, model_ids, **kwargs)
+ return self.__db.objects(model_ids, groups, purposes, protocol, **kwargs)
def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs):
return []
@@ -45,14 +46,14 @@ class DummyDatabase(ZTBioDatabase):
def zobjects(self, groups=None, protocol=None, **kwargs):
return []
- def tmodel_ids(self, protocol=None, groups=None, **kwargs):
+ def tmodel_ids_with_protocol(self, protocol=None, groups=None, **kwargs):
return self.__db.model_ids(groups)
def t_enroll_files(self, t_model_id, group='dev'):
- return self.__db.enroll_files(t_model_id, group)
+ return self.enroll_files(t_model_id, group)
def z_probe_files(self, group='dev'):
- return self.__db.probe_files(None, group)
+ return self.probe_files(None, group)
def z_probe_file_sets(self, group='dev'):
return self.probe_file_sets(None, group)
--
GitLab