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

Brendan Klare
2 parents 570e3750 6c9e2226
Showing 12 changed files with 175 additions and 45 deletions
openbr/core/bee.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/format.cpp
openbr/plugins/gallery.cpp
openbr/plugins/landmarks.cpp
openbr/plugins/output.cpp
openbr/plugins/pp5.cpp
openbr/plugins/stasm4.cpp
openbr/plugins/stream.cpp
openbr/plugins/validate.cpp
share/openbr/models
@@ -287,8 +287,8 @@ cv::Mat BEE::makeMask(const br::FileList &amp;targets, const br::FileList &amp;queries, 
             Mask_t val;
             if      (fileA == fileB)           val = DontCare;
-            else if (labelA == "-1")             val = DontCare;
-            else if (labelB == "-1")             val = DontCare;
+            else if (labelA == "-1")           val = DontCare;
+            else if (labelB == "-1")           val = DontCare;
             else if (partitionA != partition)  val = DontCare;
             else if (partitionB == -1)         val = NonMatch;
             else if (partitionB != partition)  val = DontCare;
@@ -386,36 +386,66 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
             newTemplates = newTemplates.reduced();
         const int crossValidate = gallery.get<int>("crossValidate");
-        if (crossValidate > 0) srand(0);
-
-        for (int i=newTemplates.size()-1; i>=0; i--) {
-            newTemplates[i].file.set("Index", i+templates.size());
-            newTemplates[i].file.set("Gallery", gallery.name);
-
-            if (crossValidate > 0) {
-                if (newTemplates[i].file.getBool("duplicatePartitions")) {
-                    // The duplicatePartitions flag is used to add target images
-                    // crossValidate times to the simmat/mask
-                    // when multiple training sets are being used
-
-                    // Set template to the first parition
-                    newTemplates[i].file.set("Partition", QVariant(0));
-
-                    // Insert templates for all the other partitions
-                    for (int j=crossValidate-1; j>=1; j--) {
-                        Template allPartitionTemplate = newTemplates[i];
-                        allPartitionTemplate.file.set("Partition", j);
-                        newTemplates.insert(i+1, allPartitionTemplate);
+
+        if (gallery.getBool("leaveOneOut")) {
+            QStringList labels;
+            for (int i=newTemplates.size()-1; i>=0; i--) {
+                newTemplates[i].file.set("Index", i+templates.size());
+                newTemplates[i].file.set("Gallery", gallery.name);
+
+                QString label = newTemplates.at(i).file.get<QString>("Label");
+                // Have we seen this subject before?
+                if (!labels.contains(label)) {
+                    labels.append(label);
+                    // Get indices belonging to this subject
+                    QList<int> labelIndices = newTemplates.find("Label",label);
+                    for (int j = 0; j < labelIndices.size(); j++) {
+                        // Set subject partitions
+                        newTemplates[labelIndices[j]].file.set("Partition",j%crossValidate);
+                    }
+                    // Extend the gallery for each partition
+                    for (int j=0; j<labelIndices.size(); j++) {
+                        for (int k=0; k<crossValidate; k++) {
+                            Template leaveOneOutTemplate = newTemplates[labelIndices[j]];
+                            if (k!=leaveOneOutTemplate.file.get<int>("Partition")) {
+                                leaveOneOutTemplate.file.set("Partition", k);
+                                leaveOneOutTemplate.file.set("testOnly", true);
+                                newTemplates.insert(i+1,leaveOneOutTemplate);
+                            }
+                        }
                     }
-                } else if (newTemplates[i].file.getBool("allPartitions")) {
-                    // The allPartitions flag is used to add an extended set
-                    // of target images to every partition
-                    newTemplates[i].file.set("Partition", -1);
-                } else {
+                }
+            }
+        } else {
+            for (int i=newTemplates.size()-1; i>=0; i--) {
+                newTemplates[i].file.set("Index", i+templates.size());
+                newTemplates[i].file.set("Gallery", gallery.name);
+
+                if (crossValidate > 0) {
+                    if (newTemplates[i].file.getBool("duplicatePartitions")) {
+                        // The duplicatePartitions flag is used to add target images
+                        // crossValidate times to the simmat/mask
+                        // when multiple training sets are being used
+
+                        // Set template to the first parition
+                        newTemplates[i].file.set("Partition", QVariant(0));
+
+                        // Insert templates for all the other partitions
+                        for (int j=crossValidate-1; j>0; j--) {
+                            Template duplicatePartitionsTemplate = newTemplates[i];
+                            duplicatePartitionsTemplate.file.set("Partition", j);
+                            newTemplates.insert(i+1, duplicatePartitionsTemplate);
+                        }
+                    } else if (newTemplates[i].file.getBool("allPartitions")) {
+                        // The allPartitions flag is used to add an extended set
+                        // of target images to every partition
+                        newTemplates[i].file.set("Partition", -1);
+                    } else {
                     // Direct use of "Label" is not general -cao
                     const QByteArray md5 = QCryptographicHash::hash(newTemplates[i].file.get<QString>("Label").toLatin1(), QCryptographicHash::Md5);
                     // Select the right 8 hex characters so that it can be represented as a 64 bit integer without overflow
                     newTemplates[i].file.set("Partition", md5.toHex().right(8).toULongLong(0, 16) % crossValidate);
+                    }
                 }
             }
         }
@@ -503,6 +503,20 @@ struct TemplateList : public QList&lt;Template&gt;
             reduced.merge(t);
         return TemplateList() << reduced;
     }
+
+    /*!
+     * \brief Find the indices of templates with specified key, value pairs.
+     */
+    template<typename T>
+    QList<int> find(const QString& key, const T& value)
+    {
+        QList<int> indices;
+        for (int i=0; i<size(); i++)
+            if (at(i).file.contains(key))
+                if (at(i).file.get<T>(key) == value)
+                    indices.append(i);
+        return indices;
+    }
 };
 /*!
@@ -236,6 +236,7 @@ class DefaultFormat : public Format
             videoWriter.file = file;
             videoWriter.write(t);
         } else if (t.size() == 1) {
+            QtUtils::touchDir(QDir(file.path()));
             imwrite(file.name.toStdString(), t);
         }
     }
@@ -135,7 +135,7 @@ class EmptyGallery : public Gallery
 {
     Q_OBJECT
     Q_PROPERTY(QString regexp READ get_regexp WRITE set_regexp RESET reset_regexp STORED false)
-    BR_PROPERTY(QString, regexp, "")
+    BR_PROPERTY(QString, regexp, QString())
     void init()
     {
@@ -184,7 +184,10 @@ class EmptyGallery : public Gallery
         // Enrolling a null file is used as an idiom to initialize an algorithm
         if (file.name.isEmpty()) return;
-        const QString destination = file.name + "/" + (file.getBool("preservePath") ? t.file.name : t.file.fileName());
+        const QString newFormat = file.get<QString>("newFormat",QString());
+        QString destination = file.name + "/" + (file.getBool("preservePath") ? t.file.path()+"/" : QString());
+        destination += (newFormat.isEmpty() ? t.file.fileName() : t.file.baseName()+newFormat);
+
         QMutexLocker diskLocker(&diskLock); // Windows prefers to crash when writing to disk in parallel
         if (t.isNull()) {
             QtUtils::copyFile(t.file.resolved(), destination);
@@ -164,6 +164,7 @@ class DelaunayTransform : public UntrainableTransform
         if (points.empty() || rects.empty()) {
             dst = src;
+            dst.file.clearRects();
             qWarning("Delauney triangulation failed because points or rects are empty.");
             return;
         }
@@ -292,11 +293,57 @@ class DelaunayTransform : public UntrainableTransform
             dst.file.setRects(QList<QRectF>() << OpenCVUtils::fromRect(boundingBox));
         }
     }
-
 };
 BR_REGISTER(Transform, DelaunayTransform)
+/*!
+ * \ingroup transforms
+ * \brief Loads a set of fiduciary points from a .dat file
+ * \author Scott Klum \cite sklum
+ */
+class LoadLandmarksTransform : public UntrainableTransform
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString filePath READ get_filePath WRITE set_filePath RESET reset_filePath STORED false)
+    BR_PROPERTY(QString, filePath, QString())
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst = src;
+
+        // Assume the fiduciary file has the same basename as src
+        QString path = filePath + "/" + src.file.baseName() + ".dat";
+
+        QFile f(path);
+        if (!f.open(QIODevice::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(path));
+
+        QList<QPointF> landmarks;
+        while(!f.atEnd()) {
+            QByteArray line = f.readLine();
+            QString pointSet(line);
+            pointSet = pointSet.simplified();
+            if (!pointSet.isEmpty()) {
+                QStringList points = pointSet.split(" ");
+                landmarks.append(QPointF(points[0].toFloat(),points[1].toFloat()));
+            }
+        }
+
+        if (landmarks.size() < 35) qFatal("Unrecognized landmark set format.");
+
+        dst.file.set("rightEye", landmarks[16]);
+        dst.file.set("leftEye", landmarks[18]);
+
+        landmarks.removeAt(18);
+        landmarks.removeAt(16);
+
+        dst.file.appendPoints(landmarks);
+    }
+};
+
+BR_REGISTER(Transform, LoadLandmarksTransform)
+
 } // namespace br
 #include "landmarks.moc"
