From 7cb55536122d2d5ccb64b9100917b9e4922cb78d Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Wed, 18 Apr 2018 11:08:32 +0200
Subject: [PATCH] remove extra things
---
bob/measure/script/commands.py | 9 ++-------
bob/measure/script/common_options.py | 5 ++---
bob/measure/script/figure.py | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/bob/measure/script/commands.py b/bob/measure/script/commands.py
index 9820a75..2eddbed 100644
--- a/bob/measure/script/commands.py
+++ b/bob/measure/script/commands.py
@@ -57,7 +57,6 @@ def metrics(ctx, scores, evaluation, **kwargs):
@common_options.const_layout_option()
@common_options.figsize_option()
@common_options.style_option()
-@common_options.const_layout_option()
@verbosity_option()
@click.pass_context
def roc(ctx, scores, evaluation, **kwargs):
@@ -96,7 +95,6 @@ def roc(ctx, scores, evaluation, **kwargs):
@common_options.const_layout_option()
@common_options.figsize_option()
@common_options.style_option()
-@common_options.const_layout_option()
@verbosity_option()
@click.pass_context
def det(ctx, scores, evaluation, **kwargs):
@@ -130,7 +128,6 @@ def det(ctx, scores, evaluation, **kwargs):
@common_options.y_label_option()
@common_options.figsize_option()
@common_options.style_option()
-@common_options.const_layout_option()
@verbosity_option()
@click.pass_context
def epc(ctx, scores, **kwargs):
@@ -164,7 +161,6 @@ def epc(ctx, scores, **kwargs):
@common_options.titles_option()
@common_options.figsize_option()
@common_options.style_option()
-@common_options.const_layout_option()
@verbosity_option()
@click.pass_context
def hist(ctx, scores, evaluation, **kwargs):
@@ -175,9 +171,9 @@ def hist(ctx, scores, evaluation, **kwargs):
You can also provide evaluation files along with dev files. If only dev scores
are provided, you must use flag `--no-evaluation`.
- By default, when eval-scores are given, only eval-scores histograms are
+ By default, when eval-scores are given, only eval-scores histograms are
displayed with threshold line
- computed from dev-scores. If you want to display dev-scores distributions
+ computed from dev-scores. If you want to display dev-scores distributions
as well, use ``--show-dev`` option.
Examples:
@@ -206,7 +202,6 @@ def hist(ctx, scores, evaluation, **kwargs):
@common_options.const_layout_option()
@common_options.figsize_option()
@common_options.style_option()
-@common_options.const_layout_option()
@verbosity_option()
@click.pass_context
def evaluate(ctx, scores, evaluation, **kwargs):
diff --git a/bob/measure/script/common_options.py b/bob/measure/script/common_options.py
index 43a58c9..434d610 100644
--- a/bob/measure/script/common_options.py
+++ b/bob/measure/script/common_options.py
@@ -1,6 +1,5 @@
'''Stores click common options for plots'''
-import pkg_resources # to make sure bob gets imported properly
import logging
import click
from click.types import INT, FLOAT
@@ -293,8 +292,8 @@ def figsize_option(**kwargs):
plt.figure(figsize=ctx.meta['figsize'])
return value
return click.option(
- '--figsize', help='If given, will run \
- ``plt.figure(figsize=figsize)(f)``. Example: --fig-size 4,6',
+ '--figsize', help='If given, will run '
+ '``plt.figure(figsize=figsize)``. Example: --fig-size 4,6',
callback=callback, **kwargs)(func)
return custom_figsize_option
diff --git a/bob/measure/script/figure.py b/bob/measure/script/figure.py
index 5b6c3b8..5d52bd2 100644
--- a/bob/measure/script/figure.py
+++ b/bob/measure/script/figure.py
@@ -488,7 +488,7 @@ class Det(PlotBase):
''' Handles the plotting of DET '''
def __init__(self, ctx, scores, evaluation, func_load):
super(Det, self).__init__(ctx, scores, evaluation, func_load)
- self._title = self._title or 'DET'
+ self._title = self._title or 'DET'
self._x_label = self._x_label or 'False Positive Rate'
self._y_label = self._y_label or 'False Negative Rate'
#custom defaults here
--
GitLab