Merge branch 'remove-biowave' into 'master'

Merge remove-biowave into master

In this branch the biowave_test High level implementation and dependencies are removed from the master branch.

See merge request !9

bob/bio/vein/configurations/biowave_test.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-# Tue 27 Sep 2016 16:47:58 CEST
-
-"""Not yet documented
-
-.. todo::
-
-  Document this module
-
-"""
-
-from bob.bio.vein.database import BiowaveTestBioDatabase
-
-biowave_test_image_directory = "[YOUR_BIOWAVE_TEST_DIRECTORY]"
-"""Not yet documented
-
-.. todo::
-
-  Document this attribute
-
-"""
-
-database = BiowaveTestBioDatabase(
-    original_directory=biowave_test_image_directory,
-    original_extension='.png',
-)
-"""Not yet documented
-
-.. todo::
-
-  Document this attribute
-
-"""
-
-protocol = 'all'
-"""Not yet documented
-
-.. todo::
-
-  Document this attribute
-
-"""

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
 

bob/bio/vein/database/biowave_test.py

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

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

doc/resources.rst

@@ -44,16 +44,6 @@ UTFVP Database
 .. automodule:: bob.bio.vein.configurations.utfvp
    :members:
 
-
-.. _bob.bio.vein.resources.database.biowave_test:
-
-Biowave Test Database
-=====================
-
-.. automodule:: bob.bio.vein.configurations.biowave_test
-   :members:
-
-
 .. _bob.bio.vein.resources.recognition:
 
 Recognition Systems

requirements.txt

@@ -11,5 +11,4 @@ bob.ip.base
 bob.bio.base
 bob.db.utfvp
 bob.db.verafinger
-bob.db.putvein
-bob.db.biowave_test
\ No newline at end of file
+bob.db.putvein
\ No newline at end of file

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',

test-requirements.txt

@@ -2,4 +2,3 @@ gridtk
 bob.db.verafinger
 bob.db.utfvp
 bob.db.putvein
-bob.db.biowave_test