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

Josh Klontz
2 parents 5032f4db 6a1be000
Showing 5 changed files with 15 additions and 14 deletions
openbr/core/plot.cpp
openbr/openbr_plugin.cpp
openbr/plugins/distance.cpp
openbr/plugins/gallery.cpp
openbr/plugins/meta.cpp
@@ -250,6 +250,7 @@ float Evaluate(const QString &amp;simmat, const QString &amp;mask, const QString &amp;csv)
     // Write Cumulative Match Characteristic (CMC) curve
     const int Max_Retrieval = 25;
+    float maxRankRate;
     for (int i=1; i<=Max_Retrieval; i++) {
         int realizedReturns = 0, possibleReturns = 0;
         foreach (int firstGenuineReturn, firstGenuineReturns) {
@@ -257,10 +258,11 @@ float Evaluate(const QString &amp;simmat, const QString &amp;mask, const QString &amp;csv)
             if (firstGenuineReturn <= i) realizedReturns++;
         }
         lines.append(qPrintable(QString("CMC,%1,%2").arg(QString::number(i), QString::number(float(realizedReturns)/possibleReturns))));
+        if (i==(Max_Retrieval)) maxRankRate = float(realizedReturns)/possibleReturns;
     }
     if (!csv.isEmpty()) QtUtils::writeFile(csv, lines);
-    qDebug("TAR @ FAR = 0.01: %.3f", result);
+    qDebug("TAR @ FAR = 0.01: %.3f\nRetrieval Rate at Rank 25: %.3f", result, maxRankRate);
     return result;
 }
@@ -968,6 +968,7 @@ void br::Context::messageHandler(QtMsgType type, const QMessageLogContext &amp;conte
         // Write debug output then close
         qDebug("  File: %s\n  Function: %s\n  Line: %d", qPrintable(context.file), qPrintable(context.function), context.line);
         Globals->finalize();
+        //QCoreApplication::exit(-1);
         abort();
     }
 }
@@ -177,6 +177,11 @@ class PipeDistance : public Distance
 BR_REGISTER(Distance, PipeDistance)
+/*!
+ * \ingroup distances
+ * \brief Average distance of multiple matrices
+ * \author Scott Klum \cite sklum
+ */
 class AverageDistance : public Distance
 {
     Q_OBJECT
@@ -190,19 +195,12 @@ class AverageDistance : public Distance
     float compare(const Template &a, const Template &b) const
     {
-        if (a.size() != b.size())
-            qDebug() << a.size() << " " << b.size();
+        if (a.size() != b.size()) qFatal("Comparison size mismatch");
         float score = 0;
+        for (int i = 0; i < a.size(); i++) score += distance->compare(a[i],b[i]);
-        for (int i = 0; i < a.size(); i++) {
-            //Template
-            score += distance->compare(a[i],b[i]);
-        }
-
-        qDebug() << score;
-
-        return score;
+        return score/(float)a.size();
     }
 };
@@ -302,7 +302,7 @@ class memGallery : public Gallery
     static void align(TemplateList &templates)
     {
-        //if (templates[0].size() > 1) return;
+        if (!templates.empty() && templates[0].size() > 1) return;
         bool uniform = true;
         QVector<uchar> alignedData(templates.bytes<size_t>());
@@ -88,7 +88,7 @@ class PipeTransform : public CompositeTransform
         TemplateList copy(data);
         int i = 0;
         while (i < transforms.size()) {
-            fprintf(stderr, "%s", qPrintable(transforms[i]->objectName()));
+            fprintf(stderr, "\n%s", qPrintable(transforms[i]->objectName()));
             // Conditional statement covers likely case that first transform is untrainable
             if (transforms[i]->trainable) {
@@ -106,7 +106,7 @@ class PipeTransform : public CompositeTransform
                    !transforms[nextTrainableTransform]->trainable)
                 nextTrainableTransform++;
-            fprintf(stderr, " projecting...\n");
+            fprintf(stderr, " projecting...");
             QFutureSynchronizer<void> futures;
             for (int j=0; j<copy.size(); j++)
                 if (Globals->parallelism) futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &copy[j], i, nextTrainableTransform));