new API for specifying demographic filters

Josh Klontz
1 parent 970b3bc9
Showing 2 changed files with 8 additions and 21 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
@@ -1315,22 +1315,13 @@ void Distance::compare(const TemplateList &amp;target, const TemplateList &amp;query, Ou
 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) {
+    if (!Globals->demographicFilters.isEmpty()) // If statement is faster than iterating over an empty list of filters
+        foreach (const QString &filter, Globals->demographicFilters.keys()) {
             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();
+            if (!targetMetadata.isEmpty() &&
+                (Globals->demographicFilters[filter].indexIn(targetMetadata) == -1))
+                return -std::numeric_limits<float>::max();
         }
-    }
-
-    if (Globals->ageDelta < std::numeric_limits<float>::max()) {
-        const float targetAge = target.file.getFloat("Age", -1);
-        const float queryAge = target.file.getFloat("Age", -1);
-        if ((targetAge != -1) && (queryAge != -1) && (abs(targetAge - queryAge) > Globals->ageDelta))
-            return -std::numeric_limits<float>::max();
-    }
     return a * (_compare(target, query) - b);
 }
@@ -498,14 +498,10 @@ public:
     /*!
      * \brief Keys to use when matching templates to automatically determine non-match based on template metadata.
      */
-    Q_PROPERTY(QStringList demographicFilters READ get_demographicFilters WRITE set_demographicFilters RESET reset_demographicFilters)
-    BR_PROPERTY(QStringList, demographicFilters, QStringList())
-    /*!
-     * \brief Allowable age difference when matching templates.
-     */
-    Q_PROPERTY(float ageDelta READ get_ageDelta WRITE set_ageDelta RESET reset_ageDelta)
-    BR_PROPERTY(float, ageDelta, std::numeric_limits<float>::max())
+    typedef QHash<QString,QRegExp> DemographicFilters;
+    Q_PROPERTY(DemographicFilters demographicFilters READ get_demographicFilters WRITE set_demographicFilters RESET reset_demographicFilters)
+    BR_PROPERTY(DemographicFilters, demographicFilters, DemographicFilters())
     /*!
      * \brief If \c true a template will be skipped over if its file name already exists in the gallery.