From 5bc4662904ccc1cbd8340ea020abf90cf37546ae Mon Sep 17 00:00:00 2001 From: Theophile GENTILHOMME <tgentilhomme@jurasix08.idiap.ch> Date: Wed, 25 Apr 2018 08:57:42 +0200 Subject: [PATCH] Change to --- bob/bio/base/script/commands.py | 2 +- bob/bio/base/test/test_commands.py | 16 ++++++++-------- doc/experiments.rst | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bob/bio/base/script/commands.py b/bob/bio/base/script/commands.py index 8dd82aca..99d58f62 100644 --- a/bob/bio/base/script/commands.py +++ b/bob/bio/base/script/commands.py @@ -302,7 +302,7 @@ def hist(ctx, scores, evaluation, **kwargs): $ bob bio hist dev-scores1 eval-scores1 dev-scores2 eval-scores2 - $ bob bio hist --criter --show-dev hter dev-scores1 eval-scores1 + $ bob bio hist --criterion --show-dev hter dev-scores1 eval-scores1 """ process = bio_figure.Hist(ctx, scores, evaluation, load.split) process.run() diff --git a/bob/bio/base/test/test_commands.py b/bob/bio/base/test/test_commands.py index a685417e..22f01ebe 100644 --- a/bob/bio/base/test/test_commands.py +++ b/bob/bio/base/test/test_commands.py @@ -45,7 +45,7 @@ def test_metrics(): with runner.isolated_filesystem(): result = runner.invoke( commands.metrics, ['-l', 'tmp', '-T', '0.1', - '--criter', 'mindcf', '--cost', 0.9, + '--criterion', 'mindcf', '--cost', 0.9, dev1, test2] ) assert result.exit_code == 0, (result.exit_code, result.output) @@ -53,34 +53,34 @@ def test_metrics(): with runner.isolated_filesystem(): result = runner.invoke( commands.metrics, ['--no-evaluation', '-l', 'tmp', - '--criter', 'mindcf', '--cost', 0.9, + '--criterion', 'mindcf', '--cost', 0.9, dev1] ) assert result.exit_code == 0, (result.exit_code, result.output) with runner.isolated_filesystem(): result = runner.invoke( - commands.metrics, ['--criter', 'cllr', dev1, test2] + commands.metrics, ['--criterion', 'cllr', dev1, test2] ) assert result.exit_code == 0, (result.exit_code, result.output) with runner.isolated_filesystem(): result = runner.invoke( - commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criter', 'cllr', + commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criterion', 'cllr', '--cost', 0.9, dev1] ) assert result.exit_code == 0, (result.exit_code, result.output) with runner.isolated_filesystem(): result = runner.invoke( - commands.metrics, ['--criter', 'rr', '-T', + commands.metrics, ['--criterion', 'rr', '-T', '0.1', dev1, test2] ) assert result.exit_code == 0, (result.exit_code, result.output) with runner.isolated_filesystem(): result = runner.invoke( - commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criter', 'rr', + commands.metrics, ['--no-evaluation', '-l', 'tmp', '--criterion', 'rr', dev1, dev2] ) assert result.exit_code == 0, (result.exit_code, result.output) @@ -189,7 +189,7 @@ def test_hist(): assert result.exit_code == 0, (result.exit_code, result.output) with runner.isolated_filesystem(): - result = runner.invoke(commands.hist, ['--criter', 'hter', '--output', + result = runner.invoke(commands.hist, ['--criterion', 'hter', '--output', 'HISTO.pdf', '-b', 30,'--no-evaluation', dev1, dev2]) if result.output: @@ -197,7 +197,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, '-ts', 'A,B', dev1, test1, dev2, test2]) diff --git a/doc/experiments.rst b/doc/experiments.rst index 2b3171a0..8a41322e 100644 --- a/doc/experiments.rst +++ b/doc/experiments.rst @@ -170,7 +170,7 @@ min.HTER) on a development set and apply it on an evaluation set, just do: .. code-block:: sh - $ bob bio metrics {dev,test}-4col.txt --titltes ExpA --criter hter + $ bob bio metrics {dev,test}-4col.txt --titltes ExpA --criterion hter [Min. criterion: HTER ] Threshold on Development set `ExpA`: -4.830500e-03 ====== ====================== ================= @@ -194,7 +194,7 @@ For example: .. code-block:: sh - bob bio metrics {dev,test}-4col.txt --titltes ExpA --criter cllr + bob bio metrics {dev,test}-4col.txt --titltes ExpA --criterion cllr ====== ====================== ================ Computing Cllr and minCllr... -- GitLab