Merge branch 'master' of https://github.com/biometrics/openbr

Austin Van Blanton
2 parents 56eb91c5 f74323fc
Showing 5 changed files with 25 additions and 0 deletions
app/br/br.cpp
openbr/core/eval.cpp
openbr/core/eval.h
openbr/openbr.cpp
openbr/openbr.h
@@ -137,6 +137,9 @@ public:
             } else if (!strcmp(fun, "evalDetection")) {
                 check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'evalDetection'.");
                 br_eval_detection(parv[0], parv[1], parc == 3 ? parv[2] : "");
+            } else if (!strcmp(fun, "evalLandmarking")) {
+                check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'evalLandmarking'.");
+                br_eval_detection(parv[0], parv[1], parc == 3 ? parv[2] : "");
             } else if (!strcmp(fun, "evalRegression")) {
                 check(parc >= 2 && parc <= 4, "Incorrect parameter count for 'evalRegression'.");
                 br_eval_regression(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? parv[3] : "");
@@ -218,6 +221,7 @@ private:
                "-evalClassification <predicted_gallery> <truth_gallery> <predicted property name> <ground truth proprty name>\n"
                "-evalClustering <clusters> <gallery>\n"
                "-evalDetection <predicted_gallery> <truth_gallery> [{csv}]\n"
+               "-evalLandmarking <predicted_gallery> <truth_gallery> [{csv}]\n"
                "-evalRegression <predicted_gallery> <truth_gallery> <predicted property name> <ground truth property name>\n"
                "-plotDetection <file> ... <file> {destination}\n"
                "-plotMetadata <file> ... <file> <columns>\n"
@@ -476,6 +476,13 @@ float EvalDetection(const QString &amp;predictedInput, const QString &amp;truthInput, co
     return averageOverlap;
 }
+void EvalLandmarking(const QString &predictedInput, const QString &truthInput, const QString &csv)
+{
+    (void) predictedInput;
+    (void) truthInput;
+    (void) csv;
+}
+
 void EvalRegression(const QString &predictedInput, const QString &truthInput, QString predictedProperty, QString truthProperty)
 {
     qDebug("Evaluating regression of %s against %s", qPrintable(predictedInput), qPrintable(truthInput));
@@ -28,6 +28,7 @@ namespace br
     float Evaluate(const cv::Mat &scores, const cv::Mat &masks, const QString &csv = "");
     void EvalClassification(const QString &predictedInput, const QString &truthInput, QString predictedProperty="", QString truthProperty="");
     float EvalDetection(const QString &predictedInput, const QString &truthInput, const QString &csv = ""); // Return average overlap
+    void EvalLandmarking(const QString &predictedInput, const QString &truthInput, const QString &csv = "");
     void EvalRegression(const QString &predictedInput, const QString &truthInput, QString predictedProperty="", QString truthProperty="");
 }
@@ -87,6 +87,11 @@ float br_eval_detection(const char *predicted_gallery, const char *truth_gallery
     return EvalDetection(predicted_gallery, truth_gallery, csv);
 }
+void br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv)
+{
+    return EvalLandmarking(predicted_gallery, truth_gallery, csv);
+}
+
 void br_eval_regression(const char *predicted_gallery, const char *truth_gallery, const char * predicted_property, const char * truth_property)
 {
     EvalRegression(predicted_gallery, truth_gallery, predicted_property, truth_property);
@@ -169,6 +169,14 @@ BR_EXPORT void br_eval_clustering(const char *csv, const char *gallery);
 BR_EXPORT float br_eval_detection(const char *predicted_gallery, const char *truth_gallery, const char *csv = "");
 /*!
+ * \brief Evaluates and prints landmarking accuracy to terminal.
+ * \param predicted_gallery The predicted br::Gallery.
+ * \param truth_gallery The ground truth br::Gallery.
+ * \param csv Optional \c .csv file to contain performance metrics.
+ */
+BR_EXPORT void br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv = "");
+
+/*!
  * \brief Evaluates regression accuracy to disk.
  * \param predicted_gallery The predicted br::Gallery.
  * \param truth_gallery The ground truth br::Gallery.