Merge branch 'fix-fargo' into 'master'

added FARGO stuff wherever it was needed

See merge request !55

bob/bio/face/database/__init__.py

@@ -19,7 +19,6 @@ from .frgc import FRGCBioDatabase
 from .scface import SCFaceBioDatabase
 from .replaymobile import ReplayMobileBioDatabase
 from .msu_mfsd_mod import MsuMfsdModBioDatabase
-
 from .fargo import FargoBioDatabase
 
 
@@ -59,5 +58,6 @@ __appropriate__(
   SCFaceBioDatabase,
   ReplayMobileBioDatabase,
   MsuMfsdModBioDatabase,
+  FargoBioDatabase
 )
 __all__ = [_ for _ in dir() if not _.startswith('_')]

conda/meta.yaml

@@ -83,6 +83,7 @@ test:
     - bob.db.replaymobile
     - bob.db.scface
     - bob.db.xm2vts
+    - bob.db.fargo
     - bob.bio.gmm
     - gridtk
 

develop.cfg

@@ -37,6 +37,7 @@ eggs = bob.extension
        bob.db.replaymobile
        bob.db.scface
        bob.db.xm2vts
+       bob.db.fargo
        gridtk
        bob.bio.base
        bob.bio.gmm
@@ -78,6 +79,7 @@ develop = src/bob.extension
           src/bob.db.replaymobile
           src/bob.db.scface
           src/bob.db.xm2vts
+          src/bob.db.fargo
           src/gridtk
           src/bob.bio.base
           src/bob.bio.gmm
@@ -123,6 +125,7 @@ bob.db.replay = git https://gitlab.idiap.ch/bob/bob.db.replay
 bob.db.replaymobile = git https://gitlab.idiap.ch/bob/bob.db.replaymobile
 bob.db.scface = git https://gitlab.idiap.ch/bob/bob.db.scface
 bob.db.xm2vts = git https://gitlab.idiap.ch/bob/bob.db.xm2vts
+bob.db.fargo = git https://gitlab.idiap.ch/bob/bob.db.fargo
 gridtk = git https://gitlab.idiap.ch/bob/gridtk
 bob.bio.base = git https://gitlab.idiap.ch/bob/bob.bio.base
 bob.bio.gmm = git https://gitlab.idiap.ch/bob/bob.bio.gmm

doc/implementation.rst

@@ -171,6 +171,10 @@ Here is the list of files and replacement strings for all databases that are reg
 
   - Images: ``[YOUR_XM2VTS_DIRECTORY]``
 
+* FARGO: ``'fargo'``
+
+  - Images: ``[YOUR_FARGO_DIRECTORY]``
+
 You can use the ``databases.py`` script to list, which data directories are correctly set up.
 
 In order to view the annotations inside your database on top of the images, you can use the ``display_face_annotations.py`` script that is provided.

doc/implemented.rst

@@ -26,6 +26,7 @@ Databases
    bob.bio.face.database.XM2VTSBioDatabase
    bob.bio.face.database.FRGCBioDatabase
    bob.bio.face.database.SCFaceBioDatabase
+   bob.bio.face.database.FargoBioDatabase
 
 
 Face Image Annotators

test-requirements.txt

@@ -15,4 +15,5 @@ bob.db.replay
 bob.db.replaymobile
 bob.db.scface
 bob.db.xm2vts
+bob.db.fargo
 bob.bio.gmm