removed bee.cpp conflict

Scott Klum
2 parents b721e1e0 3ad80556
Showing 37 changed files with 238 additions and 145 deletions
CHANGELOG.md
sdk/core/bee.cpp
sdk/core/classify.cpp
sdk/core/cluster.cpp
sdk/core/common.cpp
sdk/core/core.cpp
sdk/core/fuse.cpp
sdk/core/opencvutils.cpp
sdk/core/plot.cpp
sdk/core/qtutils.cpp
sdk/openbr.cpp
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/cascade.cpp
sdk/plugins/distance.cpp
sdk/plugins/eigen3.cpp
sdk/plugins/eyes.cpp
sdk/plugins/fill.cpp
sdk/plugins/filter.cpp
sdk/plugins/format.cpp
 0.3.0 - ??/??/??
 ================
+* YouTubeFacesDBTransform implements Dr. Wolf's experimental protocol
 0.2.0 - 2/23/13
 ===============
@@ -42,8 +42,8 @@ FileList BEE::readSigset(const QString &amp;sigset, bool ignoreMetadata)
     QDomDocument doc(sigset);
     QFile file(sigset);
     bool success;
-    success = file.open(QIODevice::ReadOnly); if (!success) qFatal("BEE::readSigset unable to open %s for reading.", qPrintable(sigset));
-    success = doc.setContent(&file);          if (!success) qFatal("BEE::readSigset unable to parse %s.", qPrintable(sigset));
+    success = file.open(QIODevice::ReadOnly); if (!success) qFatal("Unable to open %s for reading.", qPrintable(sigset));
+    success = doc.setContent(&file);          if (!success) qFatal("Unable to parse %s.", qPrintable(sigset));
     file.close();
     QDomElement docElem = doc.documentElement();
@@ -75,7 +75,7 @@ FileList BEE::readSigset(const QString &amp;sigset, bool ignoreMetadata)
                 }
             }
-            if (file.isNull()) qFatal("BEE::readSigset empty file-name in %s.", qPrintable(sigset));
+            if (file.isNull()) qFatal("Empty file-name in %s.", qPrintable(sigset));
             fileList.append(file);
             fileNode = fileNode.nextSibling();
