Commit 823fea3a5b7ef442811327bf2159d32bf7c65d47

Authored by bhklein
1 parent ae00e90a

push FAR out to 1e-6

Showing 1 changed file with 5 additions and 5 deletions
openbr/core/eval.cpp
@@ -160,7 +160,7 @@ float Evaluate(const QString &simmat, const QString &mask, const File &csv, unsi @@ -160,7 +160,7 @@ float Evaluate(const QString &simmat, const QString &mask, const File &csv, unsi
160 QScopedPointer<Format> format(Factory<Format>::make(simmat)); 160 QScopedPointer<Format> format(Factory<Format>::make(simmat));
161 scores = format->read(); 161 scores = format->read();
162 } 162 }
163 - 163 +
164 // Read mask matrix 164 // Read mask matrix
165 Mat truth; 165 Mat truth;
166 if (mask.isEmpty()) { 166 if (mask.isEmpty()) {
@@ -225,7 +225,7 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const File &amp;csv, const QStrin @@ -225,7 +225,7 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const File &amp;csv, const QStrin
225 genuineSearches[comparison.query] = -1; 225 genuineSearches[comparison.query] = -1;
226 } 226 }
227 impostorCount++; 227 impostorCount++;
228 - } 228 + }
229 } 229 }
230 } 230 }
231 231
@@ -438,7 +438,7 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const File &amp;csv, const QStrin @@ -438,7 +438,7 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const File &amp;csv, const QStrin
438 438
439 QtUtils::writeFile(csv, lines); 439 QtUtils::writeFile(csv, lines);
440 if (maxSize > 0) qDebug("Template Size: %i bytes", (int)maxSize); 440 if (maxSize > 0) qDebug("Template Size: %i bytes", (int)maxSize);
441 - foreach (float FAR, QList<float>() << 0.01 << 0.001 << 0.0001 << 0.00001) { 441 + foreach (float FAR, QList<float>() << 1e-2 << 1e-3 << 1e-4 << 1e-5 << 1e-6) {
442 const OperatingPoint op = getOperatingPointGivenFAR(operatingPoints, FAR); 442 const OperatingPoint op = getOperatingPointGivenFAR(operatingPoints, FAR);
443 printf("TAR & Similarity @ FAR = %.0e: %.3f %.3f\n", FAR, op.TAR, op.score); 443 printf("TAR & Similarity @ FAR = %.0e: %.3f %.3f\n", FAR, op.TAR, op.score);
444 } 444 }
@@ -633,9 +633,9 @@ float InplaceEval(const QString &amp;simmat, const QString &amp;target, const QString &amp;q @@ -633,9 +633,9 @@ float InplaceEval(const QString &amp;simmat, const QString &amp;target, const QString &amp;q
633 qint64 impAccum = highImpostors; 633 qint64 impAccum = highImpostors;
634 634
635 QMapIterator<float, GenImpCounts> i(genScoresToCounts); 635 QMapIterator<float, GenImpCounts> i(genScoresToCounts);
636 - 636 +
637 i.toBack(); 637 i.toBack();
638 - 638 +
639 // iterating in reverse order of thresholds 639 // iterating in reverse order of thresholds
640 while (i.hasPrevious()) { 640 while (i.hasPrevious()) {
641 i.previous(); 641 i.previous();