diff --git a/openbr/core/plot.cpp b/openbr/core/plot.cpp index 51e5439..192be39 100644 --- a/openbr/core/plot.cpp +++ b/openbr/core/plot.cpp @@ -245,9 +245,8 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) } // Write FAR/TAR Bar Chart (BC) - lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(getTAR(operatingPoints, 0.001), 'f', 3)))); - lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(result = getTAR(operatingPoints, 0.01), 'f', 3)))); - + lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(result = getTAR(operatingPoints, 0.001), 'f', 3)))); + lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(getTAR(operatingPoints, 0.01), 'f', 3)))); // Write SD & KDE points = qMin(qMin(Max_Points, genuines.size()), impostors.size()); @@ -286,7 +285,7 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) } if (!csv.isEmpty()) QtUtils::writeFile(csv, lines); - qDebug("TAR @ FAR = 0.01: %.3f\nRetrieval Rate @ Rank = %d: %.3f", result, Report_Retrieval, reportRetrievalRate); + qDebug("TAR @ FAR = 0.001: %.3f\nRetrieval Rate @ Rank = %d: %.3f", result, Report_Retrieval, reportRetrievalRate); return result; } diff --git a/openbr/core/plot.h b/openbr/core/plot.h index d23ea33..d672706 100644 --- a/openbr/core/plot.h +++ b/openbr/core/plot.h @@ -26,7 +26,7 @@ namespace br { void Confusion(const QString &file, float score, int &true_positives, int &false_positives, int &true_negatives, int &false_negatives); -float Evaluate(const QString &simmat, const QString &mask = "", const QString &csv = ""); // Returns TAR @ FAR = 0.01 +float Evaluate(const QString &simmat, const QString &mask = "", const QString &csv = ""); // Returns TAR @ FAR = 0.001 float Evaluate(const cv::Mat &scores, const FileList &target, const FileList &query, const QString &csv = "", int parition = 0); float Evaluate(const cv::Mat &scores, const cv::Mat &masks, const QString &csv = ""); bool Plot(const QStringList &files, const br::File &destination, bool show = false); diff --git a/openbr/openbr.h b/openbr/openbr.h index 6470d12..0ba39bd 100644 --- a/openbr/openbr.h +++ b/openbr/openbr.h @@ -153,7 +153,7 @@ BR_EXPORT void br_enroll_n(int num_inputs, const char *inputs[], const char *gal * \param simmat The \ref simmat to use. * \param mask The \ref mask to use. * \param csv Optional \c .csv file to contain performance metrics. - * \return True accept rate at a false accept rate of one in one hundred. + * \return True accept rate at a false accept rate of one in one thousand. * \see br_plot */ BR_EXPORT float br_eval(const char *simmat, const char *mask, const char *csv = ""); diff --git a/openbr/plugins/output.cpp b/openbr/plugins/output.cpp index 7f873e3..c294c0d 100644 --- a/openbr/plugins/output.cpp +++ b/openbr/plugins/output.cpp @@ -345,7 +345,7 @@ class evalOutput : public MatrixOutput double mean, stddev; Common::MeanStdDev(TARs, &mean, &stddev); - qDebug("TAR @ FAR = 0.01: %.3f +/- %.3f", mean, stddev); + qDebug("TAR @ FAR = 0.001: %.3f +/- %.3f", mean, stddev); } } }