From ea35dd2ea182f610e43c5b73b413ae34ca82369f Mon Sep 17 00:00:00 2001 From: Theophile GENTILHOMME Date: Fri, 29 Jun 2018 09:44:51 +0200 Subject: [PATCH] Help parameter customization --- bob/measure/script/common_options.py | 16 ++++++++-------- bob/measure/script/gen.py | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bob/measure/script/common_options.py b/bob/measure/script/common_options.py index 0603e11..572ce4b 100644 --- a/bob/measure/script/common_options.py +++ b/bob/measure/script/common_options.py @@ -11,7 +11,7 @@ from bob.extension.scripts.click_helper import ( bool_option, list_float_option, verbosity_option, open_file_mode_option) LOGGER = logging.getLogger(__name__) - +CONTEXT_SETTINGS = dict(help_option_names=['-?', '-h', '--help']) def scores_argument(min_arg=1, force_eval=False, **kwargs): """Get the argument for scores, and add `dev-scores` and `eval-scores` in @@ -589,7 +589,7 @@ def metrics_command(docstring, criteria=('eer', 'min-hter', 'far')): def custom_metrics_command(func): func.__doc__ = docstring - @click.command() + @click.command(context_settings=CONTEXT_SETTINGS) @scores_argument(nargs=-1) @eval_option() @table_option() @@ -636,7 +636,7 @@ def roc_command(docstring): def custom_roc_command(func): func.__doc__ = docstring - @click.command() + @click.command(context_settings=CONTEXT_SETTINGS) @scores_argument(nargs=-1) @titles_option() @legends_option() @@ -691,7 +691,7 @@ def det_command(docstring): def custom_det_command(func): func.__doc__ = docstring - @click.command() + @click.command(context_settings=CONTEXT_SETTINGS) @scores_argument(nargs=-1) @output_plot_file_option(default_out='det.pdf') @titles_option() @@ -744,7 +744,7 @@ def epc_command(docstring): def custom_epc_command(func): func.__doc__ = docstring - @click.command() + @click.command(context_settings=CONTEXT_SETTINGS) @scores_argument(min_arg=1, force_eval=True, nargs=-1) @output_plot_file_option(default_out='epc.pdf') @titles_option() @@ -789,7 +789,7 @@ def hist_command(docstring): def custom_hist_command(func): func.__doc__ = docstring - @click.command() + @click.command(context_settings=CONTEXT_SETTINGS) @scores_argument(nargs=-1) @output_plot_file_option(default_out='hist.pdf') @eval_option() @@ -845,7 +845,7 @@ def evaluate_command(docstring, criteria=('eer', 'min-hter', 'far')): def custom_evaluate_command(func): func.__doc__ = docstring - @click.command() + @click.command(context_settings=CONTEXT_SETTINGS) @scores_argument(nargs=-1) @legends_option() @sep_dev_eval_option() @@ -959,7 +959,7 @@ def multi_metrics_command(docstring, criteria=('eer', 'min-hter', 'far')): def custom_metrics_command(func): func.__doc__ = docstring - @click.command('multi-metrics') + @click.command('multi-metrics', context_settings=CONTEXT_SETTINGS) @scores_argument(nargs=-1) @eval_option() @n_protocols_option() diff --git a/bob/measure/script/gen.py b/bob/measure/script/gen.py index f5289c3..26adffd 100644 --- a/bob/measure/script/gen.py +++ b/bob/measure/script/gen.py @@ -8,6 +8,7 @@ from click.types import FLOAT from bob.extension.scripts.click_helper import verbosity_option from bob.core import random from bob.io.base import create_directories_safe +from . import common_options logger = logging.getLogger(__name__) @@ -73,7 +74,7 @@ def write_scores_to_file(neg, pos, filename): f.write(text) -@click.command() +@click.command(context_settings=common_options.CONTEXT_SETTINGS) @click.argument('outdir') @click.option('--mean-neg', default=-1, type=FLOAT, show_default=True) @click.option('--mean-pos', default=1, type=FLOAT, show_default=True) -- 2.21.0