From facbbd89affa09da5c6662a4408f3548cfcce5d5 Mon Sep 17 00:00:00 2001
From: Theophile GENTILHOMME <tgentilhomme@jurasix08.idiap.ch>
Date: Fri, 25 May 2018 10:40:18 +0200
Subject: [PATCH] [script][common_options] Modification of criterion_option
Correct display of available criteria
---
bob/measure/script/common_options.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bob/measure/script/common_options.py b/bob/measure/script/common_options.py
index 43c9847..e3549f9 100644
--- a/bob/measure/script/common_options.py
+++ b/bob/measure/script/common_options.py
@@ -310,9 +310,9 @@ def criterion_option(lcriteria=['eer', 'min-hter', 'far'], **kwargs):
List of possible criteria
"""
def custom_criterion_option(func):
+ list_accepted_crit = lcriteria if lcriteria is not None else \
+ ['eer', 'min-hter', 'far']
def callback(ctx, param, value):
- list_accepted_crit = lcriteria if lcriteria is not None else \
- ['eer', 'min-hter', 'far']
if value not in list_accepted_crit:
raise click.BadParameter('Incorrect value for `--criterion`. '
'Must be one of [`%s`]' %
@@ -322,7 +322,7 @@ def criterion_option(lcriteria=['eer', 'min-hter', 'far'], **kwargs):
return click.option(
'-c', '--criterion', default='eer',
help='Criterion to compute plots and '
- 'metrics: `eer`, `min-hter` or `far`',
+ 'metrics: %s)' % ', '.join(list_accepted_crit),
callback=callback, is_eager=True, **kwargs)(func)
return custom_criterion_option
--
GitLab