Merge pull request #53 from biometrics/local_remap

Changes to subject/label

Merge pull request #53 from biometrics/local_remap
Changes to subject/label
jklontz
2 parents 9e34c2c0 dc645cee
Showing 25 changed files with 195 additions and 421 deletions
app/examples/age_estimation.cpp
app/examples/gender_estimation.cpp
openbr/core/bee.cpp
openbr/core/classify.cpp
openbr/core/cluster.cpp
openbr/core/core.cpp
openbr/core/opencvutils.cpp
openbr/core/opencvutils.h
openbr/frvt2012.cpp
openbr/gui/classifier.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/cluster.cpp
openbr/plugins/eigen3.cpp
openbr/plugins/gallery.cpp
openbr/plugins/independent.cpp
openbr/plugins/meta.cpp
openbr/plugins/normalize.cpp
openbr/plugins/output.cpp
openbr/plugins/pixel.cpp
@@ -29,7 +29,7 @@
 static void printTemplate(const br::Template &t)
 {
-    printf("%s age: %d\n", qPrintable(t.file.fileName()), int(t.file.label()));
+    printf("%s age: %d\n", qPrintable(t.file.fileName()), int(t.file.get<float>("Subject")));
 }
 int main(int argc, char *argv[])
@@ -29,7 +29,7 @@
 static void printTemplate(const br::Template &t)
 {
-    printf("%s gender: %s\n", qPrintable(t.file.fileName()), t.file.label() == 1 ? "Female" : "Male");
+    printf("%s gender: %s\n", qPrintable(t.file.fileName()), qPrintable(t.file.get<QString>("Subject")));
 }
 int main(int argc, char *argv[])
@@ -96,7 +96,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.subject() +"\">");
+        lines.append("\t<biometric-signature name=\"" + file.get<QString>("Subject") +"\">");
         lines.append("\t\t<presentation file-name=\"" + file.name + "\" " + metadata.join(" ") + "/>");
         lines.append("\t</biometric-signature>");
     }
