From 5cf9904e92e488cee53b76fb53cf2ca539b50225 Mon Sep 17 00:00:00 2001
From: Keyur Patel <keyur@rankone.io>
Date: Mon, 24 Oct 2016 14:55:10 -0600
Subject: [PATCH] Refactored evalLiveness to evalEER

---
 openbr/core/eval.cpp | 14 +++++++-------
 openbr/core/eval.h   |  2 +-
 openbr/openbr.cpp    |  4 ++--
 openbr/openbr.h      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openbr/core/eval.cpp b/openbr/core/eval.cpp
index f26d3ec..c2ffb52 100755
--- a/openbr/core/eval.cpp
+++ b/openbr/core/eval.cpp
@@ -1168,12 +1168,12 @@ void EvalKNN(const QString &knnGraph, const QString &knnTruth, const QString &cs
     qDebug("FNIR @ FPIR = 0.01:  %.3f", 1-getOperatingPointGivenFAR(operatingPoints, 0.01).TAR);
 }
 
-void EvalLiveness(const QString &predictedXML, QString gt_property, QString distribution_property){
+void EvalEER(const QString &predictedXML, QString gt_property, QString distribution_property){
     if (gt_property.isEmpty())
             gt_property = "LivenessGT";
     if (distribution_property.isEmpty())
             distribution_property = "LivenessDistribution";
-    int genuineTemplateCount = 0;
+    int classOneTemplateCount = 0;
     const TemplateList templateList(TemplateList::fromGallery(predictedXML));
 
     QHash<QString, int> gtLabels;
@@ -1182,7 +1182,7 @@ void EvalLiveness(const QString &predictedXML, QString gt_property, QString dist
          QString templateKey = templateList[i].file.path() + templateList[i].file.baseName();
          int gtLabel = templateList[i].file.get<int>(gt_property);
          if (gtLabel == 1)
-             genuineTemplateCount++;
+             classOneTemplateCount++;
          QList<float> templateScores = templateList[i].file.getList<float>(distribution_property);
          gtLabels[templateKey] = gtLabel;
          scores[templateKey] = templateScores;
@@ -1213,8 +1213,8 @@ void EvalLiveness(const QString &predictedXML, QString gt_property, QString dist
                 else if (scores[key][0] < thresNorm && gtLabel == 0)
                     FA +=1;
             }
-            float FAR = FA / float(numTemplates - genuineTemplateCount);
-            float FRR = FR / float(genuineTemplateCount);
+            float FAR = FA / float(numTemplates - classOneTemplateCount);
+            float FRR = FR / float(classOneTemplateCount);
 
             float diff = std::abs(FAR-FRR);
             if (diff < minDiff){
@@ -1225,8 +1225,8 @@ void EvalLiveness(const QString &predictedXML, QString gt_property, QString dist
          thres += stepSize;
      }
 
-     qDebug() <<"Genuine Templates:" << genuineTemplateCount  << "Spoof Templates:"
-             << numTemplates - genuineTemplateCount << "Total Templates:" << numTemplates;
+     qDebug() <<"Class 0 Templates:" << classOneTemplateCount  << "Class 1 Templates:"
+             << numTemplates - classOneTemplateCount << "Total Templates:" << numTemplates;
      qDebug("EER: %.3f @ Threshold %.3f", EER*100, EERThres);
 
 }
diff --git a/openbr/core/eval.h b/openbr/core/eval.h
index a4f117a..9ecf0aa 100644
--- a/openbr/core/eval.h
+++ b/openbr/core/eval.h
@@ -34,7 +34,7 @@ namespace br
     float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv = "", int normalizationIndexA = 0, int normalizationIndexB = 1, int sampleIndex = 0, int totalExamples = 5); // Return average error
     void EvalRegression(const QString &predictedGallery, const QString &truthGallery, QString predictedProperty = "", QString truthProperty = "");
     void EvalKNN(const QString &knnGraph, const QString &knnTruth, const QString &csv = "");
-    void EvalLiveness(const QString &predictedXML, const QString gt_property = "", const QString distribution_property = "");
+    void EvalEER(const QString &predictedXML, const QString gt_property = "", const QString distribution_property = "");
     struct Candidate
     {
         size_t index;
diff --git a/openbr/openbr.cpp b/openbr/openbr.cpp
index 7a5dfdc..9236c60 100644
--- a/openbr/openbr.cpp
+++ b/openbr/openbr.cpp
@@ -150,9 +150,9 @@ void br_eval_knn(const char *knnGraph, const char *knnTruth, const char *csv)
     EvalKNN(knnGraph, knnTruth, csv);
 }
 
-void br_eval_Liveness(const char *predicted_xml, const char *gt_property, const char *distribution_property )
+void br_eval_eer(const char *predicted_xml, const char *gt_property, const char *distribution_property )
 {
-    EvalLiveness(predicted_xml, gt_property, distribution_property);
+    EvalEER(predicted_xml, gt_property, distribution_property);
 }
 
 void br_finalize()
diff --git a/openbr/openbr.h b/openbr/openbr.h
index a002703..5b147ad 100644
--- a/openbr/openbr.h
+++ b/openbr/openbr.h
@@ -66,7 +66,7 @@ BR_EXPORT void br_eval_regression(const char *predicted_gallery, const char *tru
 
 BR_EXPORT void br_eval_knn(const char *knnGraph, const char *knnTruth, const char *csv = "");
 
-BR_EXPORT void br_eval_Liveness(const char *predicted_xml, const char *gt_property = "", const char *distribution_property = "");
+BR_EXPORT void br_eval_eer(const char *predicted_xml, const char *gt_property = "", const char *distribution_property = "");
 
 BR_EXPORT void br_finalize();
 
--
libgit2 0.21.4