@@ -259,7 +259,8 @@ class rrOutput : public MatrixOutput
     {
         if (file.isNull() || targetFiles.isEmpty() || queryFiles.isEmpty()) return;
         const int limit = file.get<int>("limit", 20);
-        const bool byLine = file.get<bool>("byLine", false);
+        const bool byLine = file.getBool("byLine");
+        const bool simple = file.getBool("simple");
         const float threshold = file.get<float>("threshold", -std::numeric_limits<float>::max());
         QStringList lines;
@@ -273,7 +274,8 @@ class rrOutput : public MatrixOutput
                 if (pair.first < threshold) break;
                 File target = targetFiles[pair.second];
                 target.set("Score", QString::number(pair.first));
-                files.append(target.flat());
+                if (simple) files.append(target.baseName() + " " + QString::number(pair.first));
+                else files.append(target.flat());
             }
             lines.append(files.join(byLine ? "\n" : ","));
         }
@@ -299,6 +299,7 @@ BR_REGISTER(Transform, PP5EnrollTransform)
  * \brief Compare templates with PP5
  * \author Josh Klontz \cite jklontz
  * \author E. Taborsky \cite mmtaborsky
+ * \note PP5 distance is known to be asymmetric
  */
 class PP5CompareDistance : public Distance
                          , public PP5Context
@@ -36,8 +36,8 @@ class StasmInitializer : public Initializer
     void initialize() const
     {
-        Globals->abbreviations.insert("RectFromStasmEyes","RectFromPoints([29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47],0.125,6.0)+Resize(44,164)");
-        Globals->abbreviations.insert("RectFromStasmBrow","RectFromPoints([17, 18, 19, 20, 21, 22, 23, 24],0.15,6)+Resize(28,132)");
+        Globals->abbreviations.insert("RectFromStasmEyes","RectFromPoints([29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47],0.125,6.0)");
+        Globals->abbreviations.insert("RectFromStasmBrow","RectFromPoints([16,17,18,19,20,21,22,23,24,25,26,27],0.15,5)");
         Globals->abbreviations.insert("RectFromStasmNose","RectFromPoints([48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58],0.15,1.25)");
         Globals->abbreviations.insert("RectFromStasmMouth","RectFromPoints([59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76],0.3,2.5)");
     }
@@ -1261,7 +1261,7 @@ public:
     {
     }
-    Q_PROPERTY(br::Transform *transform READ get_transform WRITE set_transform STORED false)
+    Q_PROPERTY(br::Transform *transform READ get_transform WRITE set_transform RESET reset_transform STORED false)
     Q_PROPERTY(int activeFrames READ get_activeFrames WRITE set_activeFrames RESET reset_activeFrames)
     BR_PROPERTY(br::Transform *, transform, NULL)
     BR_PROPERTY(int, activeFrames, 100)
 #include <QFutureSynchronizer>
 #include <QtConcurrentRun>
 #include "openbr_internal.h"