@@ -260,26 +260,28 @@ void BEE::makeMask(const QString &amp;targetInput, const QString &amp;queryInput, const 
 cv::Mat BEE::makeMask(const br::FileList &targets, const br::FileList &queries, int partition)
 {
-    QList<float> targetLabels = targets.labels();
-    QList<float> queryLabels = queries.labels();
+    // Would like to use indexProperty for this, but didn't make a version of that for Filelist yet
+    // -cao
+    QList<QString> targetLabels = targets.get<QString>("Subject", "-1");
+    QList<QString> queryLabels = queries.get<QString>("Subject", "-1");
     QList<int> targetPartitions = targets.crossValidationPartitions();
     QList<int> queryPartitions = queries.crossValidationPartitions();
     Mat mask(queries.size(), targets.size(), CV_8UC1);
     for (int i=0; i<queries.size(); i++) {
         const QString &fileA = queries[i];
-        const int labelA = queryLabels[i];
+        const QString labelA = queryLabels[i];
         const int partitionA = queryPartitions[i];
         for (int j=0; j<targets.size(); j++) {
             const QString &fileB = targets[j];
-            const int labelB = targetLabels[j];
+            const QString labelB = targetLabels[j];
             const int partitionB = targetPartitions[j];
             Mask_t val;
             if      (fileA == fileB)           val = DontCare;
-            else if (labelA == -1)             val = DontCare;
-            else if (labelB == -1)             val = DontCare;
+            else if (labelA == "-1")             val = DontCare;
+            else if (labelB == "-1")             val = DontCare;
             else if (partitionA != partition)  val = DontCare;
             else if (partitionB == -1)         val = NonMatch;
             else if (partitionB != partition)  val = DontCare;
@@ -45,8 +45,8 @@ 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.
-        QString predictedSubject = predicted[i].file.subject();
-        QString trueSubject = truth[i].file.subject();
+        QString predictedSubject = predicted[i].file.get<QString>("Subject");
+        QString trueSubject = truth[i].file.get<QString>("Subject");
         QStringList predictedSubjects(predictedSubject);
         QStringList trueSubjects(trueSubject);
@@ -66,11 +66,12 @@ void br::EvalClassification(const QString &amp;predictedInput, const QString &amp;truthI
                 counters[subject].falsePositive += 1.f / predictedSubjects.size();
     }
-    QSharedPointer<Output> output(Output::make("", FileList() << "Subject" << "Count" << "Precision" << "Recall" << "F-score", FileList(counters.size())));
+    const QStringList keys = counters.keys();
+    QSharedPointer<Output> output(Output::make("", FileList() << "Count" << "Precision" << "Recall" << "F-score", FileList(keys)));
     int tpc = 0;
     int fnc = 0;
-    const QStringList keys = counters.keys();
+
     for (int i=0; i<counters.size(); i++) {
         const QString &subject = keys[i];
         const Counter &counter = counters[subject];
@@ -80,11 +81,10 @@ void br::EvalClassification(const QString &amp;predictedInput, const QString &amp;truthI
         const float precision = counter.truePositive / (float)(counter.truePositive + counter.falsePositive);
         const float recall = counter.truePositive / (float)(counter.truePositive + counter.falseNegative);
         const float fscore = 2 * precision * recall / (precision + recall);
-        output->setRelative(File("", subject).label(), i, 0);
-        output->setRelative(count, i, 1);
-        output->setRelative(precision, i, 2);
-        output->setRelative(recall, i, 3);
-        output->setRelative(fscore, i, 4);
+	output->setRelative(count, i, 0);
+	output->setRelative(precision, i, 1);
+	output->setRelative(recall, i, 2);
+	output->setRelative(fscore, i, 3);
     }
     qDebug("Overall Accuracy = %f", (float)tpc / (float)(tpc + fnc));
@@ -103,9 +103,9 @@ void br::EvalRegression(const QString &amp;predictedInput, const QString &amp;truthInput
     for (int i=0; i<predicted.size(); i++) {
         if (predicted[i].file.name != truth[i].file.name)
             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()));
+        rmsError += pow(predicted[i].file.get<float>("Subject")-truth[i].file.get<float>("Subject"), 2.f);
+        truthValues.append(QString::number(truth[i].file.get<float>("Subject")));
+        predictedValues.append(QString::number(predicted[i].file.get<float>("Subject")));
     }
     QStringList rSource;
@@ -278,7 +278,9 @@ void br::EvalClustering(const QString &amp;csv, const QString &amp;input)
 {
     qDebug("Evaluating %s against %s", qPrintable(csv), qPrintable(input));
-    QList<float> labels = TemplateList::fromGallery(input).files().labels();
+    // We assume clustering algorithms store assigned cluster labels as integers (since the clusters are
+    // not named).
+    QList<int> labels = TemplateList::fromGallery(input).files().get<int>("Subject");
     QHash<int, int> labelToIndex;
     int nClusters = 0;
@@ -78,7 +78,6 @@ struct AlgorithmCore
         const bool hasComparer = !distance.isNull();
         out << hasComparer;
         if (hasComparer) distance->store(out);
-        out << Globals->subjects;
         // Compress and save to file
         QtUtils::writeFile(model, data, -1);
@@ -98,7 +97,6 @@ struct AlgorithmCore
         transform->load(in);
         bool hasDistance; in >> hasDistance;
         if (hasDistance) distance->load(in);
-        in >> Globals->subjects;
     }
     File getMemoryGallery(const File &file) const
@@ -119,6 +119,17 @@ Mat OpenCVUtils::toMat(const QList&lt;float&gt; &amp;src, int rows)
     return dst;
 }
+Mat OpenCVUtils::toMat(const QList<int> &src, int rows)
+{
+    if (rows == -1) rows = src.size();
+    int columns = src.isEmpty() ? 0 : src.size() / rows;
+    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];
+    return dst;
+}
+
 Mat OpenCVUtils::toMat(const QList<Mat> &src)
 {
     if (src.isEmpty()) return Mat();
@@ -35,6 +35,8 @@ namespace OpenCVUtils
     // To image
     cv::Mat toMat(const QList<float> &src, int rows = -1);
+    cv::Mat toMat(const QList<int> &src, int rows = -1);
+
     cv::Mat toMat(const QList<cv::Mat> &src);      // Data organized one matrix per row
     cv::Mat toMatByRow(const QList<cv::Mat> &src); // Data organized one row per row
@@ -132,7 +132,7 @@ int32_t SdkEstimator::estimate_age(const ONEFACE &amp;input_face, int32_t &amp;age)
     TemplateList templates;
     templates.append(templateFromONEFACE(input_face));
     templates >> *frvt2012_age_transform.data();
-    age = templates.first().file.label();
+    age = templates.first().file.get<float>("Subject");
     return templates.first().file.failed() ? 4 : 0;
 }
@@ -141,6 +141,6 @@ int32_t SdkEstimator::estimate_gender(const ONEFACE &amp;input_face, int8_t &amp;gender,
     TemplateList templates;
     templates.append(templateFromONEFACE(input_face));
     templates >> *frvt2012_gender_transform.data();
-    mf = gender = templates.first().file.label();
+    mf = gender = templates.first().file.get<QString>("Subject") == "Male" ? 0 : 1;
     return templates.first().file.failed() ? 4 : 0;
 }
@@ -44,13 +44,13 @@ void Classifier::_classify(File file)
         if (algorithm == "GenderClassification") {
             key = "Gender";
-            value = (f.label() == 0 ? "Male" : "Female");
+            value = (f.get<QString>("Subject"));
         } else if (algorithm == "AgeRegression") {
             key = "Age";
-            value = QString::number(int(f.label()+0.5)) + " Years";
+            value = QString::number(int(f.get<float>("Subject")+0.5)) + " Years";
         } else {
             key = algorithm;
-            value = QString::number(f.label());
+            value = f.get<QString>("Subject");
         }
         break;
     }
@@ -167,34 +167,6 @@ bool File::getBool(const QString &amp;key, bool defaultValue) const
     return variant.value<bool>();
 }
-QString File::subject() const
-{
-    const QVariant l = m_metadata.value("Label");
-    if (!l.isNull()) return Globals->subjects.key(l.toFloat(), l.toString());
-    return m_metadata.value("Subject").toString();
-}
-
-float File::label() const
-{
-    const QVariant l = m_metadata.value("Label");
-    if (!l.isNull()) return l.toFloat();
-
-    const QVariant s = m_metadata.value("Subject");
-    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))
-        Globals->subjects.insert(subject, Globals->subjects.size());
-    return Globals->subjects.value(subject);
-}
-
 QList<QPointF> File::namedPoints() const
 {
     QList<QPointF> landmarks;
@@ -360,14 +332,6 @@ void FileList::sort(const QString&amp; key)
     *this = sortedList;
 }
