diff --git a/bob/measure/script/commands.py b/bob/measure/script/commands.py index 427976f201c5d622a6dea9c9f6573a06b427b97c..3d6c322c323f21c0e94a9a68c378c59163dacc88 100644 --- a/bob/measure/script/commands.py +++ b/bob/measure/script/commands.py @@ -12,7 +12,7 @@ from bob.extension.scripts.click_helper import (verbosity_option, @common_options.scores_argument(nargs=-1) @common_options.eval_option() @common_options.table_option() -@common_options.output_plot_metric_option() +@common_options.output_log_metric_option() @common_options.criterion_option() @common_options.thresholds_option() @common_options.far_option() @@ -193,7 +193,7 @@ def hist(ctx, scores, evaluation, **kwargs): @common_options.sep_dev_eval_option() @common_options.table_option() @common_options.eval_option() -@common_options.output_plot_metric_option() +@common_options.output_log_metric_option() @common_options.output_plot_file_option(default_out='eval_plots.pdf') @common_options.points_curve_option() @common_options.n_bins_option() diff --git a/bob/measure/script/common_options.py b/bob/measure/script/common_options.py index 8f941d3f7ec771272bdf67cc5d115e193820c65d..a4c6e0143326efda221955459385afdcd20a9775 100644 --- a/bob/measure/script/common_options.py +++ b/bob/measure/script/common_options.py @@ -241,12 +241,10 @@ def output_plot_file_option(default_out='plots.pdf', **kwargs): callback=callback, **kwargs)(func) return custom_output_plot_file_option -def output_plot_metric_option(**kwargs): +def output_log_metric_option(**kwargs): '''Get options for output file for metrics''' - def custom_output_plot_file_option(func): + def custom_output_log_file_option(func): def callback(ctx, param, value): - ''' Save ouput file and associated pdf in context list, - print the path of the file in the log''' if value is not None: LOGGER.debug("Metrics will be output in %s", value) ctx.meta['log'] = value @@ -256,7 +254,7 @@ def output_plot_metric_option(**kwargs): help='If provided, computed numbers are written to ' 'this file instead of the standard output.', callback=callback, **kwargs)(func) - return custom_output_plot_file_option + return custom_output_log_file_option def criterion_option(lcriteria=['eer', 'hter', 'far'], **kwargs): """Get option flag to tell which criteriom is used (default:eer) diff --git a/bob/measure/script/figure.py b/bob/measure/script/figure.py index 3533917d3d1a2fe361b9925db2b9d6ae6eea75cf..eb44e159b2f4896563c3ad2fc12519370d5c39b1 100644 --- a/bob/measure/script/figure.py +++ b/bob/measure/script/figure.py @@ -38,7 +38,7 @@ class MeasureBase(object): Function that is used to load the input files """ __metaclass__ = ABCMeta #for python 2.7 compatibility - def __init__(self, ctx, scores, eval, func_load): + def __init__(self, ctx, scores, evaluation, func_load): """ Parameters ---------- @@ -63,7 +63,7 @@ class MeasureBase(object): if self._titles is not None and len(self._titles) != self.n_sytem: raise click.BadParameter("Number of titles must be equal to the " "number of systems") - self._eval = eval + self._eval = evaluation def run(self): """ Generate outputs (e.g. metrics, files, pdf plots).