Rank output works with crossvalidation

Scott Klum
1 parent ef44eed7
Showing 5 changed files with 30 additions and 14 deletions
openbr/core/bee.cpp
openbr/core/eval.cpp
openbr/plugins/gallery.cpp
openbr/plugins/landmarks.cpp
openbr/plugins/output.cpp
@@ -102,7 +102,7 @@ void BEE::writeSigset(const QString &amp;sigset, const br::FileList &amp;files, bool ign
                 if ((key == "Index") || (key == "Subject")) continue;
                 metadata.append(key+"=\""+QtUtils::toString(file.value(key))+"\"");
             }
-        lines.append("\t<biometric-signature name=\"" + file.get<QString>("Subject", file.name) +"\">");
+        lines.append("\t<biometric-signature name=\"" + file.name +"\">");
         lines.append("\t\t<presentation file-name=\"" + file.name + "\" " + metadata.join(" ") + "/>");
         lines.append("\t</biometric-signature>");
     }
@@ -273,6 +273,11 @@ cv::Mat BEE::makeMask(const br::FileList &amp;targets, const br::FileList &amp;queries, 
     QList<int> targetPartitions = targets.crossValidationPartitions();
     QList<int> queryPartitions = queries.crossValidationPartitions();
+    qDebug() << "Targets: " << targetLabels << "\n";
+    qDebug() << "Targets: " << targetPartitions << "\n";
+    qDebug() << "Queries: " << queryLabels << "\n";
+    qDebug() << "Queries: " << queryPartitions << "\n";
+
     Mat mask(queries.size(), targets.size(), CV_8UC1);
     for (int i=0; i<queries.size(); i++) {
         const QString &fileA = queries[i];
@@ -298,6 +303,8 @@ cv::Mat BEE::makeMask(const br::FileList &amp;targets, const br::FileList &amp;queries, 
         }
     }
+    qDebug() << mask.row(0);
+
     return mask;
 }
@@ -119,6 +119,9 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const QString &amp;csv)
         }
     }
+    qDebug() << genuineCount;
+    qDebug() << impostorCount;
+
     if (numNaNs > 0) qWarning("Encountered %d NaN scores!", numNaNs);
     if (genuineCount == 0) qFatal("No genuine scores!");
     if (impostorCount == 0) qFatal("No impostor scores!");
@@ -165,10 +165,13 @@ class EmptyGallery : public Gallery
             templates.append(File(fileName, dir.dirName()));
         if (!regexp.isEmpty()) {
-            const QRegularExpression re(regexp);
-            for (int i=templates.size()-1; i>=0; i--)
-                if (!re.match(templates[i].file.suffix()).hasMatch())
+            QRegExp re(regexp);
+            re.setPatternSyntax(QRegExp::Wildcard);
+            for (int i=templates.size()-1; i>=0; i--) {
+                if (!re.exactMatch(templates[i].file.suffix())) {
                     templates.removeAt(i);
+                }
+            }
         }
         return templates;
@@ -231,7 +231,6 @@ class DelaunayTransform : public UntrainableTransform
             QList<Point2f> mappedPoints;
             dst.file = src.file;
-            qDebug() << dst.file.name;
             for (int i = 0; i < validTriangles.size(); i++) {
                 Eigen::MatrixXf srcMat(validTriangles[i].size(), 2);
@@ -289,8 +288,8 @@ class DelaunayTransform : public UntrainableTransform
             }
             // Overwrite any rects
-            //Rect boundingBox = boundingRect(mappedPoints.toVector().toStdVector());
-            //dst.file.setRects(QList<QRectF>() << OpenCVUtils::fromRect(boundingBox));
+            Rect boundingBox = boundingRect(mappedPoints.toVector().toStdVector());
+            dst.file.setRects(QList<QRectF>() << OpenCVUtils::fromRect(boundingBox));
         }
     }
@@ -98,7 +98,7 @@ class heatOutput : public MatrixOutput
 {
     Q_OBJECT
     Q_PROPERTY(int patches READ get_patches WRITE set_patches RESET reset_patches STORED false)
-    BR_PROPERTY(int, patches, -1);
+    BR_PROPERTY(int, patches, -1)
     ~heatOutput()
     {
@@ -426,13 +426,17 @@ class rankOutput : public MatrixOutput
             typedef QPair<float,int> Pair;
             int rank = 1;
             foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector<float>(data.row(i)), true)) {
-                if (targetFiles[pair.second].get<QString>("Subject") == queryFiles[i].get<QString>("Subject")) {
-                    ranks.append(rank);
-                    positions.append(pair.second);
-                    scores.append(pair.first);
-                    break;
+                if (Globals->crossValidate > 0 ? (targetFiles[pair.second].get<int>("Partition",-1) == queryFiles[i].get<int>("Partition",-1)) : true) {
+                    if (QString(targetFiles[pair.second]) != QString(queryFiles[i])) {
+                        if (targetFiles[pair.second].get<QString>("Subject") == queryFiles[i].get<QString>("Subject")) {
+                            ranks.append(rank);
+                            positions.append(pair.second);
+                            scores.append(pair.first);
+                            break;
+                        }
+                        rank++;
+                    }
                 }
-                rank++;
             }
         }