-QList<float> FileList::labels() const
-{
-    QList<float> labels; labels.reserve(size());
-    foreach (const File &f, *this)
-        labels.append(f.label());
-    return labels;
-}
-
 QList<int> FileList::crossValidationPartitions() const
 {
     QList<int> crossValidationPartitions; crossValidationPartitions.reserve(size());
@@ -449,7 +413,7 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
                     newTemplates[i].file.set("Partition", -1);
                 } else {
-                    const QByteArray md5 = QCryptographicHash::hash(newTemplates[i].file.subject().toLatin1(), QCryptographicHash::Md5);
+                    const QByteArray md5 = QCryptographicHash::hash(newTemplates[i].file.get<QString>("Subject").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);
                 }
@@ -469,11 +433,13 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
     return templates;
 }
-TemplateList TemplateList::relabel(const TemplateList &tl)
+// indexes some property, assigns an integer id to each unique value of propName
+// stores the index values in "Label" of the output template list
+TemplateList TemplateList::relabel(const TemplateList &tl, const QString & propName)
 {
-    const QList<int> originalLabels = tl.labels<int>();
-    QHash<int,int> labelTable;
-    foreach (int label, originalLabels)
+    const QList<QString> originalLabels = tl.get<QString>(propName);
+    QHash<QString,int> labelTable;
+    foreach (const QString & label, originalLabels)
         if (!labelTable.contains(label))
             labelTable.insert(label, labelTable.size());
@@ -483,6 +449,52 @@ TemplateList TemplateList::relabel(const TemplateList &amp;tl)
     return result;
 }
+QList<int> TemplateList::indexProperty(const QString & propName, QHash<QString, int> * valueMap,QHash<int, QVariant> * reverseLookup) const
+{
+    QHash<QString, int> dummyForwards;
+    QHash<int, QVariant> dummyBackwards;
+
+    if (!valueMap) valueMap = &dummyForwards;
+    if (!reverseLookup) reverseLookup = &dummyBackwards;
+
+    return indexProperty(propName, *valueMap, *reverseLookup);
+}
+
+QList<int> TemplateList::indexProperty(const QString & propName, QHash<QString, int> & valueMap, QHash<int, QVariant> & reverseLookup) const
+{
+    valueMap.clear();
+    reverseLookup.clear();
+
+    const QList<QVariant> originalLabels = values(propName);
+    foreach (const QVariant & label, originalLabels) {
+        QString labelString = label.toString();
+        if (!valueMap.contains(labelString)) {
+            reverseLookup.insert(valueMap.size(), label);
+            valueMap.insert(labelString, valueMap.size());
+        }
+    }
+
+    QList<int> result;
+    for (int i=0; i<originalLabels.size(); i++)
+        result.append(valueMap[originalLabels[i].toString()]);
+
+    return result;
+}
+
+// uses -1 for missing values
+QList<int> TemplateList::applyIndex(const QString & propName, const QHash<QString, int> & valueMap) const
+{
+    const QList<QString> originalLabels = get<QString>(propName);
+
+    QList<int> result;
+    for (int i=0; i<originalLabels.size(); i++) {
+        if (!valueMap.contains(originalLabels[i])) result.append(-1);
+        else result.append(valueMap[originalLabels[i]]);
+    }
+
+    return result;
+}
+
 /* Object - public methods */
 QStringList Object::parameters() const
 {
@@ -1021,10 +1033,6 @@ MatrixOutput *MatrixOutput::make(const FileList &amp;targetFiles, const FileList &amp;qu
 /* MatrixOutput - protected methods */
 QString MatrixOutput::toString(int row, int column) const
 {
-    if (targetFiles[column] == "Subject") {
-        const int label = data.at<float>(row,column);
-        return Globals->subjects.key(label, QString::number(label));
-    }
     return QString::number(data.at<float>(row,column));
 }
@@ -254,8 +254,6 @@ struct BR_EXPORT File
         return variant.value<T>();
     }
-    QString subject() const; /*!< \brief Looks up the subject from the file's label. */
-    float label() const; /*!< \brief Convenience function for retrieving the file's \c Label. */
     inline bool failed() const { return getBool("FTE") || getBool("FTO"); } /*!< \brief Returns \c true if the file failed to open or enroll, \c false otherwise. */
     QList<QPointF> namedPoints() const; /*!< \brief Returns points convertible from metadata keys. */
@@ -299,7 +297,24 @@ struct BR_EXPORT FileList : public QList&lt;File&gt;
     QStringList flat() const; /*!< \brief Returns br::File::flat() for each file in the list. */
     QStringList names() const; /*!<  \brief Returns #br::File::name for each file in the list. */
     void sort(const QString& key); /*!<  \brief Sort the list based on metadata. */
-    QList<float> labels() const; /*!< \brief Returns br::File::label() for each file in the list. */
+     /*!< \brief Returns values associated with the input propName for each file in the list. */
+    template<typename T>
+    QList<T> get(const QString & propName) const
+    {
+        QList<T> values; values.reserve(size());
+        foreach (const File &f, *this)
+            values.append(f.get<T>(propName));
+        return values;
+    }
+    template<typename T>
+    QList<T> get(const QString & propName, T defaultValue) const
+    {
+        QList<T> values; values.reserve(size());
+        foreach (const File &f, *this)
+            values.append(f.contains(propName) ? f.get<T>(propName) : defaultValue);
+        return values;
+    }
+
     QList<int> crossValidationPartitions() const; /*!< \brief Returns the cross-validation partition (default=0) for each file in the list. */
     int failures() const; /*!< \brief Returns the number of files with br::File::failed(). */
 };
