diff --git a/bob/bio/base/script/evaluate.py b/bob/bio/base/script/evaluate.py index b4c4da659b9ceb0e2eea71624ac2154f027075d1..fe5ac8c2157d64088c98e307bb96e5002758c76e 100644 --- a/bob/bio/base/script/evaluate.py +++ b/bob/bio/base/script/evaluate.py @@ -58,7 +58,6 @@ def command_line_arguments(command_line_parameters): parser.add_argument('-E', '--epc', help = "If given, EPC curves will be plotted into the given pdf file. For this plot --eval-files is mandatory.") parser.add_argument('-M', '--min-far-value', type=float, default=1e-4, help = "Select the minimum FAR value used in ROC plots; should be a power of 10.") parser.add_argument('-L', '--far-line-at', type=float, help = "If given, draw a veritcal line at this FAR value in the ROC plots.") - parser.add_argument('--parser', default = '4column', choices = ('4column', '5column'), help="The style of the resulting score files. The default fits to the usual output of score files.") # add verbose option bob.core.log.add_command_line_option(parser) @@ -244,17 +243,16 @@ def main(command_line_parameters=None): '#bcbd22', '#17becf'] if args.criterion or args.roc or args.det or args.epc or args.cllr or args.mindcf: - score_parser = {'4column' : bob.measure.load.split_four_column, '5column' : bob.measure.load.split_five_column}[args.parser] # First, read the score files logger.info("Loading %d score files of the development set", len(args.dev_files)) - scores_dev = [score_parser(os.path.join(args.directory, f)) for f in args.dev_files] + scores_dev = [bob.measure.load.split(os.path.join(args.directory, f)) for f in args.dev_files] # remove nans scores_dev = [get_fta(s) for s in scores_dev] if args.eval_files: logger.info("Loading %d score files of the evaluation set", len(args.eval_files)) - scores_eval = [score_parser(os.path.join(args.directory, f)) for f in args.eval_files] + scores_eval = [bob.measure.load.split(os.path.join(args.directory, f)) for f in args.eval_files] # remove nans scores_eval = [get_fta(s) for s in scores_eval] @@ -379,10 +377,9 @@ def main(command_line_parameters=None): if args.cmc or args.rr: logger.info("Loading CMC data on the development " + ("and on the evaluation set" if args.eval_files else "set")) - cmc_parser = {'4column' : bob.measure.load.cmc_four_column, '5column' : bob.measure.load.cmc_five_column}[args.parser] - cmcs_dev = [cmc_parser(os.path.join(args.directory, f)) for f in args.dev_files] + cmcs_dev = [bob.measure.load.cmc(os.path.join(args.directory, f)) for f in args.dev_files] if args.eval_files: - cmcs_eval = [cmc_parser(os.path.join(args.directory, f)) for f in args.eval_files] + cmcs_eval = [bob.measure.load.cmc(os.path.join(args.directory, f)) for f in args.eval_files] if args.cmc: logger.info("Plotting CMC curves to file '%s'", args.cmc)