From bafb5b7c0830b7a40f8deb23a88d562025be595e Mon Sep 17 00:00:00 2001 From: Theophile GENTILHOMME Date: Wed, 25 Apr 2018 08:52:12 +0200 Subject: [PATCH] Change option key to --- bob/measure/script/commands.py | 2 +- bob/measure/script/common_options.py | 4 ++-- bob/measure/test_script.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bob/measure/script/commands.py b/bob/measure/script/commands.py index 61d650a..de756b6 100644 --- a/bob/measure/script/commands.py +++ b/bob/measure/script/commands.py @@ -182,7 +182,7 @@ def hist(ctx, scores, evaluation, **kwargs): $ bob measure hist dev-scores1 eval-scores1 dev-scores2 eval-scores2 - $ bob measure hist --criter hter --show-dev dev-scores1 eval-scores1 + $ bob measure hist --criterion hter --show-dev dev-scores1 eval-scores1 """ process = figure.Hist(ctx, scores, evaluation, load.split) process.run() diff --git a/bob/measure/script/common_options.py b/bob/measure/script/common_options.py index 19331f8..79c25df 100644 --- a/bob/measure/script/common_options.py +++ b/bob/measure/script/common_options.py @@ -250,13 +250,13 @@ def criterion_option(lcriteria=['eer', 'hter', 'far'], **kwargs): list_accepted_crit = lcriteria if lcriteria is not None else \ ['eer', 'hter', 'far'] if value not in list_accepted_crit: - raise click.BadParameter('Incorrect value for `--criter`. ' + raise click.BadParameter('Incorrect value for `--criterion`. ' 'Must be one of [`%s`]' % '`, `'.join(list_accepted_crit)) ctx.meta['criter'] = value return value return click.option( - '--criter', default='eer', help='Criterion to compute plots and ' + '--criterion', default='eer', help='Criterion to compute plots and ' 'metrics: `eer` (default), `hter`', callback=callback, is_eager=True ,**kwargs)(func) return custom_criterion_option diff --git a/bob/measure/test_script.py b/bob/measure/test_script.py index dd29f46..cacc45e 100644 --- a/bob/measure/test_script.py +++ b/bob/measure/test_script.py @@ -130,7 +130,7 @@ def test_hist(): assert result.exit_code == 0, (result.exit_code, result.output) with runner.isolated_filesystem(): - result = runner.invoke(commands.hist, ['--no-evaluation', '--criter', 'hter', + result = runner.invoke(commands.hist, ['--no-evaluation', '--criterion', 'hter', '--output', 'HISTO.pdf', '-b', 30, dev1, dev2]) if result.output: @@ -138,7 +138,7 @@ def test_hist(): assert result.exit_code == 0, (result.exit_code, result.output) with runner.isolated_filesystem(): - result = runner.invoke(commands.hist, ['--criter', 'eer','--output', + result = runner.invoke(commands.hist, ['--criterion', 'eer','--output', 'HISTO.pdf', '-b', 30, dev1, test1, dev2, test2]) if result.output: -- 2.21.0