Merge branch 'issue_18_fix' into 'master'

Removed duplicating db configs, issue #18

Closes #18

See merge request !54

bob/pad/face/config/database/aggregated_db.py

-#!/usr/bin/env python
-"""Aggregated Db is a database for face PAD experiments.
-This database aggregates the data from 3 publicly available data-sets:
-`REPLAYATTACK`_, `REPLAY-MOBILE`_ and `MSU MFSD`_.
-You can download the data for the above databases by following the corresponding
-links.
-
-The reference citation for the `REPLAYATTACK`_ is [CAM12]_.
-The reference citation for the `REPLAY-MOBILE`_ is [CBVM16]_.
-The reference citation for the `MSU MFSD`_ is [WHJ15]_.
-
-.. include:: links.rst
-"""
-
-from bob.pad.face.database import AggregatedDbPadDatabase
-
-# Directory where the data files are stored.
-# This directory is given in the .bob_bio_databases.txt file located in your home directory
-original_directory = "[YOUR_AGGREGATED_DB_DIRECTORIES]"
-"""Value of ``~/.bob_bio_databases.txt`` for this database"""
-
-original_extension = ".mov"  # extension of the data files
-
-database = AggregatedDbPadDatabase(
-    protocol='grandtest',
-    original_directory=original_directory,
-    original_extension=original_extension,
-    training_depends_on_protocol=True,
-)
-"""The :py:class:`bob.pad.base.database.PadDatabase` derivative with Aggregated Db
-database settings.
-
-.. warning::
-
-   This class only provides a programmatic interface to load data in an orderly
-   manner, respecting usage protocols. It does **not** contain the raw
-   data files. You should procure those yourself.
-
-Notice that ``original_directory`` is set to ``[YOUR_AGGREGATED_DB_DIRECTORIES]``.
-You must make sure to create ``${HOME}/.bob_bio_databases.txt`` file setting this
-value to the places where you actually installed the Replay-Attack, Replay-Mobile
-and MSU MFSD Databases. In particular, the paths pointing to these 3 databases
-must be separated with a space. See the following note with an example of
-``[YOUR_AGGREGATED_DB_DIRECTORIES]`` entry in the ``${HOME}/.bob_bio_databases.txt`` file.
-
-.. note::
-
-    [YOUR_AGGREGATED_DB_DIRECTORIES] = <PATH_TO_REPLAY_ATTACK> <PATH_TO_REPLAY_MOBILE> <PATH_TO_MSU_MFSD>
-"""

bob/pad/face/config/database/mifs.py

-#!/usr/bin/env python
-"""`MIFS`_ is a face makeup spoofing database adapted for face PAD experiments.
-
-Database assembled from a dataset consisting of 107 makeup-transformations taken
-from random YouTube makeup video tutorials, adapted in this package for face-PAD
-experiments. The public version of the database contains 107 such transformations
-with each time two images of a subject before makeup, two images of the same
-subject after makeup and two images of the target identity. For this package, a
-subset of 104 makeup transformations is selected, the target identities images
-discarded and the remaining images randomly distributed in three sets. More
-information can be found in the reference [CDSR17]_.
-
-You can download the raw data of the `MIFS`_ database by following
-the link.
-
-.. include:: links.rst
-
-"""
-
-from bob.pad.face.database.mifs import MIFSPadDatabase
-
-# Directory where the data files are stored.
-# This directory is given in the .bob_bio_databases.txt file located in your home directory
-original_directory = "[YOUR_MIFS_DATABASE_DIRECTORY]"
-"""Value of ``~/.bob_bio_databases.txt`` for this database"""
-
-original_extension = ".jpg"  # extension of the data files
-
-database = MIFSPadDatabase(
-    protocol='grandtest',
-    original_directory=original_directory,
-    original_extension=original_extension,
-    training_depends_on_protocol=True,
-)
-"""The :py:class:`bob.pad.base.database.PadDatabase` derivative with MIFS
-database settings.
-
-.. warning::
-
-   This class only provides a programmatic interface to load data in an orderly
-   manner, respecting usage protocols. It does **not** contain the raw
-   data files. You should procure those yourself.
-
-Notice that ``original_directory`` is set to ``[YOUR_MIFS_DATABASE_DIRECTORY]``.
-You must make sure to create ``${HOME}/.bob_bio_databases.txt`` setting this
-value to the place where you actually installed the MIFS Database, as
-explained in the section :ref:`bob.pad.face.baselines`.
-"""

bob/pad/face/config/database/msu_mfsd.py

-#!/usr/bin/env python
-"""`MSU MFSD`_ is a database for face PAD experiments.
-
-Database created at MSU, for face-PAD experiments. The public version of the database contains
-280 videos corresponding to 35 clients. The videos are grouped as 'genuine' and 'attack'.
-The attack videos have been constructed from the genuine ones,
-and consist of three kinds: print, iPad (video-replay), and iPhone (video-replay).
-Face-locations are also provided for each frame of each video, but some (6 videos) face-locations are not reliable,
-because the videos are not correctly oriented.
-The reference citation is [WHJ15]_.
-
-You can download the raw data of the `MSU MFSD`_ database by following
-the link.
-
-.. include:: links.rst
-"""
-
-from bob.pad.face.database import MsuMfsdPadDatabase
-
-# Directory where the data files are stored.
-# This directory is given in the .bob_bio_databases.txt file located in your home directory
-original_directory = "[YOUR_MSU_MFSD_DIRECTORY]"
-"""Value of ``~/.bob_bio_databases.txt`` for this database"""
-
-original_extension = "none"  # extension is not used to load the data in the HLDI of this database
-
-database = MsuMfsdPadDatabase(
-    protocol='grandtest',
-    original_directory=original_directory,
-    original_extension=original_extension,
-    training_depends_on_protocol=True,
-)
-"""The :py:class:`bob.pad.base.database.PadDatabase` derivative with MSU MFSD
-database settings.
-
-.. warning::
-
-   This class only provides a programmatic interface to load data in an orderly
-   manner, respecting usage protocols. It does **not** contain the raw
-   data files. You should procure those yourself.
-
-Notice that ``original_directory`` is set to ``[YOUR_MSU_MFSD_DIRECTORY]``.
-You must make sure to create ``${HOME}/.bob_bio_databases.txt`` setting this
-value to the place where you actually installed the Replay-Mobile Database, as
-explained in the section :ref:`bob.pad.face.baselines`.
-"""

