Exposed confidenceThreshold

Scott Klum
1 parent 9f01003d
Showing 3 changed files with 10 additions and 10 deletions
openbr/core/opencvutils.cpp
openbr/core/opencvutils.h
openbr/plugins/imgproc/slidingwindow.cpp
@@ -400,7 +400,7 @@ public:
 };
 // TODO: Make sure case where no confidences are inputted works.
-void OpenCVUtils::group(vector<Rect> &rects, vector<float> &confidences, float epsilon)
+void OpenCVUtils::group(vector<Rect> &rects, vector<float> &confidences, float confidenceThreshold, float epsilon)
 {
     if (rects.empty())
         return;
@@ -415,7 +415,7 @@ void OpenCVUtils::group(vector&lt;Rect&gt; &amp;rects, vector&lt;float&gt; &amp;confidences, float e
     // Total number of rects in each class
     vector<int> rweights(nClasses, 0);
-    vector<double> rejectWeights(nClasses, -std::numeric_limits<double>::max());
+    vector<float> rejectWeights(nClasses, -std::numeric_limits<float>::max());
     for (int i = 0; i < labels.size(); i++)
     {
@@ -452,8 +452,6 @@ void OpenCVUtils::group(vector&lt;Rect&gt; &amp;rects, vector&lt;float&gt; &amp;confidences, float e
     rects.clear();
     confidences.clear();
-    const double threshold = 2;
-
     // Aggregate by comparing average rectangles against other average rectangels
     for (int i = 0; i < nClasses; i++)
     {
@@ -462,17 +460,17 @@ void OpenCVUtils::group(vector&lt;Rect&gt; &amp;rects, vector&lt;float&gt; &amp;confidences, float e
         // Used to eliminate rectangles with few neighbors in the case of no weights
         // int n1 = levelWeights ? rejectLevels[i] : rweights[i];
-        double w1 = rejectWeights[i];
+        float w1 = rejectWeights[i];
         // Eliminate rectangle if it doesn't meet confidence criteria
-        if (w1 <= threshold)
+        if (w1 <= confidenceThreshold)
             continue;
         // filter out small face rectangles inside large rectangles
         int j;
         for (j = 0; j < nClasses; j++)
         {
-            double w2 = rejectWeights[j];
+            float w2 = rejectWeights[j];
             if (j == i)
                 continue;
@@ -493,7 +491,7 @@ void OpenCVUtils::group(vector&lt;Rect&gt; &amp;rects, vector&lt;float&gt; &amp;confidences, float e
                r1.y >= r2.y - dy &&
                r1.x + r1.width <= r2.x + r2.width + dx &&
                r1.y + r1.height <= r2.y + r2.height + dy &&
-               (w2 > std::max(threshold, w1)))
+               (w2 > std::max(confidenceThreshold, w1)))
                break;
         }
@@ -99,7 +99,7 @@ namespace OpenCVUtils
     float overlap(const QRectF &rect1, const QRectF &rect2);
     // Misc
-    void group(std::vector<cv::Rect> &rects, std::vector<float> &confidences, float epsilon);
+    void group(std::vector<cv::Rect> &rects, std::vector<float> &confidences, float confidenceThreshold, float epsilon);
     int getFourcc();
 }
@@ -40,6 +40,7 @@ class SlidingWindowTransform : public MetaTransform
     Q_PROPERTY(int maxSize READ get_maxSize WRITE set_maxSize RESET reset_maxSize STORED false)
     Q_PROPERTY(float scaleFactor READ get_scaleFactor WRITE set_scaleFactor RESET reset_scaleFactor STORED false)
     Q_PROPERTY(int minNeighbors READ get_minNeighbors WRITE set_minNeighbors RESET reset_minNeighbors STORED false)
+    Q_PROPERTY(float confidenceThreshold READ get_confidenceThreshold WRITE set_confidenceThreshold RESET reset_confidenceThreshold STORED false)
     Q_PROPERTY(float eps READ get_eps WRITE set_eps RESET reset_eps STORED false)
     Q_PROPERTY(QString model READ get_model WRITE set_model RESET reset_model STORED false)
@@ -49,6 +50,7 @@ class SlidingWindowTransform : public MetaTransform
     BR_PROPERTY(int, maxSize, -1)
     BR_PROPERTY(float, scaleFactor, 1.2)
     BR_PROPERTY(int, minNeighbors, 5)
+    BR_PROPERTY(float, confidenceThreshold, 2)
     BR_PROPERTY(float, eps, 0.2)
     BR_PROPERTY(QString, model, "")
@@ -132,7 +134,7 @@ class SlidingWindowTransform : public MetaTransform
                     }
                 }
-                OpenCVUtils::group(rects, confidences, eps);
+                OpenCVUtils::group(rects, confidences, confidenceThreshold, eps);
                 if (!enrollAll && rects.empty())
                     rects.push_back(Rect(0, 0, m.cols, m.rows));