Commit 97897b2f authored by Manuel Günther's avatar Manuel Günther
Browse files

Merge branch 'master' into DIR

Conflicts:
	bob/measure/test_error.py
parents 60cd1d4c cf70b274
......@@ -339,16 +339,16 @@ def test_open_set_recognition_rate():
assert abs(bob.measure.recognition_rate(cmc_scores, threshold=t) - 1.0) < 1e-8
# One error
cmc_scores = bob.measure.load.cmc_four_column(F("scores-cmc-4col-open-set.txt"))
normal_scores = bob.measure.load.split_four_column(F("scores-cmc-4col-open-set.txt"))
cmc_scores = bob.measure.load.cmc_four_column(F("scores-cmc-4col-open-set-one-error.txt"))
normal_scores = bob.measure.load.split_four_column(F("scores-cmc-4col-open-set-one-error.txt"))
assert abs(bob.measure.recognition_rate(cmc_scores) - 0.857142857143) < 1e-8
assert abs(bob.measure.recognition_rate(cmc_scores, threshold=0.5) - 0.857142857143) < 1e-8
t = bob.measure.far_threshold(normal_scores[0], normal_scores[1],far_value)
assert abs(bob.measure.recognition_rate(cmc_scores, threshold=t) - 0.857142857143) < 1e-8
# Two errors
cmc_scores = bob.measure.load.cmc_four_column(F("scores-cmc-4col-open-set.txt"))
normal_scores = bob.measure.load.split_four_column(F("scores-cmc-4col-open-set.txt"))
cmc_scores = bob.measure.load.cmc_four_column(F("scores-cmc-4col-open-set-two-errors.txt"))
normal_scores = bob.measure.load.split_four_column(F("scores-cmc-4col-open-set-two-errors.txt"))
assert abs(bob.measure.recognition_rate(cmc_scores) - 0.857142857143) < 1e-8
assert abs(bob.measure.recognition_rate(cmc_scores, threshold=0.5) - 0.857142857143) < 1e-8
t = bob.measure.far_threshold(normal_scores[0], normal_scores[1],far_value)
......
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