Merge branch 'master' of https://github.com/biometrics/openbr into mosift

Austin Van Blanton
2 parents 87021a62 8b3c745f
Showing 9 changed files with 32 additions and 89 deletions
CHANGELOG.md
openbr/core/core.cpp
openbr/core/eval.cpp
openbr/core/qtutils.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/cascade.cpp
openbr/plugins/eigen3.cpp
openbr/plugins/meta.cpp
 0.4.0 - ??/??/??
 ================
 * Added -evalDetection and -plotDetection for evaluating and plotting object detection accuracy (#9)
+* Deprecated Transform::backProject
 0.3.0 - 5/22/13
 ===============
@@ -146,13 +146,7 @@ struct AlgorithmCore
                                 data.removeAt(i);
                     const int numFiles = data.size();
-                    if (Globals->backProject) {
-                        TemplateList backProjectedData;
-                        transform->backProject(data, backProjectedData);
-                        data = backProjectedData;
-                    } else {
-                        data >> *transform;
-                    }
+                    data >> *transform;
                     g->writeBlock(data);
                     const FileList newFiles = data.files();
@@ -373,6 +373,8 @@ static QStringList computeDetectionResults(const QList&lt;ResolvedDetection&gt; &amp;detec
     }
     const int keep = qMin(points.size(), Max_Points);
+    if (keep < 2) qFatal("Insufficient points.");
+
     QStringList lines; lines.reserve(keep);
     for (int i=0; i<keep; i++) {
         const DetectionOperatingPoint &point = points[double(i) / double(keep-1) * double(points.size()-1)];
@@ -382,6 +384,15 @@ static QStringList computeDetectionResults(const QList&lt;ResolvedDetection&gt; &amp;detec
     return lines;
 }
+QString getDetectKey(const TemplateList &templates)
+{
+    const File &f = templates.first().file;
+    foreach (const QString &key, f.localKeys())
+        if (!f.get<QRectF>(key, QRectF()).isNull())
+            return key;
+    return "";
+}
+
 float EvalDetection(const QString &predictedInput, const QString &truthInput, const QString &csv)
 {
     qDebug("Evaluating detection of %s against %s", qPrintable(predictedInput), qPrintable(truthInput));
@@ -389,20 +400,22 @@ float EvalDetection(const QString &amp;predictedInput, const QString &amp;truthInput, co
     const TemplateList truth(TemplateList::fromGallery(truthInput));
     // Figure out which metadata field contains a bounding box
-    QString detectKey;
-    foreach (const QString &key, truth.first().file.localKeys())
-        if (!truth.first().file.get<QRectF>(key, QRectF()).isNull()) {
-            detectKey = key;
-            break;
-        }
-    if (detectKey.isNull()) qFatal("No suitable metadata key found.");
-    else                    qDebug("Using metadata key: %s", qPrintable(detectKey));
+    QString truthDetectKey = getDetectKey(truth);
+    if (truthDetectKey.isEmpty()) qFatal("No suitable ground truth metadata key found.");
+    QString predictedDetectKey = truthDetectKey;
+    if (predicted.first().file.get<QRectF>(predictedDetectKey, QRectF()).isNull())
+        predictedDetectKey = getDetectKey(predicted);
+    if (predictedDetectKey.isEmpty()) qFatal("No suitable predicted metadata key found.");
+
+    qDebug("Using metadata key: %s%s",
+           qPrintable(predictedDetectKey),
+           qPrintable(predictedDetectKey == truthDetectKey ? QString() : "/"+truthDetectKey));
     QMap<QString, Detections> allDetections; // Organized by file, QMap used to preserve order
     foreach (const Template &t, predicted)
-        allDetections[t.file.baseName()].predicted.append(Detection(t.file.get<QRectF>(detectKey), t.file.get<float>("Confidence", -1)));
+        allDetections[t.file.baseName()].predicted.append(Detection(t.file.get<QRectF>(predictedDetectKey), t.file.get<float>("Confidence", -1)));
     foreach (const Template &t, truth)
-        allDetections[t.file.baseName()].truth.append(Detection(t.file.get<QRectF>(detectKey)));
+        allDetections[t.file.baseName()].truth.append(Detection(t.file.get<QRectF>(truthDetectKey)));
     QList<ResolvedDetection> resolvedDetections, falseNegativeDetections;
     foreach (Detections detections, allDetections.values()) {
@@ -334,8 +334,8 @@ QRectF QtUtils::toRect(const QString &amp;string, bool *ok)
             bool okX, okY, okWidth, okHeight;
             x = words[0].toFloat(&okX);
             y = words[1].toFloat(&okY);
-            width = words[0].toFloat(&okWidth);
-            height = words[1].toFloat(&okHeight);
+            width = words[2].toFloat(&okWidth);
+            height = words[3].toFloat(&okHeight);
             if (okX && okY && okWidth && okHeight) {
                 if (ok) *ok = true;
                 return QRectF(x, y, width, height);
@@ -1171,28 +1171,6 @@ void Transform::project(const TemplateList &amp;src, TemplateList &amp;dst) const
     futures.waitForFinished();
 }
-static void _backProject(const Transform *transform, const Template *dst, Template *src)
-{
-    try {
-        transform->backProject(*dst, *src);
-    } catch (...) {
-        qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->objectName()));
-        *src = Template(dst->file);
-        src->file.set("FTE", true);
-    }
-}
-
-void Transform::backProject(const TemplateList &dst, TemplateList &src) const
-{
-    src.reserve(dst.size());
-    for (int i=0; i<dst.size(); i++) src.append(Template());
-
-    QFutureSynchronizer<void> futures;
-    for (int i=0; i<dst.size(); i++)
-        futures.addFuture(QtConcurrent::run(_backProject, this, &dst[i], &src[i]));
-    futures.waitForFinished();
-}
-
 QList<Transform *> Transform::getChildren() const
 {
     QList<Transform *> output;
@@ -602,13 +602,6 @@ public:
     BR_PROPERTY(int, blockSize, parallelism * ((sizeof(void*) == 4) ? 128 : 1024))
     /*!
-     * \brief true if backProject should be used instead of project (the algorithm should be inverted)
-     */
-    Q_PROPERTY(bool backProject READ get_backProject WRITE set_backProject RESET reset_backProject)
-    BR_PROPERTY(bool, backProject, false)
-
-
-    /*!
      * \brief If \c true no messages will be sent to the terminal, \c false by default.
      */
     Q_PROPERTY(bool quiet READ get_quiet WRITE set_quiet RESET reset_quiet)
@@ -1034,6 +1027,10 @@ private:
  *  @{
  */
+/*!
+ * \brief For asynchronous events during template projection.
+ * \see #Transform::getEvent
+ */
 class TemplateEvent : public QObject
 {
     Q_OBJECT
@@ -1048,7 +1045,6 @@ signals:
     void theSignal(const Template & output) const;
 };
-
 /*!
  * \brief Plugin base class for processing a template.
  *
@@ -1078,8 +1074,6 @@ public:
     virtual void train(const TemplateList &data) = 0; /*!< \brief Train the transform. */
     virtual void project(const Template &src, Template &dst) const = 0; /*!< \brief Apply the transform. */
     virtual void project(const TemplateList &src, TemplateList &dst) const; /*!< \brief Apply the transform. */
-    virtual void backProject(const Template &dst, Template &src) const { src = dst; } /*!< \brief Invert the transform. */
-    virtual void backProject(const TemplateList &dst, TemplateList &src) const; /*!< \brief Invert the transform. */
     /*!< \brief Apply the transform, may update the transform's internal state */
     virtual void projectUpdate(const Template &src, Template &dst)
@@ -98,7 +98,7 @@ class CascadeTransform : public UntrainableMetaTransform
                 for (size_t j=0; j<rects.size(); j++) {
                     Template u(t.file, m);
                     if (rejectLevels.size() > j)
-                        u.file.set("Confidence", rejectLevels[j]*1000.0 + levelWeights[j]*1.0);
+                        u.file.set("Confidence", rejectLevels[j]*levelWeights[j]);
                     const QRectF rect = OpenCVUtils::fromRect(rects[j]);
                     u.file.appendRect(rect);
                     u.file.set(model, rect);
@@ -59,21 +59,6 @@ public:
     PCATransform() : keep(0.95), drop(0), whiten(false) {}
 private:
-    /*
-    void backProject(const Template &src, Template &dst) const
-    {
-        const cv::Mat &m = src;
-        dst = cv::Mat(originalRows, m.rows*m.cols/originalRows, CV_32FC1);
-
-        // Map Eigen into OpenCV
-        Eigen::Map<const Eigen::MatrixXf> inMap(m.ptr<float>(), keep, 1);
-        Eigen::Map<Eigen::MatrixXf> outMap(dst.m().ptr<float>(), m.rows*m.cols, 1);
-
-        // Do projection
-        outMap = (eVecs * inMap) + mean;
-    }
-    */
-
     double residualReconstructionError(const Template &src) const
     {
         Template proj;
@@ -129,26 +129,6 @@ class PipeTransform : public CompositeTransform
         }
     }
-    void backProject(const Template &dst, Template &src) const
-    {
-        // Backprojecting a time-varying transform is probably not going to work.
-        if (timeVarying()) qFatal("No backProject defined for time-varying transform");
-
-        src = dst;
-        // Reverse order in which transforms are processed
-        int length = transforms.length();
-        for (int i=length-1; i>=0; i--) {
-            Transform *f = transforms.at(i);
-            try {
-                src >> *f;
-            } catch (...) {
-                qWarning("Exception triggered when processing %s with transform %s", qPrintable(dst.file.flat()), qPrintable(f->objectName()));
-                src = Template(src.file);
-                src.file.set("FTE", true);
-            }
-        }
-    }
-
     void projectUpdate(const Template &src, Template &dst)
     {
         dst = src;
@@ -306,8 +286,6 @@ class ForkTransform : public CompositeTransform
         futures.waitForFinished();
     }
-    void backProject(const Template &dst, Template &src) const {Transform::backProject(dst, src);}
-
     // same as _project, but calls projectUpdate on sub-transforms
     void projectupdate(const Template & src, Template & dst)
     {