diff --git a/bob/bio/base/test/dummy/database.py b/bob/bio/base/test/dummy/database.py index d80dc5e4a68bfe605044558609be6e2c4f37ea28..a44e0ec2fc2f2184d91735e195153f739ac1876e 100644 --- a/bob/bio/base/test/dummy/database.py +++ b/bob/bio/base/test/dummy/database.py @@ -1,4 +1,4 @@ -from bob.bio.db import ZTBioDatabase, AtntBioDatabase +from bob.bio.db import ZTBioDatabase from bob.bio.base.test.utils import atnt_database_directory @@ -14,13 +14,14 @@ 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 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 [] @@ -28,13 +29,13 @@ 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) database = DummyDatabase()