Commit b63c6178 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'frgc-fixes' into 'master'

FRGC Fixes - Round 2

See merge request !147
parents 94a2daaa a7f992da
Pipeline #53990 passed with stages
in 31 minutes and 29 seconds
...@@ -13,6 +13,7 @@ from bob.extension import rc ...@@ -13,6 +13,7 @@ from bob.extension import rc
from bob.extension.download import get_file from bob.extension.download import get_file
import bob.io.base import bob.io.base
from sklearn.pipeline import make_pipeline from sklearn.pipeline import make_pipeline
from bob.pipelines.utils import hash_string
class FRGCDatabase(CSVDataset): class FRGCDatabase(CSVDataset):
...@@ -27,7 +28,7 @@ class FRGCDatabase(CSVDataset): ...@@ -27,7 +28,7 @@ class FRGCDatabase(CSVDataset):
filename = get_file( filename = get_file(
"frgc.tar.gz", "frgc.tar.gz",
urls, urls,
file_hash="270394e3eee9a80b6a68a5a1b6f7db2ff0773738b48284561cb1996358e5a3c1", file_hash="75c41cae36c3c942e64bc82d4c47786460f0615ee52fc53fd174e64cc1d9c650",
) )
super().__init__( super().__init__(
...@@ -49,8 +50,11 @@ class FRGCDatabase(CSVDataset): ...@@ -49,8 +50,11 @@ class FRGCDatabase(CSVDataset):
fixed_positions=fixed_positions, fixed_positions=fixed_positions,
allow_scoring_with_all_biometric_references=True, allow_scoring_with_all_biometric_references=True,
group_probes_by_reference_id=True, group_probes_by_reference_id=True,
memory_demanding=True,
) )
self.hash_fn = hash_string
@staticmethod @staticmethod
def protocols(): def protocols():
# TODO: Until we have (if we have) a function that dumps the protocols, let's use this one. # TODO: Until we have (if we have) a function that dumps the protocols, let's use this one.
...@@ -63,6 +67,6 @@ class FRGCDatabase(CSVDataset): ...@@ -63,6 +67,6 @@ class FRGCDatabase(CSVDataset):
@staticmethod @staticmethod
def urls(): def urls():
return [ return [
"https://www.idiap.ch/software/bob/databases/latest/frgc-270394e3.tar.gz", "https://www.idiap.ch/software/bob/databases/latest/frgc-75c41cae.tar.gz",
"http://www.idiap.ch/software/bob/databases/latest/frgc-270394e3.tar.gz", "http://www.idiap.ch/software/bob/databases/latest/frgc-75c41cae.tar.gz",
] ]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment