Commit 974972fe authored by Theophile GENTILHOMME's avatar Theophile GENTILHOMME

Correct label order and add HTER help

parent 4b9c47f3
Pipeline #21434 failed with stage
in 84 minutes and 41 seconds
...@@ -13,8 +13,9 @@ CRITERIA = ('eer', 'min-hter', 'far') ...@@ -13,8 +13,9 @@ CRITERIA = ('eer', 'min-hter', 'far')
@common_options.metrics_command( @common_options.metrics_command(
common_options.METRICS_HELP.format( common_options.METRICS_HELP.format(
names='FtA, FAR, FRR, FMR, FMNR, HTER', names='FAP, FNR, precision, recall, F1-score',
criteria=CRITERIA, score_format=SCORE_FORMAT, criteria=CRITERIA, score_format=SCORE_FORMAT,
hter_note=' ',
command='bob measure metrics'), command='bob measure metrics'),
criteria=CRITERIA) criteria=CRITERIA)
def metrics(ctx, scores, evaluation, **kwargs): def metrics(ctx, scores, evaluation, **kwargs):
......
...@@ -611,6 +611,7 @@ def metrics_command(docstring, criteria=('eer', 'min-hter', 'far')): ...@@ -611,6 +611,7 @@ def metrics_command(docstring, criteria=('eer', 'min-hter', 'far')):
METRICS_HELP = """Prints a table that contains {names} for a given METRICS_HELP = """Prints a table that contains {names} for a given
threshold criterion ({criteria}). threshold criterion ({criteria}).
{hter_note}
You need to provide one or more development score file(s) for each You need to provide one or more development score file(s) for each
experiment. You can also provide evaluation files along with dev files. If experiment. You can also provide evaluation files along with dev files. If
...@@ -627,6 +628,7 @@ METRICS_HELP = """Prints a table that contains {names} for a given ...@@ -627,6 +628,7 @@ METRICS_HELP = """Prints a table that contains {names} for a given
$ {command} -e -l results.txt sys1/scores-{{dev,eval}} $ {command} -e -l results.txt sys1/scores-{{dev,eval}}
$ {command} -e {{sys1,sys2}}/scores-{{dev,eval}} $ {command} -e {{sys1,sys2}}/scores-{{dev,eval}}
""" """
......
...@@ -172,7 +172,7 @@ class Metrics(MeasureBase): ...@@ -172,7 +172,7 @@ class Metrics(MeasureBase):
def __init__(self, ctx, scores, evaluation, func_load, def __init__(self, ctx, scores, evaluation, func_load,
names=('False Positive Rate', 'False Negative Rate', names=('False Positive Rate', 'False Negative Rate',
'F1-score', 'Precision', 'Recall')): 'Precision', 'Recall', 'F1-score')):
super(Metrics, self).__init__(ctx, scores, evaluation, func_load) super(Metrics, self).__init__(ctx, scores, evaluation, func_load)
self.names = names self.names = names
self._tablefmt = ctx.meta.get('tablefmt') self._tablefmt = ctx.meta.get('tablefmt')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment