implemented check of demographic filters prior to matching templates

Josh Klontz
1 parent 6ddb9821
Showing 2 changed files with 17 additions and 1 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
@@ -1238,6 +1238,22 @@ void Distance::compare(const TemplateList &amp;target, const TemplateList &amp;query, Ou
     if (Globals->parallelism) Globals->trackFutures(futures);
 }
+float Distance::compare(const Template &target, const Template &query) const
+{
+    if (!Globals->demographicFilters.isEmpty()) {
+        // The if statement is a faster check then iterating over an empty list of filters
+        foreach (const QString &filter, Globals->demographicFilters) {
+            const QString targetMetadata = target.file.getString(filter, "");
+            const QString queryMetadata = query.file.getString(filter, "");
+            if (targetMetadata.isEmpty() || queryMetadata.isEmpty()) continue;
+            if (targetMetadata != queryMetadata) return -std::numeric_limits<float>::max();
+        }
+    }
+
+    return a * (_compare(target, query) - b);
+}
+
+/* Distance - private methods */
 void Distance::compareBlock(const TemplateList &target, const TemplateList &query, Output *output, int targetOffset, int queryOffset) const
 {
     for (int i=0; i<query.size(); i++)
@@ -1040,7 +1040,7 @@ public:
     static QSharedPointer<Distance> fromAlgorithm(const QString &algorithm); /*!< \brief Retrieve an algorithm's distance. */
     virtual void train(const TemplateList &src); /*!< \brief Train the distance. */
     virtual void compare(const TemplateList &target, const TemplateList &query, Output *output) const; /*!< \brief Compare two template lists. */
-    inline float compare(const Template &target, const Template &query) const { return a * (_compare(target, query) - b); } /*!< \brief Compute the normalized distance between two templates. */
+    float compare(const Template &target, const Template &query) const; /*!< \brief Compute the normalized distance between two templates. */
 private:
     virtual void compareBlock(const TemplateList &target, const TemplateList &query, Output *output, int targetOffset, int queryOffset) const;