@@ -383,7 +398,14 @@ struct TemplateList : public QList&lt;Template&gt;
     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); } /*!< \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 Ensure labels are in the range [0,numClasses-1]. */
+    BR_EXPORT static TemplateList relabel(const TemplateList & tl, const QString & propName);
+
+    QList<int> indexProperty(const QString & propName, QHash<QString, int> * valueMap=NULL,QHash<int, QVariant> * reverseLookup = NULL) const;
+    QList<int> indexProperty(const QString & propName, QHash<QString, int> & valueMap, QHash<int, QVariant> & reverseLookup) const;
+    QList<int> applyIndex(const QString & propName, const QHash<QString, int> & valueMap) const;
+
     /*!
      * \brief Returns the total number of bytes in all the templates.
@@ -457,23 +479,30 @@ struct TemplateList : public QList&lt;Template&gt;
     /*!
      * \brief Returns br::Template::label() for each template in the list.
      */
-    template <typename T>
-    QList<T> labels() const
+    template<typename T>
+    QList<T> get(const QString & propName) const
+    {
+        QList<T> values; values.reserve(size());
+        foreach (const Template &t, *this) values.append(t.file.get<T>(propName));
+        return values;
+    }
+    QList<QVariant> values(const QString & propName) const
     {
-        QList<T> labels; labels.reserve(size());
-        foreach (const Template &t, *this) labels.append(t.file.label());
-        return labels;
+        QList<QVariant> values; values.reserve(size());
+        foreach (const Template &t, *this) values.append(t.file.value(propName));
+        return values;
     }
     /*!
      * \brief Returns the number of occurences for each label in the list.
      */
-    QMap<int,int> labelCounts(bool excludeFailures = false) const
+    template<typename T>
+    QMap<T,int> countValues(const QString & propName, bool excludeFailures = false) const
     {
-        QMap<int, int> labelCounts;
+        QMap<T, int> labelCounts;
         foreach (const File &file, files())
             if (!excludeFailures || !file.failed())
-                labelCounts[file.label()]++;
+                labelCounts[file.get<T>(propName)]++;
         return labelCounts;
     }
@@ -649,7 +678,6 @@ public:
     BR_PROPERTY(int, crossValidate, 0)
     QHash<QString,QString> abbreviations; /*!< \brief Used by br::Transform::make() to expand abbreviated algorithms into their complete definitions. */