bob/pad/face/config/database/replay_attack.py

-#!/usr/bin/env python
-"""`Replayattack`_ is a database for face PAD experiments.
-
-The Replay-Attack Database for face spoofing consists of 1300 video clips of photo and video attack attempts to 50 clients,
-under different lighting conditions. This Database was produced at the Idiap Research Institute, in Switzerland.
-The reference citation is [CAM12]_.
-
-You can download the raw data of the `Replayattack`_ database by following
-the link.
-
-.. include:: links.rst
-"""
-
-from bob.pad.face.database import ReplayPadDatabase
-
-# Directory where the data files are stored.
-# This directory is given in the .bob_bio_databases.txt file located in your home directory
-original_directory = "[YOUR_REPLAY_ATTACK_DIRECTORY]"
-"""Value of ``~/.bob_bio_databases.txt`` for this database"""
-
-original_extension = ".mov"  # extension of the data files
-
-database = ReplayPadDatabase(
-    protocol='grandtest',
-    original_directory=original_directory,
-    original_extension=original_extension,
-    training_depends_on_protocol=True,
-)
-"""The :py:class:`bob.pad.base.database.PadDatabase` derivative with Replayattack
-database settings
-
-.. warning::
-
-   This class only provides a programmatic interface to load data in an orderly
-   manner, respecting usage protocols. It does **not** contain the raw
-   data files. You should procure those yourself.
-
-Notice that ``original_directory`` is set to ``[YOUR_REPLAY_ATTACK_DIRECTORY]``.
-You must make sure to create ``${HOME}/.bob_bio_databases.txt`` setting this
-value to the place where you actually installed the Replayattack Database, as
-explained in the section :ref:`bob.pad.face.baselines`.
-"""

bob/pad/face/config/database/replay_mobile.py

-#!/usr/bin/env python
-"""`Replay-Mobile`_ is a database for face PAD experiments.
-
-The Replay-Mobile Database for face spoofing consists of 1030 video clips of photo and video attack attempts to 40 clients,
-under different lighting conditions.
-These videos were recorded with current devices from the market -- an iPad Mini2 (running iOS) and a LG-G4 smartphone (running Android).
-This Database was produced at the Idiap Research Institute (Switzerland) within the framework
-of collaboration with Galician Research and Development Center in Advanced Telecommunications - Gradiant (Spain).
-The reference citation is [CBVM16]_.
-
-You can download the raw data of the `Replay-Mobile`_ database by following
-the link.
-
-.. include:: links.rst
-"""
-
-from bob.pad.face.database import ReplayMobilePadDatabase
-
-# Directory where the data files are stored.
-# This directory is given in the .bob_bio_databases.txt file located in your home directory
-original_directory = "[YOUR_REPLAY_MOBILE_DIRECTORY]"
-"""Value of ``~/.bob_bio_databases.txt`` for this database"""
-
-original_extension = ".mov"  # extension of the data files
-
-database = ReplayMobilePadDatabase(
-    protocol='grandtest',
-    original_directory=original_directory,
-    original_extension=original_extension,
-    training_depends_on_protocol=True,
-)
-"""The :py:class:`bob.pad.base.database.PadDatabase` derivative with Replay-Mobile
-database settings.
-
-.. warning::
-
-   This class only provides a programmatic interface to load data in an orderly
-   manner, respecting usage protocols. It does **not** contain the raw
-   data files. You should procure those yourself.
-
-Notice that ``original_directory`` is set to ``[YOUR_REPLAY_MOBILE_DIRECTORY]``.
-You must make sure to create ``${HOME}/.bob_bio_databases.txt`` setting this
-value to the place where you actually installed the Replay-Mobile Database, as
-explained in the section :ref:`bob.pad.face.baselines`.
-"""

setup.py

@@ -58,11 +58,11 @@ setup(
 
         # registered databases:
         'bob.pad.database': [
-            'replay-attack = bob.pad.face.config.database.replay_attack:database',
-            'replay-mobile = bob.pad.face.config.database.replay_mobile:database',
-            'msu-mfsd = bob.pad.face.config.database.msu_mfsd:database',
-            'aggregated-db = bob.pad.face.config.database.aggregated_db:database',
-            'mifs = bob.pad.face.config.database.mifs:database',
+            'replay-attack = bob.pad.face.config.replay_attack:database',
+            'replay-mobile = bob.pad.face.config.replay_mobile:database',
+            'msu-mfsd = bob.pad.face.config.msu_mfsd:database',
+            'aggregated-db = bob.pad.face.config.aggregated_db:database',
+            'mifs = bob.pad.face.config.mifs:database',
         ],
 
         # registered configurations: