Updates

Scott Klum
1 parent a31c2022
Showing 14 changed files with 108 additions and 61 deletions
openbr/core/bee.cpp
openbr/core/eval.cpp
openbr/core/plot.cpp
openbr/openbr_plugin.cpp
openbr/plugins/crop.cpp
openbr/plugins/distance.cpp
openbr/plugins/draw.cpp
openbr/plugins/filter.cpp
openbr/plugins/gallery.cpp
openbr/plugins/misc.cpp
openbr/plugins/output.cpp
openbr/plugins/random.cpp
openbr/plugins/stasm4.cpp
openbr/plugins/template.cpp
@@ -112,7 +112,7 @@ void BEE::writeSigset(const QString &amp;sigset, const br::FileList &amp;files, bool ign
                 metadata.append("Rects=\"["+landmarks.join(",")+"]\"");
             }
         }
-        lines.append("\t<biometric-signature name=\"" + file.get<QString>("Label",file.fileName()) +"\">");
+        lines.append("\t<biometric-signature name=\"" + file.baseName() +"\">");
         lines.append("\t\t<presentation file-name=\"" + file.name + "\" " + metadata.join(" ") + "/>");
         lines.append("\t</biometric-signature>");
     }
@@ -167,7 +167,7 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const QString &amp;csv)
         if ((falsePositives > previousFalsePositives) &&
              (truePositives > previousTruePositives)) {
             // Restrict the extreme ends of the curve
-            if ((truePositives >= 10) && (falsePositives < impostorCount/2))
+            //if ((truePositives >= 10) && (falsePositives < impostorCount/2))
                 operatingPoints.append(OperatingPoint(thresh, float(falsePositives)/impostorCount, float(truePositives)/genuineCount));
             previousFalsePositives = falsePositives;
             previousTruePositives = truePositives;
@@ -236,7 +236,7 @@ bool Plot(const QStringList &amp;files, const File &amp;destination, bool show)
                             QString(", xlab=\"False Accept Rate\", ylab=\"False Reject Rate\") + geom_abline(alpha=0.5, colour=\"grey\", linetype=\"dashed\") + theme_minimal()") +
                             (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) +
                             (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) +
-                            QString(" + scale_x_log10(labels=percent, limits=c(min(DET$X),1)) + scale_y_log10(labels=percent) + annotation_logticks()\n\n")));
+                            QString(" + scale_x_log10(labels=percent, limits=c(min(DET$X),1)) + scale_y_continuous(labels=percent)\n\n")));
     p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") +
                             QString(", xlab=\"Score%1\"").arg((p.flip ? p.major.size : p.minor.size) > 1 ? " / " + (p.flip ? p.major.header : p.minor.header) : QString()) +
@@ -441,10 +441,10 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
                         // 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);
+                        // 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);
                     }
                 }
             }
@@ -60,8 +60,13 @@ class ROITransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
-        foreach (const QRectF &rect, src.file.rects())
-            dst += src.m()(OpenCVUtils::toRect(rect));
+        if (src.file.rects().empty()) {
+            dst = src;
+            qWarning("No rects present in file.");
+        }
+        else
+            foreach (const QRectF &rect, src.file.rects())
+                dst += src.m()(OpenCVUtils::toRect(rect));
     }
 };
@@ -310,7 +310,7 @@ class OnlineDistance : public Distance
     Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
     Q_PROPERTY(float alpha READ get_alpha WRITE set_alpha RESET reset_alpha STORED false)
     BR_PROPERTY(br::Distance*, distance, NULL)
-    BR_PROPERTY(float, alpha, 0.1f);
+    BR_PROPERTY(float, alpha, 0.1f)
     mutable QHash<QString,float> scoreHash;
     mutable QMutex mutex;
@@ -46,11 +46,11 @@ class DrawTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         const Scalar color(0,255,0);
-        const Scalar verboseColor(255, 255, 0);
+        const Scalar verboseColor(0, 0, 0);
         dst.m() = inPlace ? src.m() : src.m().clone();
         if (points) {
-            const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.namedPoints() + src.file.points());
+            const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.points());
             for (int i=0; i<pointsList.size(); i++) {
                 const Point2f &point = pointsList[i];
                 circle(dst, point, 3, color, -1);
@@ -139,10 +139,8 @@ class CSDNTransform : public UntrainableTransform
         const int surround = s/2;
-        for ( int i = 0; i < nRows; i++ )
-        {
-            for ( int j = 0; j < nCols; j++ )
-            {
+        for ( int i = 0; i < nRows; i++ ) {
+            for ( int j = 0; j < nCols; j++ ) {
                 int width = min( j+surround, nCols ) - max( 0, j-surround );
                 int height = min( i+surround, nRows ) - max( 0, i-surround );
@@ -119,7 +119,8 @@ class galGallery : public Gallery
     {
         if (t.isEmpty() && t.file.isNull())
             return;
-        stream << t;
+        if (t.file.baseName() != "204765279_PCSOdata")
+            stream << t;
     }
 };
@@ -185,7 +186,7 @@ class EmptyGallery : public Gallery
         if (file.name.isEmpty()) return;
         const QString newFormat = file.get<QString>("newFormat",QString());
-        QString destination = file.name + "/" + (file.getBool("preservePath") ? t.file.path()+"/" : QString());
+        QString destination = file.name + "/fold_" + QString::number(t.file.get<int>("Partition")) + "/target/" + (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
@@ -382,50 +382,38 @@ BR_REGISTER(Transform, RegexPropertyTransform)
 /*!
  * \ingroup transforms
- * \brief Remove templates with the specified file extension or metadata value.
- * \author Josh Klontz \cite jklontz
+ * \brief Calculate metadata statistics
+ * \author Scott Klum \cite sklum
  */
-class RemoveTemplatesTransform : public UntrainableMetaTransform
+class MetadataStatisticsTransform : public Transform
 {
     Q_OBJECT
-    Q_PROPERTY(QString regexp READ get_regexp WRITE set_regexp RESET reset_regexp STORED false)
-    Q_PROPERTY(QString key READ get_key WRITE set_key RESET reset_key STORED false)
-    BR_PROPERTY(QString, regexp, "")
-    BR_PROPERTY(QString, key, "")
+    Q_PROPERTY(QStringList keys READ get_keys WRITE set_keys RESET reset_keys STORED false)
+    BR_PROPERTY(QStringList, keys, QStringList())
-    void project(const Template &src, Template &dst) const
+    void train(const TemplateList &data)
     {
-        const QRegularExpression re(regexp);
-        const QRegularExpressionMatch match = re.match(key.isEmpty() ? src.file.suffix() : src.file.get<QString>(key));
-        if (match.hasMatch()) dst = Template();
-        else                  dst = src;
-    }
-};
+        QHash<QString,int> statHash;
-BR_REGISTER(Transform, RemoveTemplatesTransform)
+        foreach (const Template &t, data) {
+            foreach (const QString &key, keys) {
+                QString value = t.file.get<QString>(key, QString());
-/*!
- * \ingroup transforms
- * \brief Remove template metadata with the specified key(s).
- * \author Josh Klontz \cite jklontz
- */
-class RemoveMetadataTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(QString regexp READ get_regexp WRITE set_regexp RESET reset_regexp STORED false)
-    BR_PROPERTY(QString, regexp, "")
+                if (value.isEmpty()) continue;
+                int count = statHash.value(value,0);
+                statHash.value(value,count+1);
+            }
+        }
+        foreach (const QString &key, statHash.keys()) fprintf(stdout, "%s: %s\n", qPrintable(key), qPrintable(statHash.value(key)));
+    }
     void project(const Template &src, Template &dst) const
     {
         dst = src;
-        const QRegularExpression re(regexp);
-        foreach (const QString &key, dst.file.localKeys())
-            if (re.match(key).hasMatch())
-                dst.file.remove(key);
     }
 };
-BR_REGISTER(Transform, RemoveMetadataTransform)
+BR_REGISTER(Transform, MetadataStatisticsTransform)
 /*!
  * \ingroup transforms
@@ -76,14 +76,29 @@ class csvOutput : public MatrixOutput
     {
         if (file.isNull() || targetFiles.isEmpty() || queryFiles.isEmpty()) return;
         QStringList lines;
-        lines.append("File," + targetFiles.names().join(","));
-        for (int i=0; i<queryFiles.size(); i++) {
-            QStringList words;
-            for (int j=0; j<targetFiles.size(); j++)
-                words.append(toString(i,j));  // The toString idiom is used to output match scores - see MatrixOutput
-            lines.append(queryFiles[i].name+","+words.join(","));
+        if (Globals->crossValidate == 0) {
+            for (int i=0; i<queryFiles.size(); i++) {
+                QStringList words;
+                for (int j=0; j<targetFiles.size(); j++)
+                    words.append(queryFiles[i].name+","+targetFiles[j].baseName() + "," + toString(i,j)); // The toString idiom is used to output match scores - see MatrixOutput
+                lines.append(words.join("\n"));
+            }
+            QtUtils::writeFile(file.name, lines);
+        } else {
+            for (int k=0; k<Globals->crossValidate; k++) {
+                lines.clear();
+                for (int i=0; i<queryFiles.size(); i++) {
+                    int queryPartition = queryFiles[i].get<int>("Partition");
+                    if (queryPartition != k) continue;
+                    QStringList words;
+                    QList<int> targetPartitions = targetFiles.crossValidationPartitions();
+                    for (int j=0; j<targetFiles.size(); j++)
+                        if (queryPartition == targetPartitions[j]) words.append(queryFiles[i].name+","+targetFiles[j].baseName() + "," + toString(i,j)); // The toString idiom is used to output match scores - see MatrixOutput
+                        lines.append(words.join("\n"));
+                }
+                QtUtils::writeFile(file.name.arg(QString::number(k)), lines);
+            }
         }
-        QtUtils::writeFile(file, lines);
     }
 };
@@ -249,7 +264,8 @@ BR_REGISTER(Output, mtxOutput)
 /*!
  * \ingroup outputs
  * \brief Rank retrieval output.
- * \author Josh Klontz \cite jklontz Scott Klum \cite sklum
+ * \author Josh Klontz \cite jklontz
+ * \author Scott Klum \cite sklum
  */
 class rrOutput : public MatrixOutput
 {
@@ -56,7 +56,7 @@ class RndSubspaceTransform : public Transform
             for (int i=0; i<size; i++)
                 weights.append(1);
         }
-        const int dimsOut = weights.size()*fraction;
+        const int dimsOut = std::max(int(weights.size()*fraction), 1);
         QList<int> sample = Common::RandSample(dimsOut, weights);
         Mat xMap(1, dimsOut, CV_16SC1);
@@ -56,6 +56,8 @@ class StasmTransform : public UntrainableTransform
     Q_PROPERTY(bool stasm3Format READ get_stasm3Format WRITE set_stasm3Format RESET reset_stasm3Format STORED false)
     BR_PROPERTY(bool, stasm3Format, false)
+    Q_PROPERTY(bool clearLandmarks READ get_clearLandmarks WRITE set_clearLandmarks RESET reset_clearLandmarks STORED false)
+    BR_PROPERTY(bool, clearLandmarks, false)
     Resource<StasmCascadeClassifier> stasmCascadeResource;
@@ -69,6 +71,8 @@ class StasmTransform : public UntrainableTransform
     {
         if (src.m().channels() != 1) qFatal("Stasm expects single channel matrices.");
+        dst = src;
+
         StasmCascadeClassifier *stasmCascade = stasmCascadeResource.acquire();
         int foundface;
@@ -83,10 +87,20 @@ class StasmTransform : public UntrainableTransform
         stasmCascadeResource.release(stasmCascade);
-        if (!foundface) qWarning("No face found in %s", qPrintable(src.file.fileName()));
-        else {
-            for (int i = 0; i < nLandmarks; i++)
-                dst.file.appendPoint(QPointF(landmarks[2 * i], landmarks[2 * i + 1]));
+        if (clearLandmarks) {
+            dst.file.clearPoints();
+            dst.file.clearRects();
+        }
+
+        if (!foundface) {
+            qWarning("No face found in %s", qPrintable(src.file.fileName()));
+        } else {
+            for (int i = 0; i < nLandmarks; i++) {
+                QPointF point(landmarks[2 * i], landmarks[2 * i + 1]);
+                dst.file.appendPoint(point);
+                if (i == 38) dst.file.set("StasmRightEye",point);
+                if (i == 39) dst.file.set("StasmLeftEye", point);
+            }
         }
         dst.m() = src.m();
 #include "openbr_internal.h"
+#include <QRegularExpression>
 namespace br
 {
@@ -25,6 +26,30 @@ class RetainTransform : public UntrainableTransform
 BR_REGISTER(Transform, RetainTransform)
+/*!
+ * \ingroup transforms
+ * \brief Remove templates with the specified file extension or metadata value.
+ * \author Josh Klontz \cite jklontz
+ */
+class RemoveTemplatesTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(QString regexp READ get_regexp WRITE set_regexp RESET reset_regexp STORED false)
+    Q_PROPERTY(QString key READ get_key WRITE set_key RESET reset_key STORED false)
+    BR_PROPERTY(QString, regexp, "")
+    BR_PROPERTY(QString, key, "")
+
+    void project(const Template &src, Template &dst) const
+    {
+        const QRegularExpression re(regexp);
+        const QRegularExpressionMatch match = re.match(key.isEmpty() ? src.file.suffix() : src.file.get<QString>(key));
+        if (match.hasMatch()) dst = Template();
+        else                  dst = src;
+    }
+};
+
+BR_REGISTER(Transform, RemoveTemplatesTransform)
+
 } // namespace br
 #include "template.moc"