Peter M. Groen / openbr

Commit f74323fc82c5e656ae8d54dffbe19884c3d747cd

Authored by Josh Klontz
1 parent 96753025

added eval landmarking shell code

Inline Side-by-side
Showing 5 changed files with 25 additions and 0 deletions
app/br/br.cpp
  View file @f74323f
... ... @@ -137,6 +137,9 @@ public:
137 137 } else if (!strcmp(fun, "evalDetection")) {
138 138 check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'evalDetection'.");
139 139 br_eval_detection(parv[0], parv[1], parc == 3 ? parv[2] : "");
  140 + } else if (!strcmp(fun, "evalLandmarking")) {
  141 + check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'evalLandmarking'.");
  142 + br_eval_detection(parv[0], parv[1], parc == 3 ? parv[2] : "");
140 143 } else if (!strcmp(fun, "evalRegression")) {
141 144 check(parc >= 2 && parc <= 4, "Incorrect parameter count for 'evalRegression'.");
142 145 br_eval_regression(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? parv[3] : "");
... ... @@ -218,6 +221,7 @@ private:
218 221 "-evalClassification <predicted_gallery> <truth_gallery> <predicted property name> <ground truth proprty name>\n"
219 222 "-evalClustering <clusters> <gallery>\n"
220 223 "-evalDetection <predicted_gallery> <truth_gallery> [{csv}]\n"
  224 + "-evalLandmarking <predicted_gallery> <truth_gallery> [{csv}]\n"
221 225 "-evalRegression <predicted_gallery> <truth_gallery> <predicted property name> <ground truth property name>\n"
222 226 "-plotDetection <file> ... <file> {destination}\n"
223 227 "-plotMetadata <file> ... <file> <columns>\n"
... ...
openbr/core/eval.cpp
  View file @f74323f
... ... @@ -476,6 +476,13 @@ float EvalDetection(const QString &amp;predictedInput, const QString &amp;truthInput, co
476 476 return averageOverlap;
477 477 }
478 478  
  479 +void EvalLandmarking(const QString &predictedInput, const QString &truthInput, const QString &csv)
  480 +{
  481 + (void) predictedInput;
  482 + (void) truthInput;
  483 + (void) csv;
  484 +}
  485 +
479 486 void EvalRegression(const QString &predictedInput, const QString &truthInput, QString predictedProperty, QString truthProperty)
480 487 {
481 488 qDebug("Evaluating regression of %s against %s", qPrintable(predictedInput), qPrintable(truthInput));
... ...
openbr/core/eval.h
  View file @f74323f
... ... @@ -28,6 +28,7 @@ namespace br
28 28 float Evaluate(const cv::Mat &scores, const cv::Mat &masks, const QString &csv = "");
29 29 void EvalClassification(const QString &predictedInput, const QString &truthInput, QString predictedProperty="", QString truthProperty="");
30 30 float EvalDetection(const QString &predictedInput, const QString &truthInput, const QString &csv = ""); // Return average overlap
  31 + void EvalLandmarking(const QString &predictedInput, const QString &truthInput, const QString &csv = "");
31 32 void EvalRegression(const QString &predictedInput, const QString &truthInput, QString predictedProperty="", QString truthProperty="");
32 33 }
33 34  
... ...
openbr/openbr.cpp
  View file @f74323f
... ... @@ -87,6 +87,11 @@ float br_eval_detection(const char *predicted_gallery, const char *truth_gallery
87 87 return EvalDetection(predicted_gallery, truth_gallery, csv);
88 88 }
89 89  
  90 +void br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv)
  91 +{
  92 + return EvalLandmarking(predicted_gallery, truth_gallery, csv);
  93 +}
  94 +
90 95 void br_eval_regression(const char *predicted_gallery, const char *truth_gallery, const char * predicted_property, const char * truth_property)
91 96 {
92 97 EvalRegression(predicted_gallery, truth_gallery, predicted_property, truth_property);
... ...
openbr/openbr.h
  View file @f74323f
... ... @@ -169,6 +169,14 @@ BR_EXPORT void br_eval_clustering(const char *csv, const char *gallery);
169 169 BR_EXPORT float br_eval_detection(const char *predicted_gallery, const char *truth_gallery, const char *csv = "");
170 170  
171 171 /*!
  172 + * \brief Evaluates and prints landmarking accuracy to terminal.
  173 + * \param predicted_gallery The predicted br::Gallery.
  174 + * \param truth_gallery The ground truth br::Gallery.
  175 + * \param csv Optional \c .csv file to contain performance metrics.
  176 + */
  177 +BR_EXPORT void br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv = "");
  178 +
  179 +/*!
172 180 * \brief Evaluates regression accuracy to disk.
173 181 * \param predicted_gallery The predicted br::Gallery.
174 182 * \param truth_gallery The ground truth br::Gallery.
... ...