+#include "openbr/core/common.h"
 #include <openbr/core/qtutils.h>
 namespace br
@@ -10,6 +11,7 @@ namespace br
  * \ingroup transforms
  * \brief Cross validate a trainable transform.
  * \author Josh Klontz \cite jklontz
+ * \author Scott Klum \cite sklum
  * \note To use an extended gallery, add an allPartitions="true" flag to the gallery sigset for those images that should be compared
  *       against for all testing partitions.
  */
@@ -17,7 +19,9 @@ class CrossValidateTransform : public MetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(QString description READ get_description WRITE set_description RESET reset_description STORED false)
+    Q_PROPERTY(bool leaveOneOut READ get_leaveOneOut WRITE set_leaveOneOut RESET reset_leaveOneOut STORED false)
     BR_PROPERTY(QString, description, "Identity")
+    BR_PROPERTY(bool, leaveOneOut, false)
     QList<br::Transform*> transforms;
@@ -40,11 +44,44 @@ class CrossValidateTransform : public MetaTransform
         QFutureSynchronizer<void> futures;
         for (int i=0; i<numPartitions; i++) {
+            QList<int> partitionsBuffer = partitions;
             TemplateList partitionedData = data;
-            for (int j=partitionedData.size()-1; j>=0; j--)
-                // Remove all templates from partition i
-                if (partitions[j] == i)
+            int j = partitionedData.size()-1;
+            while (j>=0) {
+                // Remove all templates belonging to partition i
+                // if leaveOneOut is true,
+                // and i is greater than the number of images for a particular subject
+                // even if the partitions are different
+                if (leaveOneOut) {
+                    const QString label = partitionedData.at(j).file.get<QString>("Label");
+                    QList<int> subjectIndices = partitionedData.find("Label",label);
+                    QList<int> removed;
+                    // Remove test only data
+                    for (int k=subjectIndices.size()-1; k>=0; k--)
+                        if (partitionedData[subjectIndices[k]].file.getBool("testOnly")) {
+                            removed.append(subjectIndices[k]);
+                            subjectIndices.removeAt(k);
+                        }
+                    // Remove template that was repeated to make the testOnly template
+                    if (subjectIndices.size() > 1 && subjectIndices.size() <= i) {
+                        removed.append(subjectIndices[i%subjectIndices.size()]);
+                    }
+                    else if (partitionsBuffer[j] == i) {
+                        removed.append(j);
+                    }
+
+                    if (!removed.empty()) {
+                        typedef QPair<int,int> Pair;
+                        foreach (Pair pair, Common::Sort(removed,true)) {
+                            partitionedData.removeAt(pair.first); partitionsBuffer.removeAt(pair.first); j--;
+                        }
+                    } else {
+                        j--;
+                    }
+                } else if (partitions[j] == i) {
                     partitionedData.removeAt(j);
+                } else j--;
+            }
             // Train on the remaining templates
             futures.addFuture(QtConcurrent::run(transforms[i], &Transform::train, partitionedData));
         }
@@ -53,12 +90,7 @@ class CrossValidateTransform : public MetaTransform
     void project(const Template &src, Template &dst) const
     {        
-        // If the src partition is greater than the number of training partitions,
-        // assume that projection should be done using the same training data for all partitions.
-        int partition = src.file.get<int>("Partition", 0);
-        if (partition >= transforms.size()) partition = 0;
-
-        transforms[partition]->project(src, dst);
+        transforms[src.file.get<int>("Partition", 0)]->project(src, dst);
     }
     void store(QDataStream &stream) const
-Subproject commit a73d51013ea05f263e88a28539393159fff2183e
+Subproject commit dccddf4dd3a5239911807beeec39308f8890b1e4