-    QHash<QString,int> subjects; /*!< \brief Used by classifiers to associate text class labels with unique integers IDs. */
     QTime startTime; /*!< \brief Used to estimate timeRemaining(). */
     /*!
@@ -111,13 +111,13 @@ class KNNTransform : public Transform
             QHash<QString, float> votes;
             const int max = (k < 1) ? sortedScores.size() : std::min(k, sortedScores.size());
             for (int j=0; j<max; j++)
-                votes[gallery[sortedScores[j].second].file.subject()] += (weighted ? sortedScores[j].first : 1);
+                votes[gallery[sortedScores[j].second].file.get<QString>("Subject")] += (weighted ? sortedScores[j].first : 1);
             subjects.append(votes.keys()[votes.values().indexOf(Common::Max(votes.values()))]);
             // Remove subject from consideration
             if (subjects.size() < numSubjects)
                 for (int j=sortedScores.size()-1; j>=0; j--)
-                    if (gallery[sortedScores[j].second].file.subject() == subjects.last())
+                    if (gallery[sortedScores[j].second].file.get<QString>("Subject") == subjects.last())
                         sortedScores.removeAt(j);
         }
@@ -329,7 +329,8 @@ class LDATransform : public Transform
     void train(const TemplateList &_trainingSet)
     {
-        TemplateList trainingSet = TemplateList::relabel(_trainingSet);
+        // creates "Label"
+        TemplateList trainingSet = TemplateList::relabel(_trainingSet, "Subject");
         int instances = trainingSet.size();
@@ -342,13 +343,13 @@ class LDATransform : public Transform
         TemplateList ldaTrainingSet;
         static_cast<Transform*>(&pca)->project(trainingSet, ldaTrainingSet);
-        ldaTrainingSet = TemplateList::relabel(ldaTrainingSet);
         int dimsIn = ldaTrainingSet.first().m().rows * ldaTrainingSet.first().m().cols;
         // OpenBR ensures that class values range from 0 to numClasses-1.
-        QList<int> classes = trainingSet.labels<int>();
-        QMap<int, int> classCounts = trainingSet.labelCounts();
+        // Label exists because we created it earlier with relabel
+        QList<int> classes = trainingSet.get<int>("Label");
+        QMap<int, int> classCounts = trainingSet.countValues<int>("Label");
         const int numClasses = classCounts.size();
         // Map Eigen into OpenCV
@@ -65,13 +65,13 @@ class arffGallery : public Gallery
             const int dimensions = t.m().rows * t.m().cols;
             for (int i=0; i<dimensions; i++)
                 arffFile.write(qPrintable("@ATTRIBUTE v" + QString::number(i) + " REAL\n"));
-            arffFile.write(qPrintable("@ATTRIBUTE class {" + QStringList(Globals->subjects.keys()).join(',') + "}\n"));
+            arffFile.write(qPrintable("@ATTRIBUTE class string\n"));
             arffFile.write("\n@DATA\n");
         }
         arffFile.write(qPrintable(OpenCVUtils::matrixToStringList(t).join(',')));
-        arffFile.write(qPrintable(",'" + t.file.subject() + "'\n"));
+        arffFile.write(qPrintable(",'" + t.file.get<QString>("Subject") + "'\n"));
     }
 };
@@ -517,11 +517,7 @@ class csvGallery : public Gallery
     static QString getCSVElement(const QString &key, const QVariant &value, bool header)
     {
-        if ((key == "Label") && !header) {
-            QString stringLabel = Globals->subjects.key(value.value<int>());
-            if (stringLabel.isEmpty()) return value.value<QString>();
-            else                       return stringLabel;
-        } else if (value.canConvert<QString>()) {
+        if (value.canConvert<QString>()) {
             if (header) return key;
             else        return value.value<QString>();
         } else if (value.canConvert<QPointF>()) {
@@ -878,7 +874,7 @@ class statGallery : public Gallery
     void write(const Template &t)
     {
-        subjects.insert(t.file.subject());
+        subjects.insert(t.file.get<QString>("Subject"));
         bytes.append(t.bytes());
     }
 };
@@ -20,21 +20,23 @@ static TemplateList Downsample(const TemplateList &amp;templates, const Transform *t
     const bool atLeast = transform->instances < 0;
     const int instances = abs(transform->instances);
-    QList<int> allLabels = templates.labels<int>();
-    QList<int> uniqueLabels = allLabels.toSet().toList();
+    QList<QString> allLabels = templates.get<QString>("Subject");
+    QList<QString> uniqueLabels = allLabels.toSet().toList();
     qSort(uniqueLabels);
-    QMap<int,int> counts = templates.labelCounts(instances != std::numeric_limits<int>::max());
+    QMap<QString,int> counts = templates.countValues<QString>("Subject", instances != std::numeric_limits<int>::max());
+
     if ((instances != std::numeric_limits<int>::max()) && (transform->classes != std::numeric_limits<int>::max()))
-        foreach (int label, counts.keys())
+        foreach (const QString & label, counts.keys())
             if (counts[label] < instances)
                 counts.remove(label);
+
     uniqueLabels = counts.keys();
     if ((transform->classes != std::numeric_limits<int>::max()) && (uniqueLabels.size() < transform->classes))
         qWarning("Downsample requested %d classes but only %d are available.", transform->classes, uniqueLabels.size());
     Common::seedRNG();
-    QList<int> selectedLabels = uniqueLabels;
+    QList<QString> selectedLabels = uniqueLabels;
     if (transform->classes < uniqueLabels.size()) {
         std::random_shuffle(selectedLabels.begin(), selectedLabels.end());
         selectedLabels = selectedLabels.mid(0, transform->classes);
@@ -42,7 +44,7 @@ static TemplateList Downsample(const TemplateList &amp;templates, const Transform *t
     TemplateList downsample;
     for (int i=0; i<selectedLabels.size(); i++) {
-        const int selectedLabel = selectedLabels[i];
+        const QString selectedLabel = selectedLabels[i];
         QList<int> indices;
         for (int j=0; j<allLabels.size(); j++)
             if ((allLabels[j] == selectedLabel) && (!templates.value(j).file.get<bool>("FTE", false)))
@@ -453,7 +453,6 @@ private:
         const QString &file = src.file;
         if (cache.contains(file)) {
             dst = cache[file];
-            dst.file.set("Label", src.file.label());
         } else {
             transform->project(src, dst);
             cacheLock.lock();
@@ -126,7 +126,8 @@ private:
     {
         Mat m;
         OpenCVUtils::toMat(data.data()).convertTo(m, CV_64F);
-        const QList<int> labels = data.labels<int>();
+
+        const QList<int> labels = data.indexProperty("Subject");
         const int dims = m.cols;
         vector<Mat> mv, av, bv;
@@ -145,8 +145,10 @@ class meltOutput : public MatrixOutput
         QStringList lines;
         if (file.baseName() != "terminal") lines.append(QString("Query,Target,Mask,Similarity%1").arg(keys));
-        QList<float> queryLabels = queryFiles.labels();
-        QList<float> targetLabels = targetFiles.labels();
+
+        QList<QString> queryLabels = queryFiles.get<QString>("Subject");
+        QList<QString> targetLabels = targetFiles.get<QString>("Subject");
+
         for (int i=0; i<queryFiles.size(); i++) {
             for (int j=(selfSimilar ? i+1 : 0); j<targetFiles.size(); j++) {
                 const bool genuine = queryLabels[i] == targetLabels[j];
@@ -296,7 +298,7 @@ class txtOutput : public MatrixOutput
         if (file.isNull() || targetFiles.isEmpty() || queryFiles.isEmpty()) return;
         QStringList lines;
         foreach (const File &file, queryFiles)
-            lines.append(file.name + " " + file.subject());
+            lines.append(file.name + " " + file.get<QString>("Subject"));
         QtUtils::writeFile(file, lines);
     }
 };
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright 2012 The MITRE Corporation                                      *
- *                                                                           *
- * Licensed under the Apache License, Version 2.0 (the "License");           *
- * you may not use this file except in compliance with the License.          *
- * You may obtain a copy of the License at                                   *
- *                                                                           *
- *     http://www.apache.org/licenses/LICENSE-2.0                            *
- *                                                                           *
- * Unless required by applicable law or agreed to in writing, software       *
- * distributed under the License is distributed on an "AS IS" BASIS,         *
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  *
- * See the License for the specific language governing permissions and       *
- * limitations under the License.                                            *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include "openbr_internal.h"
-
-using namespace cv;
-
-namespace br
-{
-
-/*!
- * \ingroup transforms
- * \brief Treat each pixel as a classification task
- * \author E. Taborsky \cite mmtaborsky
- */
-class PerPixelClassifierTransform : public MetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(br::Transform* transform READ get_transform WRITE set_transform RESET reset_transform)
-    Q_PROPERTY(int pixels READ get_pixels WRITE set_pixels RESET reset_pixels STORED false)
-    Q_PROPERTY(int orient READ get_orient WRITE set_orient RESET reset_orient STORED false)
-    BR_PROPERTY(br::Transform*, transform, NULL)
-    BR_PROPERTY(int, pixels, 10000)
-    BR_PROPERTY(bool, orient, false)
-
-    /*
-      Bins:
-      |4|3|2|
-      |5| |1|
-      |6|7|8|
-      */
-
-    QList<float> shift(int n, QList<float> &src) const
-    {
-        for (int i = 0; i < n; i++){ // Equivalent to src.append(src.takeFirst()) ?
-            src.append(src.at(i));
-            src.removeFirst();
-        }
-        return src;
-    }
-
-    void rotate(Template &src, Template &dst) const
-    {
-        int images =  (src.m().cols)/9;
-        dst = src;
-        for (int i = 0; i < images; i++){
-            double a = src.m().at<float>(7+(i*9)); //top
-            double b = src.m().at<float>(1+(i*9)); //bottom
-            double c = src.m().at<float>(5+(i*9)); //right
-            double d = src.m().at<float>(3+(i*9)); //left
-            double orientation = atan2((a-b),(c-d));
-            int bin;
-            if (orientation > 0){
-                 bin = ((orientation/CV_PI)*4.0 +.5);
-            } else {
-                 bin = 8.0 + ((orientation/CV_PI)*4.0 + .5);
-            }
-
-            // put things in an order that makes sense to rotate
-            // blugh
-            QList<float> orderedList;
-            QList<float> rotatedList;
-            orderedList.insert(0, src.m().at<float>(3+(i*9)));
-            orderedList.insert(1, src.m().at<float>(6+(i*9)));
-            orderedList.insert(2, src.m().at<float>(7+(i*9)));
-            orderedList.insert(3, src.m().at<float>(8+(i*9)));
-            orderedList.insert(4, src.m().at<float>(5+(i*9)));
-            orderedList.insert(5, src.m().at<float>(2+(i*9)));
-            orderedList.insert(6, src.m().at<float>(1+(i*9)));
-            orderedList.insert(7, src.m().at<float>(0+(i*9)));
-
-            rotatedList = shift(bin, orderedList);
-
-            dst.m().at<float>(0+(i*9)) = rotatedList.at(7);
-            dst.m().at<float>(1+(i*9)) = rotatedList.at(6);
-            dst.m().at<float>(2+(i*9)) = rotatedList.at(5);
-            dst.m().at<float>(3+(i*9)) = rotatedList.at(0);
-            dst.m().at<float>(4+(i*9)) = src.m().at<float>(4+(i*9)); // middle pixel not in orderedList
-            dst.m().at<float>(5+(i*9)) = rotatedList.at(4);
-            dst.m().at<float>(6+(i*9)) = rotatedList.at(1);
-            dst.m().at<float>(7+(i*9)) = rotatedList.at(2);
-            dst.m().at<float>(8+(i*9)) = rotatedList.at(3);
-        }
-    }
-
-    void train(const TemplateList &trainingSet)
-    {
-        TemplateList pixelTemplates = TemplateList();
-        const int length = trainingSet.length();
-        int pixelsPerImage = pixels/length;
-
-        for (int i=0; i < length; i++){
-            Template src = trainingSet.at(i);
-
-            const int mats = src.length();
-            const int rows = src.m().rows;
-            const int cols = src.m().cols;
-
-            RNG &rng = theRNG();
-            TemplateList srcPixelTemplates;
-
-            for (int m=0; m < pixelsPerImage; m++){
-                int index = rng.uniform(0, rows*cols);
-                Template temp = Template(src.file, cv::Mat(1, mats, CV_32F));
-                float *ptemp = (float*)temp.m().ptr();
-                for (int n=0; n < mats; n++){
-                    uchar *psrc = src[n].ptr();
-                    ptemp[n] = psrc[index];
-                }
-                cv::Mat labelMat = src.file.value("labels").value<cv::Mat>();
-                uchar* plabel = labelMat.ptr();
-                temp.file.set("Label", plabel[index]);
-
-                if (orient){
-                    Template rotated;
-                    rotate(temp, rotated);
-                    srcPixelTemplates.append(rotated);
-                } else {
-                    srcPixelTemplates.append(temp);
-                }
-            }
-            pixelTemplates.append(srcPixelTemplates);
-        }
-        transform->train(pixelTemplates);
-    }
-
-    void project(const Template &src, Template &dst) const
-    {
-        const int mats = src.length();
-        const int rows = src.m().rows;
-        const int cols = src.m().cols;
-
-        dst = src; // Do we really want to copy all the src matrices into dst?
-        dst.merge(Template(src.file, cv::Mat(src.m().rows, src.m().cols, CV_32F)));
-        float *pdst = (float*) dst.m().ptr();
-
-        for (int r = 0; r < rows; r++){
-            for (int c = 0; c < cols; c++){
-                Template temp = Template(src.file, cv::Mat(1, mats, CV_32F));
-                Template dstTemp = Template(src.file, cv::Mat(1, mats, CV_32F));
-
-                for (int n=0; n < mats; n++){
-                    const uchar *psrc = src[n].ptr();
-                    float *ptemp = (float*)temp[0].ptr();
-                    int index = r*cols + c;
-                    ptemp[n] = psrc[index];
-                }
-
-                if (orient){
-                    Template rotated = Template(src.file, cv::Mat(1, mats, CV_32F));
-                    rotate(temp, rotated);
-                    temp = rotated;
-                }
-
-                transform->project(temp,dstTemp);
-                pdst[r*cols+c] = dstTemp.file.label();
-            }
-        }
-    }
-};
-
-BR_REGISTER(Transform, PerPixelClassifierTransform)
-
-/*!
- * \ingroup transforms
- * \brief Construct feature vectors of neighboring pixels
- * \author E. Taborsky \cite mmtaborsky
- */
-class NeighborsTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-
-    void project(const Template &src, Template &dst) const
-    {
-        int rows = src.m().rows;
-        int cols = src.m().cols;
-        int mats = src.length();
-        dst.file = src.file;
-
-        for (int n = 0; n < mats; n++){ //each matrix, except the last one, will be turned into 9 matrices
-            const uchar *psrc = src[n].ptr();
-            for (int i = -1; i < 2; i++){
-                for (int j = -1; j < 2; j++){ // these nine matrices are shifted versions of the original
-                    cv::Mat mat = cv::Mat(rows, cols, CV_8UC1);
-                    uchar *pmat = (uchar*)mat.ptr();
-                    for (int r = 0; r < rows; r++){
-                        for (int c = 0; c < cols; c++){
-                            int index = r*cols+c;
-                            int newIndex = index + i*cols + j;
-                            if ((newIndex < 0) || (newIndex >= rows*cols)){
-                                pmat[index] = psrc[index];
-                            } else {
-                                pmat[index] = psrc[newIndex];
-                            }
-                        }
-                    }
-                    dst.push_back(mat); //add mat to dst
-                }
-            }
-        }
-        dst.push_back(src.m()); // add the last matrix
-    }
-};
-
-BR_REGISTER(Transform, NeighborsTransform)
-
-/*!
- * \ingroup transforms
- * \brief To binary vector
- * \author E. Taborsky \cite mmtaborsky
- */
-class ToBinaryVectorTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(br::Transform* transform READ get_transform WRITE set_transform RESET reset_transform STORED false)
-    Q_PROPERTY(int length READ get_length WRITE set_length RESET reset_length STORED false)
-    BR_PROPERTY(br::Transform*, transform, NULL)
-    BR_PROPERTY(int, length, -1)
-
-    //needs to be updated..
-    void project(const Template &src, Template &dst) const
-    {
-
-        dst = src;
-        int mats = src.length();
-        for (int i = 0; i < mats; i++){
-            // Does this actually modify the data?
-            dst[i]*(1.0/255.0); //scaling the input matrices to make the svm happier
-        }
-        for (int i = 0; i < length*(mats); i++){
-            dst.prepend(Template(src.file, Mat::zeros(src.m().rows, src.m().cols, CV_8U)));
-        }
-
-        // original pixel values at the end
-
-        Template transformed;
-        transformed.file = src.file;
-        transform->project(src, transformed);
-
-        int rows = transformed.m().rows;
-        int cols = transformed.m().cols;
-
-        for (int i = 0; i < mats; i++){
-            uchar *ptransformed = transformed[i].ptr();
-            for (int r = 0; r < rows; r++){
-                for (int c = 0; c < cols; c++){
-                    uchar index = ptransformed[r*cols+c];
-                    dst[index+(length*i)].at<uchar>(r,c) = 1;
-                }
-            }
-        }
-    }
-};
-
-BR_REGISTER(Transform, ToBinaryVectorTransform)
-
-/*!
- * \ingroup transforms
- * \brief If "labels" is specified, makes the last matrix into metadata
- * \author E. Taborsky \cite mmtaborsky
- */
-
-class ToMetadataTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-
-    void project(const Template &src, Template &dst) const
-    {
-        dst = src;
-        if (dst.file.contains("labels")){
-            QVariant last = qVariantFromValue(dst.m());
-            dst.file.set("labels", last);
-            dst.pop_back();
-        }
-    }
-
-};
-
-BR_REGISTER(Transform, ToMetadataTransform)
-
-} // namespace br
-
-#include "pixel.moc"
@@ -26,10 +26,10 @@ class ImpostorUniquenessMeasureTransform : public Transform
     float calculateIUM(const Template &probe, const TemplateList &gallery) const
     {
-        const int probeLabel = probe.file.label();
+        const QString probeLabel = probe.file.get<QString>("Subject");
         TemplateList subset = gallery;
         for (int j=subset.size()-1; j>=0; j--)
-            if (subset[j].file.label() == probeLabel)
+            if (subset[j].file.get<QString>("Subject") == probeLabel)
                 subset.removeAt(j);
         QList<float> scores = distance->compare(subset, probe);
@@ -158,8 +158,7 @@ class MatchProbabilityDistance : public Distance
     {
         distance->train(src);
-        const QList<int> labels = src.labels<int>();
-
+        const QList<int> labels = src.indexProperty("Subject");
         QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(src.size()), FileList(src.size())));
         distance->compare(src, src, matrixOutput.data());
