implemented PipeDistance

Josh Klontz
1 parent 82a0ed2f
Showing 6 changed files with 96 additions and 50 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/algorithms.cpp
sdk/plugins/distance.cpp
sdk/plugins/quality.cpp
sdk/plugins/validate.cpp
@@ -522,6 +522,9 @@ QString Object::argument(int index) const
         } else if (type == "QList<br::Transform*>") {
             foreach (Transform *transform, variant.value< QList<Transform*> >())
                 strings.append(transform->description());
+        } else if (type == "QList<br::Distance*>") {
+            foreach (Distance *distance, variant.value< QList<Distance*> >())
+                strings.append(distance->description());
         } else {
             qFatal("Unrecognized type: %s", qPrintable(type));
         }
@@ -556,6 +559,9 @@ void Object::store(QDataStream &amp;stream) const
         if (type == "QList<br::Transform*>") {
             foreach (Transform *transform, property.read(this).value< QList<Transform*> >())
                 transform->store(stream);
+        } else if (type == "QList<br::Distance*>") {
+            foreach (Distance *distance, property.read(this).value< QList<Distance*> >())
+                distance->store(stream);
         } else if (type == "br::Transform*") {
             property.read(this).value<Transform*>()->store(stream);
         } else if (type == "br::Distance*") {
@@ -590,6 +596,9 @@ void Object::load(QDataStream &amp;stream)
         if (type == "QList<br::Transform*>") {
             foreach (Transform *transform, property.read(this).value< QList<Transform*> >())
                 transform->load(stream);
+        } else if (type == "QList<br::Distance*>") {
+            foreach (Distance *distance, property.read(this).value< QList<Distance*> >())
+                distance->load(stream);
         } else if (type == "br::Transform*") {
             property.read(this).value<Transform*>()->load(stream);
         } else if (type == "br::Distance*") {
@@ -653,6 +662,11 @@ void Object::setProperty(const QString &amp;name, const QString &amp;value)
             foreach (const QString &string, strings)
                 values.append(Transform::make(string, this));
             variant.setValue(values);
+        } else if (type == "QList<br::Distance*>") {
+            QList<Distance*> values;
+            foreach (const QString &string, strings)
+                values.append(Distance::make(string, this));
+            variant.setValue(values);
         } else {
             qFatal("Unrecognized type: %s", qPrintable(type));
         }
@@ -828,6 +842,7 @@ void br::Context::initializeQt(QString sdkPath)
     qRegisterMetaType< br::Transform* >();
     qRegisterMetaType< QList<br::Transform*> >();
     qRegisterMetaType< br::Distance* >();
+    qRegisterMetaType< QList<br::Distance*> >();
     qRegisterMetaType< cv::Mat >();
     qInstallMsgHandler(messageHandler);
@@ -1311,15 +1326,21 @@ void Transform::backProject(const TemplateList &amp;dst, TemplateList &amp;src) const
 /* Distance - public methods */
 Distance *Distance::make(QString str, QObject *parent)
 {
-        // Check for custom transforms
-        if (Globals->abbreviations.contains(str))
-            return make(Globals->abbreviations[str], parent);
+    // Check for custom transforms
+    if (Globals->abbreviations.contains(str))
+        return make(Globals->abbreviations[str], parent);
+
+    { // Check for use of '+' as shorthand for Pipe(...)
+        QStringList words = parse(str, '+');
+        if (words.size() > 1)
+            return make("Pipe([" + words.join(",") + "])", parent);
+    }
-        File f = "." + str;
-        Distance *distance = Factory<Distance>::make(f);
+    File f = "." + str;
+    Distance *distance = Factory<Distance>::make(f);
-        distance->setParent(parent);
-        return distance;
+    distance->setParent(parent);
+    return distance;
 }
 void Distance::compare(const TemplateList &target, const TemplateList &query, Output *output) const
@@ -1136,6 +1136,7 @@ Q_DECLARE_METATYPE(QList&lt;int&gt;)
 Q_DECLARE_METATYPE(br::Transform*)
 Q_DECLARE_METATYPE(QList<br::Transform*>)
 Q_DECLARE_METATYPE(br::Distance*)
+Q_DECLARE_METATYPE(QList<br::Distance*>)
 Q_DECLARE_METATYPE(cv::Mat)
 #endif // __OPENBR_PLUGIN_H
@@ -32,7 +32,7 @@ class AlgorithmsInitializer : public Initializer
     {
         // Face
         Globals->abbreviations.insert("FaceRecognition", "FaceDetection!<FaceRecognitionRegistration>!<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>:UCharL1");
-        Globals->abbreviations.insert("FaceRecognitionNoTraining", "FaceDetection!ASEFEyes+Affine(86,86,0.25,0.35)!Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+Mask+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59)+Cat:Dist(ChiSquared)");
+        Globals->abbreviations.insert("FaceRecognitionNoTraining", "FaceDetection!ASEFEyes+Affine(86,86,0.25,0.35)!Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+Mask+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59)+Cat:ChiSquared");
         Globals->abbreviations.insert("GenderClassification", "FaceDetection!<FaceClassificationRegistration>!<FaceClassificationExtraction>+<GenderClassifier>+Discard");
         Globals->abbreviations.insert("AgeRegression", "FaceDetection!<FaceClassificationRegistration>!<FaceClassificationExtraction>+<AgeRegressor>+Discard");
         Globals->abbreviations.insert("FaceQuality", "Open!Cascade(FrontalFace)+ASEFEyes+Affine(64,64,0.25,0.35)+ImageQuality+Cvt(Gray)+DFFS+Discard");
@@ -45,7 +45,7 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("SURF", "Open+KeyPointDetector(SURF)+KeyPointDescriptor(SURF):KeyPointMatcher(BruteForce)");
         Globals->abbreviations.insert("SmallSIFT", "Open+LimitSize(512)+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
         Globals->abbreviations.insert("SmallSURF", "Open+LimitSize(512)+KeyPointDetector(SURF)+KeyPointDescriptor(SURF):KeyPointMatcher(BruteForce)");
-        Globals->abbreviations.insert("ColorHist", "Open+LimitSize(512)!EnsureChannels(3)+SplitChannels+Hist(256,0,8)+Cat+Normalize(L1):Dist(L2)");
+        Globals->abbreviations.insert("ColorHist", "Open+LimitSize(512)!EnsureChannels(3)+SplitChannels+Hist(256,0,8)+Cat+Normalize(L1):L2");
         // Hash
         Globals->abbreviations.insert("FileName", "Name+Identity:Identical");
@@ -14,6 +14,7 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+#include <QtConcurrentRun>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <openbr_plugin.h>
@@ -101,7 +102,6 @@ private:
             for (int col=0; col<a.cols; col++) {
                 const float target = a.at<float>(row,col);
                 const float query = b.at<float>(row,col);
-
                 dot += target * query;
                 magA += target * target;
                 magB += query * query;
@@ -139,6 +139,44 @@ BR_REGISTER(Distance, DefaultDistance)
 /*!
  * \ingroup distances
+ * \brief Distances in series.
+ * \author Josh Klontz \cite jklontz
+ *
+ * The templates are compared using each br::Distance in order.
+ * If the result of the comparison with any given distance is -std::numeric_limits<float>::max() then this result is returned early.
+ * Otherwise the returned result is the value of comparing the templates using the last br::Distance.
+ */
+class PipeDistance : public Distance
+{
+    Q_OBJECT
+    Q_PROPERTY(QList<br::Distance*> distances READ get_distances WRITE set_distances RESET reset_distances)
+    BR_PROPERTY(QList<br::Distance*>, distances, QList<br::Distance*>())
+
+    void train(const TemplateList &data)
+    {
+        QList< QFuture<void> > futures;
+        foreach (br::Distance *distance, distances)
+            if (Globals->parallelism) futures.append(QtConcurrent::run(distance, &Distance::train, data));
+            else                      distance->train(data);
+        Globals->trackFutures(futures);
+    }
+
+    float compare(const Template &a, const Template &b) const
+    {
+        float result = -std::numeric_limits<float>::max();
+        foreach (br::Distance *distance, distances) {
+            result = distance->compare(a, b);
+            if (result == -std::numeric_limits<float>::max())
+                return result;
+        }
+        return result;
+    }
+};
+
+BR_REGISTER(Distance, PipeDistance)
+
+/*!
+ * \ingroup distances
  * \brief Fast 8-bit L1 distance
  * \author Josh Klontz \cite jklontz
  */
@@ -260,37 +260,6 @@ class UnitDistance : public Distance
 BR_REGISTER(Distance, UnitDistance)
-/*!
- * \ingroup distances
- * \brief Check target metadata before matching templates.
- * \author Josh Klontz \cite jklontz
- */
-class MetadataDistance : public Distance
-{
-    Q_OBJECT
-    Q_PROPERTY(br::Distance *distance READ get_distance WRITE set_distance RESET reset_distance)
-    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
-
-    void train(const TemplateList &src)
-    {
-        distance->train(src);
-    }
-
-    float compare(const Template &a, const Template &b) const
-    {
-        foreach (const QString &filter, Globals->demographicFilters.keys()) {
-            const QString metadata = a.file.getString(filter, "");
-            if (metadata.isEmpty()) continue;
-            const QRegExp re(Globals->demographicFilters[filter]);
-            if (re.indexIn(metadata) == -1)
-                return -std::numeric_limits<float>::max();
-        }
-        return distance->compare(a, b);
-    }
-};
-
-BR_REGISTER(Distance, MetadataDistance)
-
 } // namespace br
 #include "quality.moc"
@@ -79,25 +79,42 @@ BR_REGISTER(Transform, CrossValidateTransform)
 class CrossValidateDistance : public Distance
 {
     Q_OBJECT
-    Q_PROPERTY(br::Distance *distance READ get_distance WRITE set_distance RESET reset_distance)
-    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
-
-    void train(const TemplateList &src)
-    {
-        distance->train(src);
-    }
     float compare(const Template &a, const Template &b) const
     {
         const int partitionA = a.file.getInt("Cross_Validation_Partition", 0);
         const int partitionB = b.file.getInt("Cross_Validation_Partition", 0);
-        if (partitionA != partitionB) return -std::numeric_limits<float>::max();
-        return distance->compare(a, b);
+        return (partitionA != partitionB) ? -std::numeric_limits<float>::max() : 0;
     }
 };
 BR_REGISTER(Distance, CrossValidateDistance)
+/*!
+ * \ingroup distances
+ * \brief Checks target metadata.
+ * \author Josh Klontz \cite jklontz
+ */
+class MetadataDistance : public Distance
+{
+    Q_OBJECT
+
+    float compare(const Template &a, const Template &b) const
+    {
+        (void) b;
+        foreach (const QString &filter, Globals->demographicFilters.keys()) {
+            const QString metadata = a.file.getString(filter, "");
+            if (metadata.isEmpty()) continue;
+            const QRegExp re(Globals->demographicFilters[filter]);
+            if (re.indexIn(metadata) == -1)
+                return -std::numeric_limits<float>::max();
+        }
+        return 0;
+    }
+};
+
+BR_REGISTER(Distance, MetadataDistance)
+
 } // namespace br
 #include "validate.moc"