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

Charles Otto
2 parents c0adb3c5 e9f1e88d
Showing 14 changed files with 157 additions and 47 deletions
data/README.md
openbr/core/classify.cpp
openbr/core/core.cpp
openbr/core/plot.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/ct8.cpp
openbr/plugins/eigen3.cpp
openbr/plugins/format.cpp
openbr/plugins/meta.cpp
openbr/plugins/stasm.cpp
openbr/plugins/validate.cpp
share/openbr/models
share/openbr/openbr.bib
@@ -7,9 +7,9 @@
 * [FRGC](FRGC/README.md)
 * [LFW](LFW/LFW.md)
 * [MEDS](MEDS/README.md)
+* [MNIST](MNIST/README.md)
 * [PCSO](PCSO/README.md)
  
-For both practical and legal reasons we don't include images in this repository.
-Open source datasets can be downloaded using `../scripts/downloadDatasets.sh`.
+For both practical and legal reasons we only include images for some of the datasets in this repository.
 Researchers should contact the respective owners of the other datasets in order to obtain a copy.
 The provided sigsets indicate how the images are expected to be arranged in directories, generally following the conventions established by the original authors.
@@ -45,8 +45,12 @@ void br::EvalClassification(const QString &amp;predictedInput, const QString &amp;truthI
             qFatal("Input order mismatch.");
  
         // Typically these lists will be of length one, but this generalization allows measuring multi-class labeling accuracy.
-        QStringList predictedSubjects = predicted[i].file.get<QStringList>("Subject");
-        QStringList trueSubjects = truth[i].file.get<QStringList>("Subject");
+        QString predictedSubject = predicted[i].file.subject();
+        QString trueSubject = truth[i].file.subject();
+
+        QStringList predictedSubjects(predictedSubject);
+        QStringList trueSubjects(trueSubject);
+
         foreach (const QString &subject, trueSubjects.toVector() /* Hack to copy the list. */) {
             if (predictedSubjects.contains(subject)) {
                 counters[subject].truePositive++;
@@ -248,9 +248,8 @@ struct AlgorithmCore
                     if (!partitionSizes.empty()) targetPartitions = targets.partition(partitionSizes);
                     else targetPartitions.append(targets);
  
-                    if (queryPartitions[i].first().size() != targetPartitions[i].first().size()) qFatal("Query and target templates have different number of matrices.");
-
                     outputs[i]->setBlock(queryBlock, targetBlock);
+
                     distance->compare(targetPartitions[i], queryPartitions[i], outputs[i]);
  
                     Globals->currentStep += double(targets.size()) * double(queries.size());
@@ -248,24 +248,29 @@ float Evaluate(const Mat &amp;simmat, const Mat &amp;mask, const QString &amp;csv)
     lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(getTAR(operatingPoints, 0.001), 'f', 3))));
     lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(result = getTAR(operatingPoints, 0.01), 'f', 3))));
  
+
     // Write SD & KDE
     points = qMin(qMin(Max_Points, genuines.size()), impostors.size());
     QList<double> sampledGenuineScores; sampledGenuineScores.reserve(points);
     QList<double> sampledImpostorScores; sampledImpostorScores.reserve(points);
-    for (int i=0; i<points; i++) {
-        float genuineScore = genuines[double(i) / double(points-1) * double(genuines.size()-1)];
-        float impostorScore = impostors[double(i) / double(points-1) * double(impostors.size()-1)];
-        if (genuineScore == -std::numeric_limits<float>::max()) genuineScore = minGenuineScore;
-        if (impostorScore == -std::numeric_limits<float>::max()) impostorScore = minImpostorScore;
-        lines.append(QString("SD,%1,Genuine").arg(QString::number(genuineScore)));
-        lines.append(QString("SD,%1,Impostor").arg(QString::number(impostorScore)));
-        sampledGenuineScores.append(genuineScore);
-        sampledImpostorScores.append(impostorScore);
+
+    if (points > 1) {
+        for (int i=0; i<points; i++) {
+            float genuineScore = genuines[double(i) / double(points-1) * double(genuines.size()-1)];
+            float impostorScore = impostors[double(i) / double(points-1) * double(impostors.size()-1)];
+            if (genuineScore == -std::numeric_limits<float>::max()) genuineScore = minGenuineScore;
+            if (impostorScore == -std::numeric_limits<float>::max()) impostorScore = minImpostorScore;
+            lines.append(QString("SD,%1,Genuine").arg(QString::number(genuineScore)));
+            lines.append(QString("SD,%1,Impostor").arg(QString::number(impostorScore)));
+            sampledGenuineScores.append(genuineScore);
+            sampledImpostorScores.append(impostorScore);
+        }
     }
  
     // Write Cumulative Match Characteristic (CMC) curve
-    const int Max_Retrieval = 100;
+    const int Max_Retrieval = 200;
     const int Report_Retrieval = 5;
+
     float reportRetrievalRate = -1;
     for (int i=1; i<=Max_Retrieval; i++) {
         int realizedReturns = 0, possibleReturns = 0;
@@ -467,6 +472,8 @@ struct RPlot
     }
 };
  
