Peter M. Groen / openbr

Commit 00e96a4185692ac7bd68ee03e9f5ce11c8a376ee

Authored by Josh Klontz
1 parent 59535d58

switched to report at .1% instead of 1%

Inline Side-by-side
Showing 4 changed files with 6 additions and 7 deletions
openbr/core/plot.cpp
  View file @00e96a4
@@ -245,9 +245,8 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) @@ -245,9 +245,8 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv)
245 } 245 }
246 246
247 // Write FAR/TAR Bar Chart (BC) 247 // Write FAR/TAR Bar Chart (BC)
248 - lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(getTAR(operatingPoints, 0.001), 'f', 3))));  
249 - lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(result = getTAR(operatingPoints, 0.01), 'f', 3))));  
250 - 248 + lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(result = getTAR(operatingPoints, 0.001), 'f', 3))));
  249 + lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(getTAR(operatingPoints, 0.01), 'f', 3))));
251 250
252 // Write SD & KDE 251 // Write SD & KDE
253 points = qMin(qMin(Max_Points, genuines.size()), impostors.size()); 252 points = qMin(qMin(Max_Points, genuines.size()), impostors.size());
@@ -286,7 +285,7 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) @@ -286,7 +285,7 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv)
286 } 285 }
287 286
288 if (!csv.isEmpty()) QtUtils::writeFile(csv, lines); 287 if (!csv.isEmpty()) QtUtils::writeFile(csv, lines);
289 - qDebug("TAR @ FAR = 0.01: %.3f\nRetrieval Rate @ Rank = %d: %.3f", result, Report_Retrieval, reportRetrievalRate); 288 + qDebug("TAR @ FAR = 0.001: %.3f\nRetrieval Rate @ Rank = %d: %.3f", result, Report_Retrieval, reportRetrievalRate);
290 return result; 289 return result;
291 } 290 }
292 291
openbr/core/plot.h
  View file @00e96a4
@@ -26,7 +26,7 @@ namespace br @@ -26,7 +26,7 @@ namespace br
26 { 26 {
27 27
28 void Confusion(const QString &file, float score, int &true_positives, int &false_positives, int &true_negatives, int &false_negatives); 28 void Confusion(const QString &file, float score, int &true_positives, int &false_positives, int &true_negatives, int &false_negatives);
29 -float Evaluate(const QString &simmat, const QString &mask = "", const QString &csv = ""); // Returns TAR @ FAR = 0.01 29 +float Evaluate(const QString &simmat, const QString &mask = "", const QString &csv = ""); // Returns TAR @ FAR = 0.001
30 float Evaluate(const cv::Mat &scores, const FileList &target, const FileList &query, const QString &csv = "", int parition = 0); 30 float Evaluate(const cv::Mat &scores, const FileList &target, const FileList &query, const QString &csv = "", int parition = 0);
31 float Evaluate(const cv::Mat &scores, const cv::Mat &masks, const QString &csv = ""); 31 float Evaluate(const cv::Mat &scores, const cv::Mat &masks, const QString &csv = "");
32 bool Plot(const QStringList &files, const br::File &destination, bool show = false); 32 bool Plot(const QStringList &files, const br::File &destination, bool show = false);
openbr/openbr.h
  View file @00e96a4
@@ -153,7 +153,7 @@ BR_EXPORT void br_enroll_n(int num_inputs, const char *inputs[], const char *gal @@ -153,7 +153,7 @@ BR_EXPORT void br_enroll_n(int num_inputs, const char *inputs[], const char *gal
153 * \param simmat The \ref simmat to use. 153 * \param simmat The \ref simmat to use.
154 * \param mask The \ref mask to use. 154 * \param mask The \ref mask to use.
155 * \param csv Optional \c .csv file to contain performance metrics. 155 * \param csv Optional \c .csv file to contain performance metrics.
156 - * \return True accept rate at a false accept rate of one in one hundred. 156 + * \return True accept rate at a false accept rate of one in one thousand.
157 * \see br_plot 157 * \see br_plot
158 */ 158 */
159 BR_EXPORT float br_eval(const char *simmat, const char *mask, const char *csv = ""); 159 BR_EXPORT float br_eval(const char *simmat, const char *mask, const char *csv = "");
openbr/plugins/output.cpp
  View file @00e96a4
@@ -345,7 +345,7 @@ class evalOutput : public MatrixOutput @@ -345,7 +345,7 @@ class evalOutput : public MatrixOutput
345 345
346 double mean, stddev; 346 double mean, stddev;
347 Common::MeanStdDev(TARs, &mean, &stddev); 347 Common::MeanStdDev(TARs, &mean, &stddev);
348 - qDebug("TAR @ FAR = 0.01: %.3f +/- %.3f", mean, stddev); 348 + qDebug("TAR @ FAR = 0.001: %.3f +/- %.3f", mean, stddev);
349 } 349 }
350 } 350 }
351 } 351 }