Added flag for normalizing predicted bounding boxes based on average distances f…

…rom ground truth bounding boxes.

Added flag for normalizing predicted bounding boxes based on average distances f…
…rom ground truth bounding boxes.
Ben Klein
1 parent d5677d9b
Showing 5 changed files with 75 additions and 20 deletions
app/br/br.cpp
openbr/core/eval.cpp
openbr/core/eval.h
openbr/openbr.cpp
openbr/openbr.h
@@ -144,8 +144,8 @@ public:
                 check((parc >= 2) && (parc <= 3), "Incorrect parameter count for 'evalClustering'.");
                 br_eval_clustering(parv[0], parv[1], parc == 3 ? parv[2] : "");
             } 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] : "");
+                check((parc >= 2) && (parc <= 4), "Incorrect parameter count for 'evalDetection'.");
+                br_eval_detection(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc == 4 ? atoi(parv[3]) : 0);
             } else if (!strcmp(fun, "evalLandmarking")) {
                 check((parc >= 2) && (parc <= 5), "Incorrect parameter count for 'evalLandmarking'.");
                 br_eval_landmarking(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? atoi(parv[3]) : 0, parc >= 5 ? atoi(parv[4]) : 1);
@@ -752,18 +752,13 @@ static QMap&lt;QString, Detections&gt; getDetections(const File &amp;predictedGallery, con
     return allDetections;
 }
-float EvalDetection(const QString &predictedGallery, const QString &truthGallery, const QString &csv)
+static int associateGroundTruthDetections(QList<ResolvedDetection> &resolved, QList<ResolvedDetection> &falseNegative, QMap<QString, Detections> &all, QRectF &offsets)
 {
-    qDebug("Evaluating detection of %s against %s", qPrintable(predictedGallery), qPrintable(truthGallery));
+    float dLeftTotal = 0.0, dRightTotal = 0.0, dTopTotal = 0.0, dBottomTotal = 0.0;
+    int count = 0, totalTrueDetections = 0;
-    // Organized by file, QMap used to preserve order
-    QMap<QString, Detections> allDetections = getDetections(predictedGallery, truthGallery);
-
-    QList<ResolvedDetection> resolvedDetections, falseNegativeDetections;
-    int totalTrueDetections = 0;
-    foreach (Detections detections, allDetections.values()) { // For every file
+    foreach (Detections detections, all.values()) {
         totalTrueDetections += detections.truth.size();
-
         // Try to associate ground truth detections with predicted detections
         while (!detections.truth.isEmpty() && !detections.predicted.isEmpty()) {
             const Detection truth = detections.truth.takeFirst(); // Take removes the detection
@@ -771,7 +766,16 @@ float EvalDetection(const QString &amp;predictedGallery, const QString &amp;truthGallery
             float bestOverlap = -std::numeric_limits<float>::max();
             // Find the nearest predicted detection to this ground truth detection
             for (int i=0; i<detections.predicted.size(); i++) {
-                const float overlap = truth.overlap(detections.predicted[i]);
+                Detection predicted = detections.predicted[i];
+                float predictedWidth = predicted.boundingBox.width();
+                float x, y, width, height;
+                x = predicted.boundingBox.x() + offsets.x()*predictedWidth;
+                y = predicted.boundingBox.y() + offsets.y()*predictedWidth;
+                width = predicted.boundingBox.width() - offsets.width()*predictedWidth;
+                height = predicted.boundingBox.height() - offsets.height()*predictedWidth;
+                Detection newPredicted(QRectF(x, y, width, height), 0.0);
+
+                const float overlap = truth.overlap(newPredicted);
                 if (overlap > bestOverlap) {
                     bestOverlap = overlap;
                     bestIndex = i;
@@ -781,17 +785,67 @@ float EvalDetection(const QString &amp;predictedGallery, const QString &amp;truthGallery
             // We don't want to associate two ground truth detections with the
             // same prediction, over vice versa.
             const Detection predicted = detections.predicted.takeAt(bestIndex);
-            resolvedDetections.append(ResolvedDetection(predicted.confidence, bestOverlap));
+            resolved.append(ResolvedDetection(predicted.confidence, bestOverlap));
+
+            if (offsets.x() == 0) {
+                // Add side differences to total only for pairs that meet the overlap threshold.
+                if (bestOverlap > 0.3) {
+                    count++;
+                    float width = predicted.boundingBox.width();
+                    dLeftTotal += (truth.boundingBox.left() - predicted.boundingBox.left()) / width;
+                    dRightTotal += (truth.boundingBox.right() - predicted.boundingBox.right()) / width;
+                    dTopTotal += (truth.boundingBox.top() - predicted.boundingBox.top()) / width;
+                    dBottomTotal += (truth.boundingBox.bottom() - predicted.boundingBox.bottom()) / width;
+                }
+            }
         }
         foreach (const Detection &detection, detections.predicted)
-            resolvedDetections.append(ResolvedDetection(detection.confidence, 0));
+            resolved.append(ResolvedDetection(detection.confidence, 0));
         for (int i=0; i<detections.truth.size(); i++)
-            falseNegativeDetections.append(ResolvedDetection(-std::numeric_limits<float>::max(), 0));
+            falseNegative.append(ResolvedDetection(-std::numeric_limits<float>::max(), 0));
     }
+    if (offsets.x() == 0) {
+        // Calculate average differences in each direction
+        float dRight = dRightTotal / count;
+        float dBottom = dBottomTotal / count;
+        float dX = dLeftTotal / count;
+        float dY = dTopTotal / count;
+        float dWidth = dX - dRight;
+        float dHeight = dY - dBottom;
+
+        offsets.setX(dX);
+        offsets.setY(dY);
+        offsets.setWidth(dWidth);
+        offsets.setHeight(dHeight);
+    }
+    return totalTrueDetections;
+}
-    std::sort(resolvedDetections.begin(), resolvedDetections.end());
+float EvalDetection(const QString &predictedGallery, const QString &truthGallery, const QString &csv, bool normalize)
+{
+    qDebug("Evaluating detection of %s against %s", qPrintable(predictedGallery), qPrintable(truthGallery));
+    // Organized by file, QMap used to preserve order
+    QMap<QString, Detections> allDetections = getDetections(predictedGallery, truthGallery);
+    QList<ResolvedDetection> resolvedDetections, falseNegativeDetections;
+    QRectF normalizations(0, 0, 0, 0);
+    
+    // Associate predictions to ground truth
+    int totalTrueDetections = associateGroundTruthDetections(resolvedDetections, falseNegativeDetections, allDetections, normalizations);
+
+    // Redo association of ground truth to predictions with boundingBoxes
+    // resized based on the average differences on each side.
+    if (normalize) {
+        qDebug("dX = %.3f", normalizations.x());
+        qDebug("dY = %.3f", normalizations.y());
+        qDebug("dWidth = %.3f", normalizations.width());
+        qDebug("dHeight = %.3f", normalizations.height());
+        resolvedDetections.clear();
+        falseNegativeDetections.clear();
+        totalTrueDetections = associateGroundTruthDetections(resolvedDetections, falseNegativeDetections, allDetections, normalizations);
+    }
+    std::sort(resolvedDetections.begin(), resolvedDetections.end());
     QStringList lines;
     lines.append("Plot, X, Y");
     lines.append(computeDetectionResults(resolvedDetections, totalTrueDetections, true));
@@ -29,7 +29,7 @@ namespace br
     float InplaceEval(const QString & simmat, const QString & target, const QString & query, const QString & csv = "");
     void EvalClassification(const QString &predictedGallery, const QString &truthGallery, QString predictedProperty = "", QString truthProperty = "");
-    float EvalDetection(const QString &predictedGallery, const QString &truthGallery, const QString &csv = ""); // Return average overlap
+    float EvalDetection(const QString &predictedGallery, const QString &truthGallery, const QString &csv = "", bool normalize = false); // Return average overlap
     float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv = "", int normalizationIndexA = 0, int normalizationIndexB = 1); // Return average error
     void EvalRegression(const QString &predictedGallery, const QString &truthGallery, QString predictedProperty = "", QString truthProperty = "");
 }
@@ -124,9 +124,9 @@ void br_eval_clustering(const char *csv, const char *gallery, const char * truth
     EvalClustering(csv, gallery, truth_property);
 }
-float br_eval_detection(const char *predicted_gallery, const char *truth_gallery, const char *csv)
+float br_eval_detection(const char *predicted_gallery, const char *truth_gallery, const char *csv, bool normalize)
 {
-    return EvalDetection(predicted_gallery, truth_gallery, csv);
+    return EvalDetection(predicted_gallery, truth_gallery, csv, normalize);
 }
 float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv, int normalization_index_a, int normalization_index_b)
@@ -193,9 +193,10 @@ BR_EXPORT void br_eval_clustering(const char *csv, const char *gallery, const ch
  * \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.
+ * \param normalize Optional \c bool flag to normalize predicted bounding boxes for improved detection. 
  * \return Average detection bounding box overlap.
  */
-BR_EXPORT float br_eval_detection(const char *predicted_gallery, const char *truth_gallery, const char *csv = "");
+BR_EXPORT float br_eval_detection(const char *predicted_gallery, const char *truth_gallery, const char *csv = "", bool normalize = false);
 /*!
  * \brief Evaluates and prints landmarking accuracy to terminal.