+// Does not work if dataset folder starts with a number
+
 bool Plot(const QStringList &files, const br::File &destination, bool show)
 {
     qDebug("Plotting %d file(s) to %s", files.size(), qPrintable(destination));
@@ -52,7 +52,7 @@ QString File::flat() const
         const QVariant value = this->value(key);
         if (value.isNull()) values.append(key);
         else {
-            if (QString(value.typeName()) == "QVariantList" || QString(value.typeName()) == "QStringList") {
+            if (QString(value.typeName()) == "QVariantList") {
                 QStringList variants;
                 foreach(const QVariant &variant, qvariant_cast<QVariantList>(value)) {
                     variants.append(QtUtils::toString(variant));
@@ -137,7 +137,7 @@ QVariant File::value(const QString &amp;key) const
  
 QVariant File::parse(const QString &value)
 {
-    bool ok;
+    bool ok = false;
     const QPointF point = QtUtils::toPoint(value, &ok);
     if (ok) return point;
     const QRectF rect = QtUtils::toRect(value, &ok);
@@ -183,6 +183,11 @@ float File::label() const
     if (s.isNull()) return -1;
  
     const QString subject = s.toString();
+
+    bool is_num = false;
+    float num = subject.toFloat(&is_num);
+    if (is_num) return num;
+
     static QMutex mutex;
     QMutexLocker mutexLocker(&mutex);
     if (!Globals->subjects.contains(subject))
@@ -1003,7 +1008,7 @@ void Output::reformat(const FileList &amp;targetFiles, const FileList &amp;queryFiles, c
     const int columns = targetFiles.size();
     for (int i=0; i<rows; i++)
         for (int j=0; j<columns; j++)
-            o->setRelative(m.at<float>(i,i), i, j);
+            o->setRelative(m.at<float>(i,j), i, j);
 }
  
 /* Output - protected methods */
@@ -410,7 +410,7 @@ struct TemplateList : public QList&lt;Template&gt;
             sum+=partitionSizes[i];
         }
  
-        if (sum != first().size()) qFatal("Partition sizes do not span template matrices properly");
+        if (sum != first().size()) qFatal("Partition sizes %i do not span template matrices %i properly", sum, first().size());
  
         foreach (const Template &t, *this) {
             int index = 0;
@@ -11,9 +11,9 @@
 #include <exception>
 #include <string>
 #include <vector>
-#include "openbr_internal.h"
  
-#include "core/resource.h"
+#include "openbr_internal.h"
+#include "openbr/core/resource.h"
  
 using namespace cv;
 using namespace br;
@@ -330,6 +330,7 @@ class LDATransform : public Transform
     void train(const TemplateList &_trainingSet)
     {
         TemplateList trainingSet = TemplateList::relabel(_trainingSet);
+
         int instances = trainingSet.size();
  
         // Perform PCA dimensionality reduction
@@ -317,6 +317,7 @@ BR_REGISTER(Format, maskFormat)
  * \brief MATLAB <tt>.mat</tt> format.
  * \author Josh Klontz \cite jklontz
  * http://www.mathworks.com/help/pdf_doc/matlab/matfile_format.pdf
+ * \note matFormat is known not to work with compressed matrices
  */
 class matFormat : public Format
 {
@@ -324,12 +325,18 @@ class matFormat : public Format
  
     struct Element
     {
+        // It is always best to cast integers to a Qt integer type, such as qint16 or quint32, when reading and writing.
+        // This ensures that you always know exactly what size integers you are reading and writing, no matter what the
+        // underlying platform and architecture the application happens to be running on.
+        // http://qt-project.org/doc/qt-4.8/datastreamformat.html
         quint32 type, bytes;
         QByteArray data;
         Element() : type(0), bytes(0) {}
         Element(QDataStream &stream)
             : type(0), bytes(0)
         {
+            // Read first 4 bytes into type (32 bit integer),
+            // specifying the type of data used
             if (stream.readRawData((char*)&type, 4) != 4)
                 qFatal("Unexpected end of file.");
  
@@ -340,11 +347,16 @@ class matFormat : public Format
                 bytes = bytes >> 16;
             } else {
                 // Regular format
+                // Read 4 bytes into bytes (32 bit integer),
+                // specifying the size of the element
                 if (stream.readRawData((char*)&bytes, 4) != 4)
                     qFatal("Unexpected end of file.");
             }
  
+            // Set the size of data to bytes
             data.resize(bytes);
+
+            // Read bytes amount of data from the file into data
             if (int(bytes) != stream.readRawData(data.data(), bytes))
                 qFatal("Unexpected end of file.");
  
@@ -372,8 +384,9 @@ class matFormat : public Format
         while (!f.atEnd()) {
             Element element(f);
  
-            // miCOMPRESS
+            // miCOMPRESSED
             if (element.type == 15) {
+                // Prepend the number of bytes to element.data
                 element.data.prepend((char*)&element.bytes, 4); // Qt zlib wrapper requires this to preallocate the buffer
                 QDataStream uncompressed(qUncompress(element.data));
                 element = Element(uncompressed);
@@ -76,7 +76,7 @@ class PipeTransform : public CompositeTransform
 {
     Q_OBJECT    
  
-    void _projectPartial(Template *srcdst, int startIndex, int stopIndex)
+    void _projectPartial(TemplateList *srcdst, int startIndex, int stopIndex)
     {
         for (int i=startIndex; i<stopIndex; i++)
             *srcdst >> *transforms[i];
@@ -87,6 +87,14 @@ class PipeTransform : public CompositeTransform
         if (!trainable) return;
  
         TemplateList copy(data);
+        QList<TemplateList> singleItemLists;
+        for (int i=0; i < copy.size(); i++)
+        {
+            TemplateList temp;
+            temp.append(copy[i]);
+            singleItemLists.append(temp);
+        }
+
         int i = 0;
         while (i < transforms.size()) {
             fprintf(stderr, "\n%s", qPrintable(transforms[i]->objectName()));
@@ -109,9 +117,14 @@ class PipeTransform : public CompositeTransform
  
             fprintf(stderr, " projecting...");
             QFutureSynchronizer<void> futures;
-            for (int j=0; j<copy.size(); j++)
-                futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &copy[j], i, nextTrainableTransform));
+            for (int j=0; j < singleItemLists.size(); j++)
+                futures.addFuture(QtConcurrent::run(this, &PipeTransform::_projectPartial, &singleItemLists[j], i, nextTrainableTransform));
             futures.waitForFinished();
+
+            copy.clear();
+            for (int j=0; j < singleItemLists.size(); j++)
+                copy.append(singleItemLists[j]);
+
             i = nextTrainableTransform;
         }
     }
@@ -34,7 +34,7 @@ BR_REGISTER(Initializer, StasmInitializer)
  * \author Scott Klum \cite sklum
  */
 // TODO: Use a global mutex to prevent concurrent calls to AsmSearchDll
-#if 0
+
 class StasmTransform : public UntrainableTransform
 {
     Q_OBJECT
@@ -46,6 +46,9 @@ class StasmTransform : public UntrainableTransform
  
     void project(const Template &src, Template &dst) const
     {
+        static QMutex mutex;
+        QMutexLocker locker(&mutex);
+
         int nlandmarks;
         int landmarks[500];
  
@@ -68,7 +71,6 @@ class StasmTransform : public UntrainableTransform
 };
  
 BR_REGISTER(Transform, StasmTransform)
-#endif
  
 } // namespace br
  
@@ -52,8 +52,13 @@ class CrossValidateTransform : public MetaTransform
     }
  
     void project(const Template &src, Template &dst) const
-    {
-        transforms[src.file.get<int>("Partition", 0)]->project(src, dst);
+    {        
+        // 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()-1) partition = 0;
+
+        transforms[partition]->project(src, dst);
     }
  
     void store(QDataStream &stream) const
-Subproject commit c11ff0f0bb451fb5576bd4b8122c32278e52042a
+Subproject commit 1394fbec42897c1a53373443c32a6f62a010294f
@@ -40,6 +40,11 @@
 	Title = {{OpenBR} - {Open} {Biometric} {Recognition}},
 	Year = {2012}}
  
+@misc{libface,
+	Howpublished = {http://libface.sourceforge.net/file/Home.html},
+	Title = {libface},
+	Year = {2011}}
+
 @misc{CT8,
 	Author = {Cognitec},
 	Howpublished = {www.cognitec-systems.de/FaceVACS-SDK.19.0.html},
@@ -77,21 +82,49 @@
 	Year = 2000}
  
 @manual{R,
-    Title = {R: A Language and Environment for Statistical Computing},
-    Author = {{R Core Team}},
-    Organization = {R Foundation for Statistical Computing},
-    Address = {Vienna, Austria},
-    Year = 2013,
-    Url = {http://www.R-project.org}}
+	Title = {R: A Language and Environment for Statistical Computing},
+	Author = {{R Core Team}},
+	Organization = {R Foundation for Statistical Computing},
+	Address = {Vienna, Austria},
+	Year = 2013,
+	Url = {http://www.R-project.org}}
  
 % Papers
+@incollection{ahonen04,
+	Author = {Ahonen, Timo and Hadid, Abdenour and Pietik{\"a}inen, Matti},
+	Booktitle = {Computer Vision-ECCV 2004},
+	Pages = {469-481},
+	Publisher = {Springer},
+	Title = {Face recognition with local binary patterns},
+	Year = {2004}}
+
 @inproceedings{arandjelovic12, 
-	Author={Arandjelovic, R. and Zisserman, A.}, 
-	Booktitle={Computer Vision and Pattern Recognition (CVPR), 2012 IEEE Conference on},
-	Title={Three things everyone should know to improve object retrieval}, 
-	Month={June}, 
-        Year={2012},
-	Pages={2911-2918}}
+	Author = {Arandjelovic, R. and Zisserman, A.}, 
+	Booktitle = {Computer Vision and Pattern Recognition (CVPR), 2012 IEEE Conference on},
+	Title = {Three things everyone should know to improve object retrieval}, 
+	Month = {June}, 
+	Year = {2012},
+	Pages = {2911-2918}}
+
+@article{bradski00,
+	Author = {Bradski, Gary},
+	Journal = {Doctor Dobbs Journal},
+	Number = {11},
+	Pages = {120-126},
+	Publisher = {M AND T PUBLISHING INC},
+	Title = {The {OpenCV} library},
+	Volume = {25},
+	Year = {2000}}
+
+@article{belhumeur97,
+	Author = {Belhumeur, Peter N. and Hespanha, Joao P. and Kriegman, David J.},
+	Journal = {Pattern Analysis and Machine Intelligence, IEEE Transactions on},
+	Number = {7},
+	Pages = {711-720},
+	Publisher = {IEEE},
+	Title = {Eigenfaces vs. fisherfaces: Recognition using class specific linear projection},
+	Volume = {19},
+	Year = {1997}}
  
 @inproceedings{belhumeur11,
 	Author = {Belhumeur, P.N. and Jacobs, D.W. and Kriegman, D.J. and Kumar, N.},
@@ -136,11 +169,31 @@
 	Month = {jan},
 	Year = {2013}}
  
+@article{hall09,
+	Author = {Hall, Mark and Frank, Eibe and Holmes, Geoffrey and Pfahringer, Bernhard and Reutemann, Peter and Witten, Ian H},
+	Journal = {ACM SIGKDD Explorations Newsletter},
+	Number = {1},
+	Pages = {10-18},
+	Publisher = {ACM},
+	Title = {The WEKA data mining software: an update},
+	Volume = {11},
+	Year = {2009}}
+
 @inproceedings{huang08,
-	Author={Huang, Gary B and Mattar, Marwan and Berg, Tamara and Learned-Miller, Eric and others},
-	Booktitle={Workshop on Faces in 'Real-Life' Images: Detection, Alignment, and Recognition},
-	Title={Labeled faces in the wild: A database forstudying face recognition in unconstrained environments},
-	Year={2008}}
+	Author = {Huang, Gary B and Mattar, Marwan and Berg, Tamara and Learned-Miller, Eric and others},
+	Booktitle = {Workshop on Faces in 'Real-Life' Images: Detection, Alignment, and Recognition},
+	Title = {Labeled faces in the wild: A database forstudying face recognition in unconstrained environments},
+	Year = {2008}}
+
+@article{ihaka96,
+	Author = {Ihaka, Ross and Gentleman, Robert},
+	Journal = {Journal of computational and graphical statistics},
+	Number = {3},
+	Pages = {299-314},
+	Publisher = {Taylor \& Francis},
+ 	Title = {R: A language for data analysis and graphics},
+	Volume = {5},
+	Year = {1996}}
  
 @article{jegou11,
 	Author = {J{\'e}gou, H. and Douze, M. and Schmid, C.},
@@ -173,6 +226,14 @@
 	Title = {{The HFB Face Database} for {Heterogeneous Face Biometrics} Research},
 	Year = {2009}}
  
+@inproceedings{lui12,
+	Author = {Lui, Yui Man and Bolme, D and Phillips, PJ and Beveridge, JR and Draper, BA},
+	Booktitle = {Computer Vision and Pattern Recognition Workshops (CVPRW), 2012 IEEE Computer Society Conference on},
+	Organization = {IEEE},
+	Pages = {9-16},
+	Title = {Preliminary studies on the Good, the Bad, and the Ugly face recognition challenge problem},
+	Year = {2012}}
+
 @article{martinez98,
 	Author = {Martinez, A.M.},
 	Journal = {CVC Technical Report},