@@ -115,7 +115,7 @@ Mat readMatrix(const br::File &amp;matrix)
     if (matrix == "Matrix") {
         const int size = matrix.getInt("Size");
         const int step = matrix.getInt("Step", 1);
-        if (size % step != 0) qFatal("bee.cpp readMatrix step does not divide size evenly.");
+        if (size % step != 0) qFatal("Step does not divide size evenly.");
         if (sizeof(T) == sizeof(BEE::Mask_t)) {
             const bool selfSimilar = matrix.getBool("SelfSimilar");
@@ -140,13 +140,12 @@ Mat readMatrix(const br::File &amp;matrix)
     QFile file(matrix);
     bool success = file.open(QFile::ReadOnly);
-    if (!success) qFatal("bee.cpp readMatrix unable to open %s for reading.", qPrintable((QString)matrix));
+    if (!success) qFatal("Unable to open %s for reading.", qPrintable((QString)matrix));
     // Check format
     QByteArray format = file.readLine();
     bool isDistance = (format[0] == 'D');
-
-    if (format[1] != '2') qFatal("bee.cpp readMatrix invalid matrix header.");
+    if (format[1] != '2') qFatal("Invalid matrix header.");
     // Skip sigset lines
     file.readLine();
@@ -161,7 +160,7 @@ Mat readMatrix(const br::File &amp;matrix)
     qint64 bytesExpected = (qint64)rows*(qint64)cols*(qint64)sizeof(T);
     Mat m(rows, cols, OpenCVType<T,1>::make());
     if (file.read((char*)m.data, bytesExpected) != bytesExpected)
-        qFatal("bee.cpp readMatrix invalid matrix size.");
+        qFatal("Invalid matrix size.");
     file.close();
     Mat result;
@@ -183,17 +182,17 @@ Mat BEE::readMask(const br::File &amp;mask)
 template <typename T>
 void writeMatrix(const Mat &m, const QString &matrix, const QString &targetSigset, const QString &querySigset)
 {
-    if (m.type() != OpenCVType<T,1>::make()) qFatal("bee.cpp writeMatrix invalid matrix type.");
+    if (m.type() != OpenCVType<T,1>::make()) qFatal("Invalid matrix type.");
     int elemSize = sizeof(T);
     QString matrixType;
     if      (elemSize == 1) matrixType = "B";
     else if (elemSize == 4) matrixType = "F";
-    else                    qFatal("bee.cpp writeMatrix invalid element size.\n");
+    else                    qFatal("Invalid element size.");
     char buff[4];
     QFile file(matrix);
-    bool success = file.open(QFile::WriteOnly); if (!success) qFatal("bee.cpp writeMatrix unable to open %s for writing.", qPrintable(matrix));
+    bool success = file.open(QFile::WriteOnly); if (!success) qFatal("Unable to open %s for writing.", qPrintable(matrix));
     file.write("S2\n");
     file.write(qPrintable(QFileInfo(targetSigset).fileName()));
     file.write("\n");
@@ -228,8 +227,8 @@ void BEE::makeMask(const QString &amp;targetInput, const QString &amp;queryInput, const 
 {
     qDebug("Making mask from %s and %s to %s", qPrintable(targetInput), qPrintable(queryInput), qPrintable(mask));
-    FileList targetFiles = TemplateList::fromInput(targetInput).files();
-    FileList queryFiles = TemplateList::fromInput(queryInput).files();
+    FileList targetFiles = TemplateList::fromGallery(targetInput).files();
+    FileList queryFiles = TemplateList::fromGallery(queryInput).files();
     QList<float> targetLabels = targetFiles.labels();
     QList<float> queryLabels = queryFiles.labels();
     QList<int> targetPartitions = targetFiles.crossValidationPartitions();
@@ -266,12 +265,12 @@ void BEE::combineMasks(const QStringList &amp;inputMasks, const QString &amp;outputMask,
     bool AND = true;
     if      (method == "And") AND = true;
     else if (method == "Or")  AND = false;
-    else                      qFatal("combineMasks invalid method");
+    else                      qFatal("Invalid method.");
     QList<Mat> masks;
     foreach (const QString &inputMask, inputMasks)
         masks.append(readMask(inputMask));
-    if (masks.size() < 2) qFatal("BEE::mergeMasks expects at least two masks.");
+    if (masks.size() < 2) qFatal("Expected at least two masks.");
     const int rows = masks.first().rows;
     const int columns = masks.first().cols;
@@ -295,7 +294,7 @@ void BEE::combineMasks(const QStringList &amp;inputMasks, const QString &amp;outputMask,
                     break;
                 }
             }
-            if ((genuineCount != 0) && (imposterCount != 0)) qFatal("BEE::combinedMasks comparison is both a genuine and an imposter.");
+            if ((genuineCount != 0) && (imposterCount != 0)) qFatal("Comparison is both a genuine and an imposter.");
             Mask_t val;
             if      (genuineCount > 0)  val = Match;
@@ -37,14 +37,14 @@ void br::EvalClassification(const QString &amp;predictedInput, const QString &amp;truthI
 {
     qDebug("Evaluating classification of %s against %s", qPrintable(predictedInput), qPrintable(truthInput));
-    TemplateList predicted(TemplateList::fromInput(predictedInput));
-    TemplateList truth(TemplateList::fromInput(truthInput));
-    if (predicted.size() != truth.size()) qFatal("br::EvalClassification input size mismatch.");
+    TemplateList predicted(TemplateList::fromGallery(predictedInput));
+    TemplateList truth(TemplateList::fromGallery(truthInput));
+    if (predicted.size() != truth.size()) qFatal("Input size mismatch.");
     QHash<int, Counter> counters;
     for (int i=0; i<predicted.size(); i++) {
         if (predicted[i].file.name != truth[i].file.name)
-            qFatal("br::EvalClassification input order mismatch.");
+            qFatal("Input order mismatch.");
         const int trueLabel = truth[i].file.label();
         const int predictedLabel = predicted[i].file.label();
@@ -83,15 +83,15 @@ void br::EvalRegression(const QString &amp;predictedInput, const QString &amp;truthInput
 {
     qDebug("Evaluating regression of %s against %s", qPrintable(predictedInput), qPrintable(truthInput));
-    const TemplateList predicted(TemplateList::fromInput(predictedInput));
-    const TemplateList truth(TemplateList::fromInput(truthInput));
-    if (predicted.size() != truth.size()) qFatal("br::EvalRegression input size mismatch.");
+    const TemplateList predicted(TemplateList::fromGallery(predictedInput));
+    const TemplateList truth(TemplateList::fromGallery(truthInput));
+    if (predicted.size() != truth.size()) qFatal("Input size mismatch.");
     float rmsError = 0;
     QStringList truthValues, predictedValues;
     for (int i=0; i<predicted.size(); i++) {
         if (predicted[i].file.name != truth[i].file.name)
-            qFatal("br::EvalRegression input order mismatch.");
+            qFatal("Input order mismatch.");
         rmsError += pow(predicted[i].file.label()-truth[i].file.label(), 2.f);
         truthValues.append(QString::number(truth[i].file.label()));
         predictedValues.append(QString::number(predicted[i].file.label()));
@@ -90,7 +90,7 @@ Neighborhood getNeighborhood(const QStringList &amp;simmats)
     float globalMin = std::numeric_limits<float>::max();
     int numGalleries = (int)sqrt((float)simmats.size());
     if (numGalleries*numGalleries != simmats.size())
-        qFatal("cluser.cpp readGalleries incorrect number of similarity matrices.");
+        qFatal("Incorrect number of similarity matrices.");
     // Process each simmat
     for (int i=0; i<numGalleries; i++) {
@@ -104,7 +104,7 @@ Neighborhood getNeighborhood(const QStringList &amp;simmats)
                 currentRows = m.rows;
                 allNeighbors.resize(currentRows);
             }
-            if (currentRows != m.rows) qFatal("cluster.cpp::getNeighborhood row count mismatch.");
+            if (currentRows != m.rows) qFatal("Row count mismatch.");
             // Get data row by row
             for (int k=0; k<m.rows; k++) {
@@ -278,7 +278,7 @@ void br::EvalClustering(const QString &amp;csv, const QString &amp;input)
 {
     qDebug("Evaluating %s against %s", qPrintable(csv), qPrintable(input));
-    QList<float> labels = TemplateList::fromInput(input).files().labels();
+    QList<float> labels = TemplateList::fromGallery(input).files().labels();
     QHash<int, int> labelToIndex;
     int nClusters = 0;
@@ -322,7 +322,7 @@ br::Clusters br::ReadClusters(const QString &amp;csv)
     Clusters clusters;
     QFile file(csv);
     bool success = file.open(QFile::ReadOnly);
-    if (!success) qFatal("br::ReadClusters failed to open %s for reading.", qPrintable(csv));
+    if (!success) qFatal("Failed to open %s for reading.", qPrintable(csv));
     QStringList lines = QString(file.readAll()).split("\n");
     file.close();
@@ -332,7 +332,7 @@ br::Clusters br::ReadClusters(const QString &amp;csv)
         foreach (const QString &id, ids) {
             bool ok;
             cluster.append(id.toInt(&ok));
-            if (!ok) qFatal("br::ReadClusters non-interger id.");
+            if (!ok) qFatal("Non-interger id.");
         }
         clusters.append(cluster);
     }
@@ -343,7 +343,7 @@ void br::WriteClusters(const Clusters &amp;clusters, const QString &amp;csv)
 {
     QFile file(csv);
     bool success = file.open(QFile::WriteOnly);
-    if (!success) qFatal("br::WriteClusters failed to open %s for writing.", qPrintable(csv));
+    if (!success) qFatal("Failed to open %s for writing.", qPrintable(csv));
     foreach (Cluster cluster, clusters) {
         if (cluster.empty()) continue;
@@ -33,7 +33,7 @@ QList&lt;int&gt; Common::RandSample(int n, int max, int min, bool unique)
     QList<int> samples; samples.reserve(n);
     int range = max-min;
-    if (range <= 0) qFatal("Common::RandSample non-positive range.");
+    if (range <= 0) qFatal("Non-positive range.");
     if (unique && (n >= range)) {
         for (int i=min; i<max; i++)
             samples.append(i);
@@ -40,7 +40,7 @@ struct AlgorithmCore
     void train(const File &input, const QString &model)
     {
-        TemplateList data(TemplateList::fromInput(input));
+        TemplateList data(TemplateList::fromGallery(input));
         if (transform.isNull()) qFatal("Null transform.");
         qDebug("%d training files", data.size());
@@ -118,7 +118,7 @@ struct AlgorithmCore
         if (!fileList.isEmpty() && gallery.contains("cache"))
             return fileList;
-        const TemplateList i(TemplateList::fromInput(input));
+        const TemplateList i(TemplateList::fromGallery(input));
         if (i.isEmpty()) return fileList; // Nothing to enroll
         if (transform.isNull()) qFatal("Null transform.");
@@ -280,9 +280,12 @@ public:
         if (algorithm.isEmpty()) qFatal("No default algorithm set.");
         if (!algorithms.contains(algorithm)) {
+            // Some algorithms are recursive, so we need to construct them outside the lock.
+            QSharedPointer<AlgorithmCore> algorithmCore(new AlgorithmCore(algorithm));
+
             algorithmsLock.lock();
             if (!algorithms.contains(algorithm))
-                algorithms.insert(algorithm, QSharedPointer<AlgorithmCore>(new AlgorithmCore(algorithm)));
+                algorithms.insert(algorithm, algorithmCore);
             algorithmsLock.unlock();
         }
@@ -60,7 +60,7 @@ static void normalizeMatrix(Mat &amp;matrix, const Mat &amp;mask, const QString &amp;method)
             }
         }
     } else if (method == "ZScore") {
-        if (stddev == 0) qFatal("fuse.cpp normalizeMatrix stddev is 0.");
+        if (stddev == 0) qFatal("Stddev is 0.");
                 for (int i=0; i<matrix.rows; i++) {
             for (int j=0; j<matrix.cols; j++) {
                 if (mask.at<BEE::Mask_t>(i,j) == BEE::DontCare) continue;
@@ -71,7 +71,7 @@ static void normalizeMatrix(Mat &amp;matrix, const Mat &amp;mask, const QString &amp;method)
             }
         }
     } else {
-        qFatal("fuse.cpp normalizeMatrix invalid normalization method %s.", qPrintable(method));
+        qFatal("Invalid normalization method %s.", qPrintable(method));
     }
 }
@@ -81,8 +81,8 @@ void br::Fuse(const QStringList &amp;inputSimmats, const QString &amp;mask, const QStrin
     QList<Mat> matrices;
     foreach (const QString &simmat, inputSimmats)
         matrices.append(BEE::readSimmat(simmat));
-    if ((matrices.size() < 2) && (fusion != "None")) qFatal("br::Fuse expected at least two similarity matrices.");
-    if ((matrices.size() > 1) && (fusion == "None")) qFatal("mm:Fuse expected exactly one similarity matrix.");
+    if ((matrices.size() < 2) && (fusion != "None")) qFatal("Expected at least two similarity matrices.");
+    if ((matrices.size() > 1) && (fusion == "None")) qFatal("Expected exactly one similarity matrix.");
     Mat matrix_mask = BEE::readMask(mask);
     for (int i=0; i<matrices.size(); i++)
@@ -107,27 +107,27 @@ void br::Fuse(const QStringList &amp;inputSimmats, const QString &amp;mask, const QStrin
             bool ok;
             for (int k=0; k<matrices.size(); k++) {
                 float weight = words[k].toFloat(&ok);
-                if (!ok) qFatal("br::Fuse non-numerical weight %s.", qPrintable(words[k]));
+                if (!ok) qFatal("Non-numerical weight %s.", qPrintable(words[k]));
                 weights.append(weight);
             }
         } else {
-            qFatal("br::Fuse number of weights does not match number of similarity matrices.");
+            qFatal("Number of weights does not match number of similarity matrices.");
         }
         addWeighted(matrices[0], weights[0], matrices[1], weights[1], 0, fused);
         for (int i=2; i<matrices.size(); i++)
             addWeighted(fused, 1, matrices[i], weights[i], 0, fused);
     } else if (fusion == "Replace") {
-        if (matrices.size() != 2) qFatal("br::Fuse Replace fusion requires exactly two matrices.");
+        if (matrices.size() != 2) qFatal("Replace fusion requires exactly two matrices.");
         fused = matrices.first().clone();
         matrices.last().copyTo(fused, matrix_mask != BEE::DontCare);
     } else if (fusion == "Difference") {
-        if (matrices.size() != 2) qFatal("br::Fuse Difference fusion requires exactly two matrices.");
+        if (matrices.size() != 2) qFatal("Difference fusion requires exactly two matrices.");
         subtract(matrices[0], matrices[1], fused);
     } else if (fusion == "None") {
         fused = matrices[0];
     } else {
-        qFatal("br::Fuse invalid fusion method %s.", qPrintable(fusion));
+        qFatal("Invalid fusion method %s.", qPrintable(fusion));
     }
     BEE::writeSimmat(fused, outputSimmat);
@@ -55,7 +55,7 @@ void OpenCVUtils::saveImage(const Mat &amp;src, const QString &amp;file)
     Mat draw;
     cvtUChar(src, draw);
-    bool success = imwrite(file.toStdString(), draw); if (!success) qFatal("OpenCVUtils::saveImage failed to save %s", qPrintable(file));
+    bool success = imwrite(file.toStdString(), draw); if (!success) qFatal("Failed to save %s", qPrintable(file));
 }
 void OpenCVUtils::showImage(const Mat &src, const QString &window, bool waitKey)
@@ -112,7 +112,7 @@ Mat OpenCVUtils::toMat(const QList&lt;float&gt; &amp;src, int rows)
 {
     if (rows == -1) rows = src.size();
     int columns = src.isEmpty() ? 0 : src.size() / rows;
-    if (rows*columns != src.size()) qFatal("OpenCVUtils::toMat invalid matrix size.");
+    if (rows*columns != src.size()) qFatal("Invalid matrix size.");
     Mat dst(rows, columns, CV_32FC1);
     for (int i=0; i<src.size(); i++)
         dst.at<float>(i/columns,i%columns) = src[i];
@@ -131,7 +131,7 @@ Mat OpenCVUtils::toMat(const QList&lt;Mat&gt; &amp;src)
     for (int i=0; i<rows; i++) {
         const Mat &m = src[i];
         if ((m.total() != total) || (m.type() != type) || !m.isContinuous())
-            qFatal("OpenCVUtils::toMat invalid matrix.");
+            qFatal("Invalid matrix.");
         memcpy(dst.ptr(i), m.ptr(), total * src.first().elemSize());
     }
     return dst;
@@ -149,7 +149,7 @@ Mat OpenCVUtils::toMatByRow(const QList&lt;Mat&gt; &amp;src)
     int row = 0;
     foreach (const Mat &m, src) {
         if ((m.cols != cols) || (m.type() != type) || (!m.isContinuous()))
-            qFatal("OpenCVUtils::toMatByRow invalid matrix.");
+            qFatal("Invalid matrix.");
         memcpy(dst.ptr(row), m.ptr(), m.rows*m.cols*m.elemSize());
         row += m.rows;
     }
@@ -167,7 +167,7 @@ QString OpenCVUtils::elemToString(const Mat &amp;m, int r, int c)
       case CV_32S: return QString::number(m.at<qint32>(r,c));
       case CV_32F: return QString::number(m.at<float>(r,c));
       case CV_64F: return QString::number(m.at<double>(r,c));
-      default:     qFatal("OpenCVUtils::elemToString unknown matrix depth");
+      default:     qFatal("Unknown matrix depth");
     }
     return "?";
 }
@@ -183,7 +183,7 @@ float OpenCVUtils::elemToFloat(const Mat &amp;m, int r, int c)
       case CV_32S: return float(m.at<qint32>(r,c));
       case CV_32F: return float(m.at<float>(r,c));
       case CV_64F: return float(m.at<double>(r,c));
-      default:     qFatal("OpenCVUtils::elemToFloat unknown matrix depth");
+      default:     qFatal("Unknown matrix depth");
     }
     return 0;
 }
@@ -300,10 +300,9 @@ QDataStream &amp;operator&lt;&lt;(QDataStream &amp;stream, const Mat &amp;m)
     int len = rows*cols*m.elemSize();
     stream << len;
     if (len > 0) {
-        if (!m.isContinuous()) qFatal("opencvutils.cpp operator<< Mat can't serialize non-continuous matrices.");
+        if (!m.isContinuous()) qFatal("Can't serialize non-continuous matrices.");
         int written = stream.writeRawData((const char*)m.data, len);
-
-        if (written != len) qFatal("opencvutils.cpp operator<< Mat serialization failure.");
+        if (written != len) qFatal("Serialization failure.");
     }
     return stream;
 }
@@ -309,7 +309,7 @@ struct RPlot
     RPlot(QStringList files, const br::File &destination, bool isEvalFormat = true)
     {
-        if (files.isEmpty()) qFatal("RPlot::RPlot() empty file list.");
+        if (files.isEmpty()) qFatal("Empty file list.");
         qSort(files.begin(), files.end(), sortFiles);
         // Parse destination
@@ -320,7 +320,7 @@ struct RPlot
         file.setFileName(basename+".R");
         bool success = file.open(QFile::WriteOnly);
-        if (!success) qFatal("RPlot::RPlot() failed to open %s for writing.", qPrintable(file.fileName()));
+        if (!success) qFatal("Failed to open %s for writing.", qPrintable(file.fileName()));
         file.write("# Load libraries\n"
                    "library(ggplot2)\n"
@@ -44,7 +44,7 @@ QStringList QtUtils::getFiles(QDir dir, bool recursive)
     foreach (const QString &folder, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
         QDir subdir(dir);
-        bool success = subdir.cd(folder); if (!success) qFatal("QtUtils::getFiles cd failure.");
+        bool success = subdir.cd(folder); if (!success) qFatal("cd failure.");
         files.append(getFiles(subdir, true));
     }
     return files;
@@ -74,7 +74,7 @@ QStringList QtUtils::readLines(const QString &amp;file)
 void QtUtils::readFile(const QString &file, QStringList &lines)
 {
     QFile f(file);
-    if (!f.open(QFile::ReadOnly)) qFatal("QtUtils::readFile unable to open %s for reading.", qPrintable(file));
+    if (!f.open(QFile::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file));
     lines = QString(f.readAll()).split('\n', QString::SkipEmptyParts);
     for (int i=0; i<lines.size(); i++)
         lines[i] = lines[i].simplified();
@@ -84,7 +84,7 @@ void QtUtils::readFile(const QString &amp;file, QStringList &amp;lines)
 void QtUtils::readFile(const QString &file, QByteArray &data, bool uncompress)
 {
     QFile f(file);
-    if (!f.open(QFile::ReadOnly)) qFatal("QtUtils::readFile unable to open %s for reading.", qPrintable(file));
+    if (!f.open(QFile::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file));
     data = f.readAll();
     if (uncompress) data = qUncompress(data);
     f.close();
@@ -112,7 +112,7 @@ void QtUtils::writeFile(const QString &amp;file, const QByteArray &amp;data, int compres
         QFile f(file);
         touchDir(f);
         if (!f.open(QFile::WriteOnly))
-            qFatal("QtUtils::writeFile failed to open %s for writing.", qPrintable(file));
+            qFatal("Failed to open %s for writing.", qPrintable(file));
         f.write(contents);
         f.close();
     }
@@ -139,7 +139,7 @@ void QtUtils::emptyDir(QDir &amp;dir)
 {
     foreach (const QString &folder, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks)) {
         QDir subdir(dir);
-        bool success = subdir.cd(folder); if (!success) qFatal("QtUtils::emptyDir cd failure.");
+        bool success = subdir.cd(folder); if (!success) qFatal("cd failure.");
         emptyDir(subdir);
     }
@@ -163,28 +163,28 @@ QString QtUtils::find(const QString &amp;file, const QString &amp;alt)
 {
     if (QFileInfo(file).exists()) return file;
     if (QFileInfo(alt).exists()) return alt;
-    qFatal("QtUtils::find can't find file %s or alt %s\n", qPrintable(file), qPrintable(alt));
+    qFatal("Can't find file %s or alt %s\n", qPrintable(file), qPrintable(alt));
     return "";
 }
 bool QtUtils::toBool(const QString &string)
 {
     bool ok;
-    bool result = (bool)string.toInt(&ok); if (!ok) qFatal("QtUtils::toBool expected integer value, got %s.", qPrintable(string));
+    bool result = (bool)string.toInt(&ok); if (!ok) qFatal("Expected integer value, got %s.", qPrintable(string));
     return result;
 }
 int QtUtils::toInt(const QString &string)
 {
     bool ok;
-    int result = string.toInt(&ok); if (!ok) qFatal("QtUtils::toInt expected integer value, got %s.", qPrintable(string));
+    int result = string.toInt(&ok); if (!ok) qFatal("Expected integer value, got %s.", qPrintable(string));
     return result;
 }
 float QtUtils::toFloat(const QString &string)
 {
     bool ok;
-    float result = string.toFloat(&ok); if (!ok) qFatal("QtUtils::toFloat expected floating point value, got %s.", qPrintable(string));
+    float result = string.toFloat(&ok); if (!ok) qFatal("Expected floating point value, got %s.", qPrintable(string));
     return result;
 }
@@ -194,7 +194,7 @@ QList&lt;float&gt; QtUtils::toFloats(const QStringList &amp;strings)
     bool ok;
     foreach (const QString &string, strings) {
         floats.append(string.toFloat(&ok));
-        if (!ok) qFatal("QtUtils::toFloats failed to convert %s to floating point format.", qPrintable(string));
+        if (!ok) qFatal("Failed to convert %s to floating point format.", qPrintable(string));
     }
     return floats;
 }
@@ -239,13 +239,13 @@ QStringList QtUtils::parse(QString args, char split)
             } else if ((args[i] == '(') || (args[i] == '[') || (args[i] == '<') || (args[i] == '{')) {
                 subexpressions.push(args[i]);
             } else if (args[i] == ')') {
-                if (subexpressions.pop() != '(') qFatal("QtUtils::parse unexpected ')'.");
+                if (subexpressions.pop() != '(') qFatal("Unexpected ')'.");
             } else if (args[i] == ']') {
-                if (subexpressions.pop() != '[') qFatal("QtUtils::parse unexpected ']'.");
+                if (subexpressions.pop() != '[') qFatal("Unexpected ']'.");
             } else if (args[i] == '>') {
-                if (subexpressions.pop() != '<') qFatal("QtUtils::parse unexpected '>'.");
+                if (subexpressions.pop() != '<') qFatal("Unexpected '>'.");
             } else if (args[i] == '}') {
-                if (subexpressions.pop() != '{') qFatal("QtUtils::parse unexpected '}'.");
+                if (subexpressions.pop() != '{') qFatal("Unexpected '}'.");
             } else if (subexpressions.isEmpty() && (args[i] == split)) {
                 words.append(args.mid(start, i-start).trimmed());
                 start = i+1;
@@ -204,7 +204,7 @@ void br_read_line(int *argc, const char ***argv)
 void br_reformat(const char *target_input, const char *query_input, const char *simmat, const char *output)
 {
-    Output::reformat(TemplateList::fromInput(target_input).files(), TemplateList::fromInput(query_input).files(), simmat, output);
+    Output::reformat(TemplateList::fromGallery(target_input).files(), TemplateList::fromGallery(query_input).files(), simmat, output);
 }
 const char *br_scratch_path()
@@ -95,6 +95,11 @@ QList&lt;File&gt; File::split(const QString &amp;separator) const
     return files;
 }
+QString File::resolved() const
+{
+    return exists() ? name : Globals->path + "/" + name;
+}
+
 bool File::contains(const QString &key) const
 {
     return m_metadata.contains(key) || Globals->contains(key);
@@ -150,7 +155,7 @@ void File::set(const QString &amp;key, const QVariant &amp;value)
 QVariant File::get(const QString &key) const
 {
-    if (!contains(key)) qFatal("File::get missing key: %s", qPrintable(key));
+    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
     return value(key);
 }
@@ -177,9 +182,9 @@ void File::setBool(const QString &amp;key, bool value)
 int File::getInt(const QString &key) const
 {
-    if (!contains(key)) qFatal("File::getInt missing key: %s", qPrintable(key));
+    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
     bool ok; int result = value(key).toInt(&ok);
-    if (!ok) qFatal("File::getInt invalid conversion from: %s", qPrintable(getString(key)));
+    if (!ok) qFatal("Invalid conversion from: %s", qPrintable(getString(key)));
     return result;
 }
@@ -193,9 +198,9 @@ int File::getInt(const QString &amp;key, int defaultValue) const
 float File::getFloat(const QString &key) const
 {
-    if (!contains(key)) qFatal("File::getFloat missing key: %s", qPrintable(key));
+    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
     bool ok; float result = value(key).toFloat(&ok);
-    if (!ok) qFatal("File::getFloat invalid conversion from: %s", qPrintable(getString(key)));
+    if (!ok) qFatal("Invalid conversion from: %s", qPrintable(getString(key)));
     return result;
 }
@@ -209,7 +214,7 @@ float File::getFloat(const QString &amp;key, float defaultValue) const
 QString File::getString(const QString &key) const
 {
-    if (!contains(key)) qFatal("File::getString missing key: %s", qPrintable(key));
+    if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
     return value(key).toString();
 }
@@ -440,14 +445,14 @@ QDataStream &amp;br::operator&gt;&gt;(QDataStream &amp;stream, Template &amp;t)
 }
 /* TemplateList - public methods */
-TemplateList TemplateList::fromInput(const br::File &input)
+TemplateList TemplateList::fromGallery(const br::File &gallery)
 {
     TemplateList templates;
-    foreach (const br::File &file, input.split()) {
+    foreach (const br::File &file, gallery.split()) {
         QScopedPointer<Gallery> i(Gallery::make(file));
         TemplateList newTemplates = i->read();
-        const int crossValidate = input.getInt("crossValidate");
+        const int crossValidate = gallery.getInt("crossValidate");
         if (crossValidate > 0) srand(0);
         // If file is a Format not a Gallery
@@ -456,13 +461,13 @@ TemplateList TemplateList::fromInput(const br::File &amp;input)
         // Propogate metadata
         for (int i=0; i<newTemplates.size(); i++) {
-            newTemplates[i].file.append(input.localMetadata());
+            newTemplates[i].file.append(gallery.localMetadata());
             newTemplates[i].file.append(file.localMetadata());
-            newTemplates[i].file.insert("Input_Index", i+templates.size());
+            newTemplates[i].file.insert("Index", i+templates.size());
             if (crossValidate > 0) newTemplates[i].file.insert("Cross_Validation_Partition", rand()%crossValidate);
         }
-        if (!templates.isEmpty() && input.getBool("merge")) {
+        if (!templates.isEmpty() && gallery.getBool("merge")) {
             if (newTemplates.size() != templates.size())
                 qFatal("Inputs must be the same size in order to merge.");
             for (int i=0; i<templates.size(); i++)
@@ -652,7 +657,7 @@ void Object::setProperty(const QString &amp;name, const QString &amp;value)
     QVariant variant;
     if (type.startsWith("QList<") && type.endsWith(">")) {
-        if (!value.startsWith('[')) qFatal("Object::setProperty expected a list.");
+        if (!value.startsWith('[')) qFatal("Expected a list.");
         const QStringList strings = parse(value.mid(1, value.size()-2));
         if (type == "QList<float>") {
@@ -1014,6 +1019,11 @@ void MatrixOutput::initialize(const FileList &amp;targetFiles, const FileList &amp;query
     data.create(queryFiles.size(), targetFiles.size(), CV_32FC1);
 }
+MatrixOutput *MatrixOutput::make(const FileList &targetFiles, const FileList &queryFiles)
+{
+    return dynamic_cast<MatrixOutput*>(Output::make(".Matrix", targetFiles, queryFiles));
+}
+
 /* MatrixOutput - protected methods */
 QString MatrixOutput::toString(int row, int column) const
 {
@@ -126,7 +126,7 @@ void reset_##NAME() { NAME = DEFAULT; }
  * path            | QString        | Resolve complete file paths from file names
  * enrollAll       | bool           | Enroll zero or more templates per file
  * separator       | QString        | Seperate #name into multiple files
- * Input_Index     | int            | Index of a template in a template list
+ * Index     | int            | Index of a template in a template list
  * Label           | float          | Classification/Regression class
  * Confidence      | float          | Classification/Regression quality
  * FTE             | bool           | Failure to enroll
@@ -153,7 +153,7 @@ struct BR_EXPORT File
     File(const QString &file) { init(file); } /*!< \brief Construct a file from a string. */
     File(const QString &file, const QVariant &label) { init(file); insert("Label", label); } /*!< \brief Construct a file from a string and assign a label. */
     File(const char *file) { init(file); } /*!< \brief Construct a file from a c-style string. */
-    operator QString() const { return name; } /*!< \brief Returns #name. */
+    inline operator QString() const { return name; } /*!< \brief Returns #name. */
     QString flat() const; /*!< \brief A stringified version of the file with metadata. */
     QString hash() const; /*!< \brief A hash of the file. */
     inline void clear() { name.clear(); m_metadata.clear(); } /*!< \brief Clears the file's name and metadata. */
@@ -187,6 +187,7 @@ struct BR_EXPORT File
     inline QString baseName() const { const QString baseName = QFileInfo(name).baseName();
                                       return baseName.isEmpty() ? QDir(name).dirName() : baseName; } /*!< \brief Returns the file's base name. */
     inline QString suffix() const { return QFileInfo(name).suffix(); } /*!< \brief Returns the file's extension. */
+    QString resolved() const; /*!< \brief Returns name prepended with Globals->path if name does not exist. */
     bool contains(const QString &key) const; /*!< \brief Returns \c true if the key has an associated value, \c false otherwise. */
     QVariant value(const QString &key) const; /*!< \brief Returns the value for the specified key. */
@@ -276,7 +277,7 @@ struct Template : public QList&lt;cv::Mat&gt;
     Template(const cv::Mat &mat) { append(mat); } /*!< \brief Append a matrix. */
     inline const cv::Mat &m() const { static const cv::Mat NullMatrix;
-                                      return isEmpty() ? qFatal("Template::m() empty template."), NullMatrix : last(); } /*!< \brief Idiom to treat the template as a matrix. */
+                                      return isEmpty() ? qFatal("Empty template."), NullMatrix : last(); } /*!< \brief Idiom to treat the template as a matrix. */
     inline cv::Mat &m() { return isEmpty() ? append(cv::Mat()), last() : last(); } /*!< \brief Idiom to treat the template as a matrix. */
     inline cv::Mat &operator=(const cv::Mat &other) { return m() = other; } /*!< \brief Idiom to treat the template as a matrix. */
     inline operator const cv::Mat&() const { return m(); } /*!< \brief Idiom to treat the template as a matrix. */
@@ -330,9 +331,10 @@ struct TemplateList : public QList&lt;Template&gt;
     TemplateList() : uniform(false) {}
     TemplateList(const QList<Template> &templates) : uniform(false) { append(templates); } /*!< \brief Initialize the template list from another template list. */
-    TemplateList(const QList<File> &files) : uniform(false) { foreach (const File &file, files) append(file); }
-    BR_EXPORT static TemplateList fromInput(const File &input); /*!< \brief Create a template list from a br::Input. */
+    TemplateList(const QList<File> &files) : uniform(false) { foreach (const File &file, files) append(file); } /*!< \brief Initialize the template list from a file list. */
+    BR_EXPORT static TemplateList fromGallery(const File &gallery); /*!< \brief Create a template list from a br::Gallery. */
     BR_EXPORT static TemplateList relabel(const TemplateList &tl); /*!< \brief Ensure labels are in the range [0,numClasses-1]. */
+
     /*!
      * \brief Returns the total number of bytes in all the templates.
      */
@@ -365,6 +367,11 @@ struct TemplateList : public QList&lt;Template&gt;
     }
     /*!
+     * \brief Returns #br::Template::file for each template in the list.
+     */
+    FileList operator()() const { return files(); }
+
+    /*!
      * \brief Returns br::Template::label() for each template in the list.
      */
     template <typename T>
@@ -859,6 +866,11 @@ class BR_EXPORT MatrixOutput : public Output
 public:
     cv::Mat data; /*!< \brief The similarity matrix. */
+    /*!
+     * \brief Make a MatrixOutput from gallery and probe file lists.
+     */
+    static MatrixOutput *make(const FileList &targetFiles, const FileList &queryFiles);
+
 protected:
     QString toString(int row, int column) const; /*!< \brief Converts the value requested similarity score to a string. */
@@ -37,7 +37,7 @@ public:
         else if (model == "Eye")         file += "haarcascades/haarcascade_eye_tree_eyeglasses.xml";
         else if (model == "FrontalFace") file += "haarcascades/haarcascade_frontalface_alt2.xml";
         else if (model == "ProfileFace") file += "haarcascades/haarcascade_profileface.xml";
-        else                             qFatal("CascadeResourceMaker::CascadeResourceMaker invalid model.");
+        else                             qFatal("Invalid model.");
     }
 private:
@@ -45,7 +45,7 @@ private:
     {
         CascadeClassifier *cascade = new CascadeClassifier();
         if (!cascade->load(file.toStdString()))
-            qFatal("CascadeResourceMaker::make failed to load: %s", qPrintable(file));
+            qFatal("Failed to load: %s", qPrintable(file));
         return cascade;
     }
 };
@@ -87,7 +87,7 @@ private:
         }
         if (result != result)
-            qFatal("Dist::compare NaN result.");
+            qFatal("NaN result.");
         return -log(result+1);
     }
@@ -82,7 +82,7 @@ private:
     void train(const TemplateList &trainingSet)
     {
         if (trainingSet.first().m().type() != CV_32FC1)
-            qFatal("PCA::train requires single channel 32-bit floating point matrices.");
+            qFatal("Requires single channel 32-bit floating point matrices.");
         originalRows = trainingSet.first().m().rows;
         int dimsIn = trainingSet.first().m().rows * trainingSet.first().m().cols;
@@ -156,7 +156,7 @@ private:
             }
         } else {
             if (keep + drop > allEVals.rows())
-                qFatal("PCA::train insufficient samples, needed at least %d but only got %d.", (int)keep + drop, (int)allEVals.rows());
+                qFatal("Insufficient samples, needed at least %d but only got %d.", (int)keep + drop, (int)allEVals.rows());
         }
         // Keep highest energy vectors
@@ -71,10 +71,10 @@ public:
         // Open the eye locator model
         file.setFileName(Globals->sdkPath + "/share/openbr/models/EyeLocatorASEF128x128.fel");
-        bool success = file.open(QFile::ReadOnly); if (!success) qFatal("ASEFEyes::ASEFEyes failed to open %s for reading.", qPrintable(file.fileName()));
+        if (!file.open(QFile::ReadOnly)) qFatal("Failed to open %s for reading.", qPrintable(file.fileName()));
         // Check the first line
-        line = file.readLine().simplified(); if (line != "CFEL") qFatal("ASEFEyes::ASEFEyes invalid header.");
+        if (file.readLine().simplified() != "CFEL") qFatal("Invalid header.");
         // Read past the comment and copyright.
         file.readLine();
@@ -114,7 +114,7 @@ class BlendTransform : public UntrainableMetaTransform
     void project(const Template &src, Template &dst) const
     {
-        if (src.size() != 2) qFatal("Blend::project expected two source matrices.");
+        if (src.size() != 2) qFatal("Expected two source matrices.");
         addWeighted(src[0], alpha, src[1], 1-alpha, 0, dst);
     }
 };
@@ -130,7 +130,7 @@ class CSDNTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
-        if (src.m().channels() != 1) qFatal("ContrastEq::project expected single channel source matrix.");
+        if (src.m().channels() != 1) qFatal("Expected single channel source matrix.");
         const int nRows = src.m().rows;
         const int nCols = src.m().cols;
@@ -180,7 +180,7 @@ class ContrastEqTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
-        if (src.m().channels() != 1) qFatal("ContrastEq::project expected single channel source matrix.");
+        if (src.m().channels() != 1) qFatal("Expected single channel source matrix.");
         // Stage 1
         Mat stage1;
@@ -112,7 +112,7 @@ class binFormat : public Format
     {
         Mat m;
         t.m().convertTo(m, CV_32F);
-        if (m.channels() != 1) qFatal("binFormat::write only supports single channel matrices.");
+        if (m.channels() != 1) qFatal("Only supports single channel matrices.");
         QByteArray data;
         QDataStream stream(&data, QFile::WriteOnly);
@@ -168,8 +168,8 @@ class csvFormat : public Format
     void write(const Template &t) const
     {
         const Mat &m = t.m();
-        if (t.size() != 1) qFatal("csvFormat::write only supports single matrix templates.");
-        if (m.channels() != 1) qFatal("csvFormat::write only supports single channel matrices.");
+        if (t.size() != 1) qFatal("Only supports single matrix templates.");
+        if (m.channels() != 1) qFatal("Only supports single channel matrices.");
         QStringList lines; lines.reserve(m.rows);
         for (int r=0; r<m.rows; r++) {
@@ -337,7 +337,7 @@ class matFormat : public Format
             int skipBytes = (bytes < 4) ? (4 - bytes) : (8 - bytes%8)%8;
             if (skipBytes != 0) stream.skipRawData(skipBytes);
-            if (error) qFatal("matFormat::Element Unexpected end of file.");
+            if (error) qFatal("Unexpected end of file.");
         }
         void print() const
@@ -356,7 +356,7 @@ class matFormat : public Format
             QByteArray header(128, 0);
             f.readRawData(header.data(), 128);
             if (!header.startsWith("MATLAB 5.0 MAT-file"))
-                qFatal("matFormat::read Invalid MAT header.");
+                qFatal("Invalid MAT header.");
         }
         Template t(file);
@@ -426,7 +426,7 @@ class matFormat : public Format
         for (int i=0; i<t.size(); i++) {
             const Mat &m = t[i];
-            if (m.channels() != 1) qFatal("matFormat::write only supports single channel matrices.");
+            if (m.channels() != 1) qFatal("Only supports single channel matrices.");
             QByteArray subdata;
             QDataStream substream(&subdata, QFile::WriteOnly);
@@ -443,7 +443,7 @@ class matFormat : public Format
                   case CV_16UC1: arrayClass = 10; break;
                   case CV_16SC1: arrayClass = 11; break;
                   case CV_32SC1: arrayClass = 12; break;
-                  default: qFatal("matFormat::write unsupported matrix class.");
+                  default: qFatal("Unsupported matrix class.");
                 }
                 substream.writeRawData((const char*)&type, 4);
                 substream.writeRawData((const char*)&bytes, 4);
@@ -480,7 +480,7 @@ class matFormat : public Format
                   case CV_32SC1: type = 5; break;
                   case CV_32FC1: type = 7; break;
                   case CV_64FC1: type = 9; break;
-                  default: qFatal("matFormat::write unsupported matrix type.");
+                  default: qFatal("Unsupported matrix type.");
                 }
                 quint32 bytes = m.elemSize() * m.rows * m.cols;
                 QByteArray buffer((8 - bytes%8)%8, 0);
@@ -531,7 +531,7 @@ class webcamFormat : public Format
     void write(const Template &t) const
     {
         (void) t;
-        qFatal("webcamFormat::write not supported.");
+        qFatal("Not supported.");
     }
 };
@@ -552,8 +552,8 @@ class xmlFormat : public Format
     {
         QDomDocument doc(file);
         QFile f(file);
-        if (!f.open(QIODevice::ReadOnly)) qFatal("xmlFormat::read unable to open %s for reading.", qPrintable(file.flat()));
-        if (!doc.setContent(&f))          qFatal("xmlFormat::read unable to parse %s.", qPrintable(file.flat()));
+        if (!f.open(QIODevice::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(file.flat()));
+        if (!doc.setContent(&f))          qFatal("Unable to parse %s.", qPrintable(file.flat()));
         f.close();
         Template t;
@@ -599,7 +599,7 @@ class xmlFormat : public Format
     void write(const Template &t) const
     {
         (void) t;
-        qFatal("xmlFormat::write not supported.");
+        qFatal("Not supported.");
     }
 };
@@ -80,7 +80,7 @@ BR_REGISTER(Gallery, galGallery)
 /*!
  * \ingroup galleries
- * \brief Reads and writes templates to folders of images.
+ * \brief Reads/writes templates to/from folders.
  * \author Josh Klontz \cite jklontz
  */
 class EmptyGallery : public Gallery
@@ -120,9 +120,14 @@ class EmptyGallery : public Gallery
         // Enrolling a null file is used as an idiom to initialize an algorithm
         if (file.name.isEmpty()) return;
-        QMutexLocker diskLocker(&diskLock);
-        if (t.isNull()) QFile::copy((t.file.exists() ? QString() : Globals->path+"/") + t.file.name, file.name + "/" + t.file.fileName());
-        else            OpenCVUtils::saveImage(t, file.name + "/" + t.file.baseName() + ".png");
+        const QString destination = file.name + "/" + t.file.fileName();
+        QMutexLocker diskLocker(&diskLock); // Windows prefers to crash when writing to disk in parallel
+        if (t.isNull()) {
+            QFile::copy(t.file.resolved(), destination);
+        } else {
+            QScopedPointer<Format> format(Factory<Format>::make(destination));
+            format->write(t);
+        }
     }
 };
@@ -286,12 +291,12 @@ class memGallery : public Gallery
         size_t offset = 0;
         for (int i=0; i<templates.size(); i++) {
             Template &t = templates[i];
-            if (t.size() > 1) qFatal("memGallery::align can't handle multi-matrix template %s.", qPrintable(t.file.flat()));
+            if (t.size() > 1) qFatal("Can't handle multi-matrix template %s.", qPrintable(t.file.flat()));
             cv::Mat &m = t;
             if (m.data) {
                 const size_t size = m.total() * m.elemSize();
-                if (!m.isContinuous()) qFatal("memGallery::align requires continuous matrix data of size %d for %s.", (int)size, qPrintable(t.file.flat()));
+                if (!m.isContinuous()) qFatal("Requires continuous matrix data of size %d for %s.", (int)size, qPrintable(t.file.flat()));
                 memcpy(&(alignedData.data()[offset]), m.ptr(), size);
                 m = cv::Mat(m.rows, m.cols, m.type(), &(alignedData.data()[offset]));
                 offset += size;
@@ -591,7 +596,7 @@ class dbGallery : public Gallery
     void write(const Template &t)
     {
         (void) t;
-        qFatal("Writing not supported.");
+        qFatal("Not supported.");
     }
 };
@@ -644,7 +649,7 @@ class googleGallery : public Gallery
     void write(const Template &t)
     {
         (void) t;
-        qFatal("Writing to a txtGallery not supported.");
+        qFatal("Not supported.");
     }
 };
@@ -42,7 +42,7 @@ class KeyPointDetectorTransform : public UntrainableTransform
     {
         featureDetector = FeatureDetector::create(detector.toStdString());
         if (featureDetector.empty())
-            qFatal("KeyPointDetector::init failed to create KeyPointDetector: %s", qPrintable(detector));
+            qFatal("Failed to create KeyPointDetector: %s", qPrintable(detector));
     }
     void project(const Template &src, Template &dst) const
@@ -85,7 +85,7 @@ class KeyPointDescriptorTransform : public UntrainableTransform
     {
         descriptorExtractor = DescriptorExtractor::create(descriptor.toStdString());
         if (descriptorExtractor.empty())
-            qFatal("KeyPointDescriptor::make failed to create DescriptorExtractor: %s", qPrintable(descriptor));
+            qFatal("Failed to create DescriptorExtractor: %s", qPrintable(descriptor));
     }
     void project(const Template &src, Template &dst) const
@@ -123,7 +123,7 @@ class KeyPointMatcherTransform : public Distance
     {
         descriptorMatcher = DescriptorMatcher::create(matcher.toStdString());
         if (descriptorMatcher.empty())
-            qFatal("KeyPointMatcher::make failed to create DescriptorMatcher: %s", qPrintable(matcher));
+            qFatal("Failed to create DescriptorMatcher: %s", qPrintable(matcher));
     }
     float compare(const Template &a, const Template &b) const
@@ -171,7 +171,7 @@ class ColoredU2Transform : public UntrainableTransform
         }
         if (src.m().type() != CV_8UC1)
-            qFatal("ColoredU2::project expected 8UC1 source type.");
+            qFatal("Expected 8UC1 source type.");
         Mat hue, saturation, value;
         LUT(src, hueLUT, hue);
@@ -59,7 +59,7 @@ class GradientMaskTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         const Mat &m = src.m();
-        if (m.type() != CV_8UC1) qFatal("GradientMask operates on 8UC1 matrices.");
+        if (m.type() != CV_8UC1) qFatal("Requires 8UC1 matrices.");
         Mat n = Mat(m.rows, m.cols, CV_8UC1);
         n.setTo(255);
         for (int i=0; i<m.rows; i++) {
@@ -39,8 +39,8 @@ static TemplateList Simplified(const TemplateList &amp;templates)
         const bool fte = t.file.getBool("FTE");
         QList<QPointF> landmarks = t.file.landmarks();
         QList<QRectF> ROIs = t.file.ROIs();
-        if (landmarks.size() % t.size() != 0) qFatal("TemplateList::simplified uneven landmark count.");
-        if (ROIs.size() % t.size() != 0) qFatal("TemplateList::simplified uneven ROI count.");
+        if (landmarks.size() % t.size() != 0) qFatal("Uneven landmark count.");
+        if (ROIs.size() % t.size() != 0) qFatal("Uneven ROI count.");
         const int landmarkStep = landmarks.size() / t.size();
         const int ROIStep = ROIs.size() / t.size();
@@ -281,7 +281,7 @@ class ForkTransform : public MetaTransform
             foreach (const Transform *f, transforms) {
                 TemplateList m;
                 f->project(src, m);
-                if (m.size() != dst.size()) qFatal("Fork::project templateList is of an unexpected size.");
+                if (m.size() != dst.size()) qFatal("TemplateList is of an unexpected size.");
                 for (int i=0; i<src.size(); i++) dst[i].append(m[i]);
             }
         } else {
@@ -313,7 +313,8 @@ public:
         // Write to cache
         QFile file("Cache");
-        bool success = file.open(QFile::WriteOnly); if (!success) qFatal("Cache::Cache unable to open %s for writing.", qPrintable(file.fileName()));
+        if (!file.open(QFile::WriteOnly))
+            qFatal("Unable to open %s for writing.", qPrintable(file.fileName()));
         QDataStream stream(&file);
         stream << cache;
         file.close();
@@ -327,7 +328,8 @@ private:
         // Read from cache
         QFile file("Cache");
         if (file.exists()) {
-            bool success = file.open(QFile::ReadOnly); if (!success) qFatal("Cache::make unable to open %s for reading.", qPrintable(file.fileName()));
+            if (!file.open(QFile::ReadOnly))
+                qFatal("Unable to open %s for reading.", qPrintable(file.fileName()));
             QDataStream stream(&file);
             stream >> cache;
             file.close();
@@ -458,7 +460,8 @@ class FTETransform : public Transform
         QList<float> vals;
         foreach (const Template &t, projectedData) {
-            if (!t.file.contains(transform->objectName())) qFatal("FTE::train matrix metadata missing key %s.", qPrintable(transform->objectName()));
+            if (!t.file.contains(transform->objectName()))
+                qFatal("Matrix metadata missing key %s.", qPrintable(transform->objectName()));
             vals.append(t.file.getFloat(transform->objectName()));
         }
         float q1, q3;
@@ -100,7 +100,7 @@ private:
         if      (method == Mean)   mean(m.col(i), &A, &B);
         else if (method == Median) median(m.col(i), &A, &B);
         else if (method == Range)  range(m.col(i), &A, &B);
-        else                       qFatal("Center::train invalid method");
+        else                       qFatal("Invalid method.");
         ca->at<double>(0, i) = A;
         cb->at<double>(0, i) = B;
     }
@@ -54,7 +54,6 @@ class PerPixelClassifierTransform : public MetaTransform
     void rotate(Template &src, Template &dst) const
     {
-        //if (src.m().cols%9 != 0) qFatal("Rotation invariance can only be used after Neighbors");
         int images =  (src.m().cols)/9;
         dst = src;
         for (int i = 0; i < images; i++){
@@ -283,7 +283,7 @@ class PP5Compare : public Distance
     {
         (void) target;
         (void) query;
-        qFatal("PP5Compare::compare (single templates) should never be called!");
+        qFatal("Compare single templates should never be called!");
         return 0;
     }
@@ -158,15 +158,15 @@ class MatchProbabilityDistance : public Distance
         distance->train(src);
         const QList<int> labels = src.labels<int>();
-        QScopedPointer<MatrixOutput> memoryOutput(dynamic_cast<MatrixOutput*>(Output::make(".Matrix", FileList(src.size()), FileList(src.size()))));
-        distance->compare(src, src, memoryOutput.data());
+        QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(src.size()), FileList(src.size())));
+        distance->compare(src, src, matrixOutput.data());
         QList<float> genuineScores, impostorScores;
         genuineScores.reserve(labels.size());
         impostorScores.reserve(labels.size()*labels.size());
         for (int i=0; i<src.size(); i++) {
             for (int j=0; j<i; j++) {
-                const float score = memoryOutput.data()->data.at<float>(i, j);
+                const float score = matrixOutput.data()->data.at<float>(i, j);
                 if (score == -std::numeric_limits<float>::max()) continue;
                 if (labels[i] == labels[j]) genuineScores.append(score);
                 else                        impostorScores.append(score);
@@ -217,8 +217,8 @@ class UnitDistance : public Distance
     {
         const TemplateList samples = templates.mid(0, 2000);
         const QList<float> sampleLabels = samples.labels<float>();
-        QScopedPointer<MatrixOutput> memoryOutput(dynamic_cast<MatrixOutput*>(Output::make(".Matrix", FileList(samples.size()), FileList(samples.size()))));
-        Distance::compare(samples, samples, memoryOutput.data());
+        QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(samples.size()), FileList(samples.size())));
+        Distance::compare(samples, samples, matrixOutput.data());
         double genuineAccumulator, impostorAccumulator;
         int genuineCount, impostorCount;
@@ -226,7 +226,7 @@ class UnitDistance : public Distance
         for (int i=0; i<samples.size(); i++) {
             for (int j=0; j<i; j++) {
-                const float val = memoryOutput.data()->data.at<float>(i, j);
+                const float val = matrixOutput.data()->data.at<float>(i, j);
                 if (sampleLabels[i] == sampleLabels[j]) {
                     genuineAccumulator += val;
                     genuineCount++;
@@ -95,7 +95,7 @@ class PackTransform : public UntrainableTransform
     {
         const Mat &m = src;
         if ((m.cols % 2 != 0) || (m.type() != CV_8UC1))
-            qFatal("Pack::project invalid template format.");
+            qFatal("Invalid template format.");
         Mat n(m.rows, m.cols/2, CV_8UC1);
         for (int i=0; i<m.rows; i++)
@@ -32,7 +32,7 @@ class SubtractTransform : public UntrainableMetaTransform
     void project(const Template &src, Template &dst) const
     {
-        if (src.size() != 2) qFatal("Subtract::project expected exactly two source images, got %d.", src.size());
+        if (src.size() != 2) qFatal("Expected exactly two source images, got %d.", src.size());
         dst.file = src.file;
         subtract(src[0], src[1], dst);
     }
@@ -51,7 +51,7 @@ class AbsDiffTransform : public UntrainableMetaTransform
     void project(const Template &src, Template &dst) const
     {
-        if (src.size() != 2) qFatal("AbsDiff::project expected exactly two source images, got %d.", src.size());
+        if (src.size() != 2) qFatal("Expected exactly two source images, got %d.", src.size());
         dst.file = src.file;
         absdiff(src[0], src[1], dst);
     }
@@ -89,7 +89,7 @@ class CatTransform : public UntrainableMetaTransform
         dst.file = src.file;
         if (src.size() % partitions != 0)
-            qFatal("Cat %d partitions does not evenly divide %d matrices.", partitions, src.size());
+            qFatal("%d partitions does not evenly divide %d matrices.", partitions, src.size());
         QVector<int> sizes(partitions, 0);
         for (int i=0; i<src.size(); i++)
             sizes[i%partitions] += src[i].total() * src[i].channels();
@@ -86,7 +86,7 @@ private:
         }
         if (data.type() != CV_32FC1)
-            qFatal("SVM::train expected single channel floating point training data.");
+            qFatal("Expected single channel floating point training data.");
         CvSVMParams params;
         params.kernel_type = kernel;
@@ -71,7 +71,7 @@ class OrigLinearRegressionTransform : public UntrainableMetaTransform
     void project(const Template &src, Template &dst) const
     {
-        if (src.size() != 3) qFatal("OrigLinearRegression::project expected exactly three source images, got %d.", src.size());
+        if (src.size() != 3) qFatal("Expected exactly three source images, got %d.", src.size());
         Mat m1; src[0].convertTo(m1, CV_32F); assert(m1.isContinuous() && (m1.channels() == 1));
         Mat m2; src[1].convertTo(m2, CV_32F); assert(m2.isContinuous() && (m2.channels() == 1));
         Mat m3; src[2].convertTo(m3, CV_32F); assert(m3.isContinuous() && (m3.channels() == 1));
@@ -109,7 +109,7 @@ private:
         else if (component == Imaginary) dst = imaginary;
         else if (component == Magnitude) dst = magnitude;
         else if (component == Phase)     dst = phase;
-        else                             qFatal("Gabor::project invalid component.");
+        else                             qFatal("Invalid component.");
     }
 };
@@ -183,7 +183,7 @@ class GaborJetTransform : public UntrainableTransform
         else if (component == GaborTransform::Imaginary) dst = imaginary;
         else if (component == GaborTransform::Magnitude) dst = magnitude;
         else if (component == GaborTransform::Phase)     dst = phase;
-        else                                             qFatal("GaborJet::response invalid component.");
+        else                                             qFatal("Invalid component.");
         return dst;
     }
+#include <openbr_plugin.h>
+
+namespace br
+{
+
+/*!
+ * \ingroup transforms
+ * \brief Implements the YouTubesFaceDB \cite wolf11 experimental protocol.
+ * \author Josh Klontz \cite jklontz
+ */
+class YouTubeFacesDBTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+    Q_PROPERTY(QString algorithm READ get_algorithm WRITE set_algorithm RESET reset_algorithm STORED false)
+    BR_PROPERTY(QString, algorithm, "")
+
+    QSharedPointer<Transform> transform;
+    QSharedPointer<Distance> distance;
+
+    void init()
+    {
+        transform = Transform::fromAlgorithm(algorithm);
+        distance = Distance::fromAlgorithm(algorithm);
+    }
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst = src;
+
+        // First input is the header in 'splits.txt'
+        if (src.file.getInt("Index") == 0) return;
+
+        const QStringList words = src.file.name.split(", ");
+        dst.file.name = words[0] + "_" + words[1] + "_" + words[4] + ".mtx";
+
+        TemplateList queryTemplates = TemplateList::fromGallery(File(words[2]).resolved());
+        queryTemplates >> *transform;
+
+        TemplateList targetTemplates = TemplateList::fromGallery(File(words[3]).resolved());
+        targetTemplates >> *transform;
+
+        QScopedPointer<MatrixOutput> memoryOutput(MatrixOutput::make(targetTemplates.files(), queryTemplates.files()));
+        distance->compare(targetTemplates, queryTemplates, memoryOutput.data());
+
+        dst.clear();
+        dst.m() = memoryOutput.data()->data;
+    }
+};
+
+BR_REGISTER(Transform, YouTubeFacesDBTransform)
+
+} // namespace br
+
+#include "youtube.moc"
@@ -162,6 +162,14 @@
 	Title = {Spectral Hashing},
 	Year = {2008}}
+@inproceedings{wolf11, 
+	author={Wolf, L. and Hassner, T. and Maoz, I.}, 
+	booktitle={Computer Vision and Pattern Recognition (CVPR), 2011 IEEE Conference on},
+	title={Face recognition in unconstrained videos with matched background similarity}, 
+	year={2011}, 
+	month={june}, 
+	pages={529-534}}
+
 @mastersthesis{zauner10,
 	Author = {Zauner, C.},
 	School = {Upper Austria University of Applied Sciences, Hagenberg Campus},