@@ -229,7 +228,7 @@ class HeatMapDistance : public Distance
     {
         distance->train(src);
-        const QList<int> labels = src.labels<int>();
+        const QList<int> labels = src.indexProperty("Subject");
         QList<TemplateList> patches;
@@ -317,7 +316,7 @@ class UnitDistance : public Distance
     void train(const TemplateList &templates)
     {
         const TemplateList samples = templates.mid(0, 2000);
-        const QList<float> sampleLabels = samples.labels<float>();
+        const QList<int> sampleLabels = samples.indexProperty("Subject");
         QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(samples.size()), FileList(samples.size())));
         Distance::compare(samples, samples, matrixOutput.data());
@@ -150,7 +150,7 @@ class BayesianQuantizationDistance : public Distance
             qFatal("Expected sigle matrix templates of type CV_8UC1!");
         const Mat data = OpenCVUtils::toMat(src.data());
-        const QList<int> templateLabels = src.labels<int>();
+        const QList<int> templateLabels = src.indexProperty("Subject");
         loglikelihoods = QVector<float>(data.cols*256, 0);
         QFutureSynchronizer<void> futures;
@@ -473,7 +473,8 @@ private:
     {
         Mat data = OpenCVUtils::toMat(src.data());
         const int step = getStep(data.cols);
-        const QList<int> labels = src.labels<int>();
+
+        const QList<int> labels = src.indexProperty("Subject");
         Mat &lut = ProductQuantizationLUTs[index];
         lut = Mat(getDims(data.cols), 256*(256+1)/2, CV_32FC1);
@@ -77,7 +77,7 @@ class BayesianQuantizationTransform : public Transform
     void train(const TemplateList &src)
     {
         const Mat data = OpenCVUtils::toMat(src.data());
-        const QList<int> labels = src.labels<int>();
+        const QList<int> labels = src.indexProperty("Subject");
         thresholds = QVector<float>(256*data.cols);
@@ -121,28 +121,46 @@ private:
     BR_PROPERTY(float, gamma, -1)
     SVM svm;
+    QHash<QString, int> labelMap;
+    QHash<int, QVariant> reverseLookup;
     void train(const TemplateList &_data)
     {
         Mat data = OpenCVUtils::toMat(_data.data());
-        Mat lab = OpenCVUtils::toMat(_data.labels<float>());
+        Mat lab;
+        // If we are doing regression, assume subject has float values
+        if (type == EPS_SVR || type == NU_SVR) {
+            lab = OpenCVUtils::toMat(_data.get<float>("Subject"));
+        }
+        // If we are doing classification, assume subject has discrete values, map them
+        // and store the mapping data
+        else {
+            QList<int> dataLabels = _data.indexProperty("Subject", labelMap, reverseLookup);
+            lab = OpenCVUtils::toMat(dataLabels);
+        }
         trainSVM(svm, data, lab, kernel, type, C, gamma);
     }
     void project(const Template &src, Template &dst) const
     {
         dst = src;
-        dst.file.set("Label", svm.predict(src.m().reshape(1, 1)));
+        float prediction = svm.predict(src.m().reshape(1, 1));
+        if (type == EPS_SVR || type == NU_SVR)
+            dst.file.set("Subject", prediction);
+        else
+            dst.file.set("Subject", reverseLookup[prediction]);
     }
     void store(QDataStream &stream) const
     {
         storeSVM(svm, stream);
+        stream << labelMap << reverseLookup;
     }
     void load(QDataStream &stream)
     {
         loadSVM(svm, stream);
+        stream >> labelMap >> reverseLookup;
     }
 };
@@ -182,7 +200,7 @@ private:
     void train(const TemplateList &src)
     {
         const Mat data = OpenCVUtils::toMat(src.data());
-        const QList<int> lab = src.labels<int>();
+        const QList<int> lab = src.indexProperty("Subject");
         const int instances = data.rows * (data.rows+1) / 2;
         Mat deltaData(instances, data.cols, data.type());
-Subproject commit cddd8fc2231191ab5d62dc29573f73e97d5065c5
+Subproject commit dccddf4dd3a5239911807beeec39308f8890b1e4