slight refactoring for beautification

Jordan Cheney
1 parent 50975d83
Showing 3 changed files with 12 additions and 10 deletions
app/br/br.cpp
openbr/core/eval.cpp
openbr/openbr.h
@@ -247,7 +247,7 @@ private:
                "-convert (Format|Gallery|Output) <input_file> {output_file}\n"
                "-evalClassification <predicted_gallery> <truth_gallery> <predicted property name> <ground truth proprty name>\n"
                "-evalClustering <clusters> <gallery>\n"
-               "-evalDetection <predicted_gallery> <truth_gallery> [{csv}]\n"
+               "-evalDetection <predicted_gallery> <truth_gallery> [{csv}] [{minSize}]\n"
                "-evalLandmarking <predicted_gallery> <truth_gallery> [{csv} [<normalization_index_a> <normalization_index_b>]]\n"
                "-evalRegression <predicted_gallery> <truth_gallery> <predicted property name> <ground truth property name>\n"
                "-plotDetection <file> ... <file> {destination}\n"
@@ -820,21 +820,23 @@ float EvalDetection(const QString &amp;predictedGallery, const QString &amp;truthGallery
     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);
-    
+
     // Remove any bounding boxes with a side smaller than minSize
     if (minSize > 0) {
+        qDebug("Removing boxes smaller than %d\n", minSize);
         foreach(QString key, allDetections.keys()) {
-            for (int i = 0; i < allDetections[key].predicted.length(); i++) {
-                QRectF box = allDetections[key].predicted[i].boundingBox;
+            Detections detections = allDetections[key];
+            for (int i = 0; i < detections.predicted.length(); i++) {
+                QRectF box = detections.predicted[i].boundingBox;
                 if (min(box.width(), box.height()) < minSize)
-                    allDetections[key].predicted.removeAt(i);
+                    detections.predicted.removeAt(i);
             }
-            for (int i = 0; i < allDetections[key].truth.length(); i++) {
-                QRectF box = allDetections[key].truth[i].boundingBox;
+            for (int i = 0; i < detections.truth.length(); i++) {
+                QRectF box = detections.truth[i].boundingBox;
                 if (min(box.width(), box.height()) < minSize)
-                    allDetections[key].truth.removeAt(i);
+                    detections.truth.removeAt(i);
             }
-        }         
+        }
     }
     QList<ResolvedDetection> resolvedDetections, falseNegativeDetections;
@@ -196,7 +196,7 @@ BR_EXPORT void br_eval_clustering(const char *csv, const char *gallery, const ch
  * \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 = "", bool normalize = false, int minSize);
+BR_EXPORT float br_eval_detection(const char *predicted_gallery, const char *truth_gallery, const char *csv = "", bool normalize = false, int minSize = 0);
 /*!
  * \brief Evaluates and prints landmarking accuracy to terminal.