From 1deb6d67084f2a6b3f0a541576b4fbc72c5e57a4 Mon Sep 17 00:00:00 2001
From: Theophile GENTILHOMME <tgentilhomme@jurasix08.idiap.ch>
Date: Fri, 4 May 2018 09:11:19 +0200
Subject: [PATCH] Fix list option with previous changes
---
bob/bio/base/script/commands.py | 10 +++++-----
bob/bio/base/test/test_commands.py | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/bob/bio/base/script/commands.py b/bob/bio/base/script/commands.py
index 0e0508d6..e4d4ce6b 100644
--- a/bob/bio/base/script/commands.py
+++ b/bob/bio/base/script/commands.py
@@ -71,14 +71,14 @@ def metrics(ctx, scores, evaluation, **kargs):
@common_options.scores_argument(nargs=-1)
@common_options.title_option()
@common_options.legends_option()
-@common_options.legend_loc_option(dflt=4)
+@common_options.legend_loc_option(dflt='lower-right')
@common_options.no_legend_option()
@common_options.sep_dev_eval_option()
@common_options.output_plot_file_option(default_out='roc.pdf')
@common_options.eval_option()
@common_options.points_curve_option()
@common_options.semilogx_option(True)
-@common_options.axes_val_option(dflt=[1e-4, 1, 1e-4, 1])
+@common_options.axes_val_option(dflt='1e-4,1,1e-4,1')
@common_options.x_rotation_option()
@common_options.lines_at_option()
@common_options.x_label_option()
@@ -120,13 +120,13 @@ def roc(ctx, scores, evaluation, **kargs):
@common_options.title_option()
@common_options.output_plot_file_option(default_out='det.pdf')
@common_options.legends_option()
-@common_options.legend_loc_option(dflt=1)
+@common_options.legend_loc_option(dflt='upper-right')
@common_options.no_legend_option()
@common_options.x_label_option()
@common_options.y_label_option()
@common_options.sep_dev_eval_option()
@common_options.eval_option()
-@common_options.axes_val_option(dflt=[0.01, 95, 0.01, 95])
+@common_options.axes_val_option(dflt='0.01,95,0.01,95')
@common_options.x_rotation_option(dflt=45)
@common_options.points_curve_option()
@common_options.const_layout_option()
@@ -166,7 +166,7 @@ def det(ctx, scores, evaluation, **kargs):
@common_options.title_option()
@common_options.output_plot_file_option(default_out='epc.pdf')
@common_options.legends_option()
-@common_options.legend_loc_option(dflt=9)
+@common_options.legend_loc_option(dflt='upper-center')
@common_options.no_legend_option()
@common_options.points_curve_option()
@common_options.const_layout_option()
diff --git a/bob/bio/base/test/test_commands.py b/bob/bio/base/test/test_commands.py
index 8f61ac54..9d3dbb25 100644
--- a/bob/bio/base/test/test_commands.py
+++ b/bob/bio/base/test/test_commands.py
@@ -104,7 +104,8 @@ def test_roc():
'data/test-5col.txt')
with runner.isolated_filesystem():
result = runner.invoke(commands.roc, ['--split', '--output',
- 'test.pdf', '-S', '-lc', 9,
+ 'test.pdf', '-S', '-lc',
+ 'lower-left',
dev1, test1, dev2, test2])
if result.output:
click.echo(result.output)
--
GitLab