diff --git a/bob/bio/vein/database/__init__.py b/bob/bio/vein/database/__init__.py index 1be8375267bfa7fdde81321179cc112c981121eb..e4da7db23a776c7d7ee84297a86009e46fd04959 100644 --- a/bob/bio/vein/database/__init__.py +++ b/bob/bio/vein/database/__init__.py @@ -2,7 +2,6 @@ # vim: set fileencoding=utf-8 : from .database import VeinBioFile -from .biowave_test import BiowaveTestBioDatabase from .verafinger import VerafingerBioDatabase from .utfvp import UtfvpBioDatabase diff --git a/bob/bio/vein/database/biowave_test.py b/bob/bio/vein/database/biowave_test.py deleted file mode 100644 index ea61039c9a16c220979ed2c30945c421045b68a8..0000000000000000000000000000000000000000 --- a/bob/bio/vein/database/biowave_test.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python -# vim: set fileencoding=utf-8 : -# Tue 27 Sep 2016 16:49:15 CEST - -"""BIOWAVE_TEST database implementation of bob.bio.db.BioDatabase interface. - -It is an extension of an SQL-based database interface, which directly talks to -BIOWAVE_TEST database for verification experiments (good to use in bob.bio.base -framework). -""" - -from .database import VeinBioFile -from bob.bio.base.database import BioDatabase, BioFile - - -class BiowaveTestBioDatabase(BioDatabase): - """ - Implements verification API for querying BIOWAVE_TEST database. - """ - - def __init__( - self, - **kwargs - ): - # before it was also "name" in the init. - # - # the BioDatabase class is defined in: - # bob.bio.db/bob/bio/db/database.py - # - # In this -- the high level implementation we call base class constructors to - # open a session to the database. We use **kwargs so that we could pass - # the arguments later, e.g. from the default database configuration. - - super(BiowaveTestBioDatabase, self).__init__(name='biowave_test', **kwargs) - - from bob.db.biowave_test.query import Database as LowLevelDatabase - self.__db = LowLevelDatabase() - - def client_id_from_model_id(self, model_id, group='dev'): - """Required as ``model_id != client_id`` on this database""" - return self.__db.client_id_from_model_id(model_id) - - def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs): - return self.__db.model_ids(protocol=protocol, groups=groups) - - def objects(self, protocol=None, groups=None, purposes=None, model_ids=None, **kwargs): - retval = self.__db.objects(protocol=protocol, groups=groups, purposes=purposes, model_ids=model_ids) - return [VeinBioFile(client_id=f.client_id, path=f.path, file_id=f.id) for f in retval] - - # the methodes are derived from: - # bob.bio.db/bob/bio/db/database.py - # this means that methodes defined there need to have certain arguments, e.g.: - # model_ids_with_protocol: - # groups; - # protocol; - # objects: - # groups; - # protocol; - # purposes; - # model_ids; - # If you have some other arguments to pass, use **kwargs, if your methods doesn't have some - # arguments, just don't pass them (e.g. see the model_ids). diff --git a/develop.cfg b/develop.cfg index f98552a8a54faada530843f8d86b8c3f9aab049b..d95f95bcfd90a46af2f6a0a2fcf3062a09717d01 100644 --- a/develop.cfg +++ b/develop.cfg @@ -28,7 +28,6 @@ develop = src/bob.extension src/bob.db.verafinger src/bob.db.utfvp src/bob.db.putvein - src/bob.db.biowave_test src/bob.learn.activation src/bob.learn.linear src/bob.learn.em @@ -55,7 +54,6 @@ bob.db.base = git git@gitlab.idiap.ch:bob/bob.db.base bob.db.verafinger = git git@gitlab.idiap.ch:bob/bob.db.verafinger bob.db.utfvp = git git@gitlab.idiap.ch:bob/bob.db.utfvp bob.db.putvein = git git@gitlab.idiap.ch:bob/bob.db.putvein -bob.db.biowave_test = git git@gitlab.idiap.ch:bob/bob.db.biowave_test bob.learn.activation = git git@gitlab.idiap.ch:bob/bob.learn.activation bob.learn.linear = git git@gitlab.idiap.ch:bob/bob.learn.linear bob.learn.em = git git@gitlab.idiap.ch:bob/bob.learn.em diff --git a/setup.py b/setup.py index f9bcbead3e92fd8be8150a1da0f40932f93d7099..a91004f45240d9ef6d8e06874800d19130eb7ef8 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ setup( # databases 'verafinger = bob.bio.vein.configurations.verafinger', 'utfvp = bob.bio.vein.configurations.utfvp', - 'biowave_test = bob.bio.vein.configurations.biowave_test', # baselines 'mc = bob.bio.vein.configurations.maximum_curvature',