From 72a5968a012360dda117defa4d8e0521806a31b5 Mon Sep 17 00:00:00 2001
From: Charles Otto <ottochar@gmail.com>
Date: Tue, 14 May 2013 23:32:20 -0400
Subject: [PATCH] Further changes to label/subject

---
 app/examples/age_estimation.cpp |  2 +-
 openbr/core/bee.cpp             | 14 ++++++++------
 openbr/core/classify.cpp        |  6 +++---
 openbr/core/cluster.cpp         |  4 +++-
 openbr/core/core.cpp            |  2 --
 openbr/core/opencvutils.cpp     | 11 +++++++++++
 openbr/core/opencvutils.h       |  2 ++
 openbr/frvt2012.cpp             |  5 +++--
 openbr/gui/classifier.cpp       |  5 ++---
 openbr/openbr_plugin.cpp        | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 openbr/openbr_plugin.h          | 15 ++++++++++++++-
 openbr/plugins/eigen3.cpp       |  6 ++++--
 openbr/plugins/gallery.cpp      |  7 +++----
 openbr/plugins/independent.cpp  | 14 ++++++++------
 openbr/plugins/meta.cpp         |  3 ++-
 openbr/plugins/normalize.cpp    |  3 ++-
 openbr/plugins/output.cpp       |  6 ++++--
 openbr/plugins/pixel.cpp        |  2 ++
 openbr/plugins/quality.cpp      |  8 ++++----
 openbr/plugins/quantize.cpp     |  5 +++--
 openbr/plugins/quantize2.cpp    |  2 +-
 openbr/plugins/svm.cpp          | 22 ++++++++++++++++++++--
 22 files changed, 153 insertions(+), 48 deletions(-)

diff --git a/app/examples/age_estimation.cpp b/app/examples/age_estimation.cpp
index d8ae1e6..c2a90e5 100644
--- a/app/examples/age_estimation.cpp
+++ b/app/examples/age_estimation.cpp
@@ -29,7 +29,7 @@
 
 static void printTemplate(const br::Template &t)
 {
-    printf("%s age: %d\n", qPrintable(t.file.fileName()), int(t.file.get<float>("Label")));
+    printf("%s age: %d\n", qPrintable(t.file.fileName()), int(t.file.get<float>("Subject")));
 }
 
 int main(int argc, char *argv[])
diff --git a/openbr/core/bee.cpp b/openbr/core/bee.cpp
index 9522cc9..bfd3103 100644
--- a/openbr/core/bee.cpp
+++ b/openbr/core/bee.cpp
@@ -260,26 +260,28 @@ void BEE::makeMask(const QString &targetInput, const QString &queryInput, const 
 
 cv::Mat BEE::makeMask(const br::FileList &targets, const br::FileList &queries, int partition)
 {
-    QList<float> targetLabels = targets.collectValues<float>("Label");
-    QList<float> queryLabels = queries.collectValues<float>("Label");
+    // Would like to use indexProperty for this, but didn't make a version of that for Filelist yet
+    // -cao
+    QList<QString> targetLabels = targets.collectValues<QString>("Subject", "-1");
+    QList<QString> queryLabels = queries.collectValues<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;
diff --git a/openbr/core/classify.cpp b/openbr/core/classify.cpp
index 6f7a803..61e0cd2 100644
--- a/openbr/core/classify.cpp
+++ b/openbr/core/classify.cpp
@@ -104,9 +104,9 @@ void br::EvalRegression(const QString &predictedInput, const QString &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.get<float>("Label")-truth[i].file.get<float>("Label"), 2.f);
-        truthValues.append(QString::number(truth[i].file.get<float>("Label")));
-        predictedValues.append(QString::number(predicted[i].file.get<float>("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;
diff --git a/openbr/core/cluster.cpp b/openbr/core/cluster.cpp
index b4bcff0..40482e8 100644
--- a/openbr/core/cluster.cpp
+++ b/openbr/core/cluster.cpp
@@ -278,7 +278,9 @@ void br::EvalClustering(const QString &csv, const QString &input)
 {
     qDebug("Evaluating %s against %s", qPrintable(csv), qPrintable(input));
 
-    QList<float> labels = TemplateList::fromGallery(input).files().collectValues<float>("Label");
+    // We assume clustering algorithms store assigned cluster labels as integers (since the clusters are
+    // not named).
+    QList<int> labels = TemplateList::fromGallery(input).files().collectValues<int>("Subject");
 
     QHash<int, int> labelToIndex;
     int nClusters = 0;
diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp
index 1d5c353..ca5c07c 100644
--- a/openbr/core/core.cpp
+++ b/openbr/core/core.cpp
@@ -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
diff --git a/openbr/core/opencvutils.cpp b/openbr/core/opencvutils.cpp
index fb5622c..48601e9 100644
--- a/openbr/core/opencvutils.cpp
+++ b/openbr/core/opencvutils.cpp
@@ -119,6 +119,17 @@ Mat OpenCVUtils::toMat(const QList<float> &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();
diff --git a/openbr/core/opencvutils.h b/openbr/core/opencvutils.h
index ecf6067..0e49fa0 100644
--- a/openbr/core/opencvutils.h
+++ b/openbr/core/opencvutils.h
@@ -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
 
diff --git a/openbr/frvt2012.cpp b/openbr/frvt2012.cpp
index 3e3b07f..baf0b85 100644
--- a/openbr/frvt2012.cpp
+++ b/openbr/frvt2012.cpp
@@ -132,7 +132,7 @@ int32_t SdkEstimator::estimate_age(const ONEFACE &input_face, int32_t &age)
     TemplateList templates;
     templates.append(templateFromONEFACE(input_face));
     templates >> *frvt2012_age_transform.data();
-    age = templates.first().file.get<float>("Label");
+    age = templates.first().file.get<float>("Subject");
     return templates.first().file.failed() ? 4 : 0;
 }
 
@@ -141,6 +141,7 @@ int32_t SdkEstimator::estimate_gender(const ONEFACE &input_face, int8_t &gender,
     TemplateList templates;
     templates.append(templateFromONEFACE(input_face));
     templates >> *frvt2012_gender_transform.data();
-    mf = gender = templates.first().file.get<float>("Label");
+    // TODO: lookup gender strings/expected int outputs -cao
+    mf = gender = templates.first().file.get<QString>("Subject") == "Male" ? 0 : 1;
     return templates.first().file.failed() ? 4 : 0;
 }
diff --git a/openbr/gui/classifier.cpp b/openbr/gui/classifier.cpp
index 10bf549..2df9f5e 100644
--- a/openbr/gui/classifier.cpp
+++ b/openbr/gui/classifier.cpp
@@ -42,16 +42,15 @@ void Classifier::_classify(File file)
         if (!f.contains("Label"))
             continue;
 
-        // What's with the special casing -cao
         if (algorithm == "GenderClassification") {
             key = "Gender";
             value = (f.get<QString>("Subject"));
         } else if (algorithm == "AgeRegression") {
             key = "Age";
-            value = QString::number(int(f.get<float>("Label")+0.5)) + " Years";
+            value = QString::number(int(f.get<float>("Subject")+0.5)) + " Years";
         } else {
             key = algorithm;
-            value = QString::number(f.get<float>("Label"));
+            value = f.get<QString>("Subject");
         }
         break;
     }
diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp
index ca41c9c..0d6a8b1 100644
--- a/openbr/openbr_plugin.cpp
+++ b/openbr/openbr_plugin.cpp
@@ -435,11 +435,13 @@ TemplateList TemplateList::fromGallery(const br::File &gallery)
     return templates;
 }
 
+// indexes some property, assigns an integer id to each unique value of propName
+// stores the index values in "Label" of the output template list -cao
 TemplateList TemplateList::relabel(const TemplateList &tl, const QString & propName)
 {
-    const QList<int> originalLabels = tl.collectValues<int>(propName);
-    QHash<int,int> labelTable;
-    foreach (int label, originalLabels)
+    const QList<QString> originalLabels = tl.collectValues<QString>(propName);
+    QHash<QString,int> labelTable;
+    foreach (const QString & label, originalLabels)
         if (!labelTable.contains(label))
             labelTable.insert(label, labelTable.size());
 
@@ -449,6 +451,52 @@ TemplateList TemplateList::relabel(const TemplateList &tl, const QString & propN
     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 = collectValues<QVariant>(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 = collectValues<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
 {
@@ -989,7 +1037,8 @@ 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));
+        // problem -cao
+        return QString::number(label);
     }
     return QString::number(data.at<float>(row,column));
 }
diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h
index b970e45..8b2bfe9 100644
--- a/openbr/openbr_plugin.h
+++ b/openbr/openbr_plugin.h
@@ -306,6 +306,15 @@ struct BR_EXPORT FileList : public QList<File>
             values.append(f.get<T>(propName));
         return values;
     }
+    template<typename T>
+    QList<T> collectValues(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(). */
 };
@@ -393,6 +402,11 @@ struct TemplateList : public QList<Template>
     /*!< \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.
      */
@@ -658,7 +672,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(). */
 
     /*!
diff --git a/openbr/plugins/eigen3.cpp b/openbr/plugins/eigen3.cpp
index 6ad944a..32a05f3 100644
--- a/openbr/plugins/eigen3.cpp
+++ b/openbr/plugins/eigen3.cpp
@@ -329,7 +329,8 @@ class LDATransform : public Transform
 
     void train(const TemplateList &_trainingSet)
     {
-        TemplateList trainingSet = TemplateList::relabel(_trainingSet, "Label");
+        // creates "Label" -cao
+        TemplateList trainingSet = TemplateList::relabel(_trainingSet, "Subject");
 
         int instances = trainingSet.size();
 
@@ -342,12 +343,13 @@ class LDATransform : public Transform
 
         TemplateList ldaTrainingSet;
         static_cast<Transform*>(&pca)->project(trainingSet, ldaTrainingSet);
+        // Reindex label, is this still necessary? -cao
         ldaTrainingSet = TemplateList::relabel(ldaTrainingSet, "Label");
 
         int dimsIn = ldaTrainingSet.first().m().rows * ldaTrainingSet.first().m().cols;
 
         // OpenBR ensures that class values range from 0 to numClasses-1.
-        // Assumed label is stored as float or int? -cao
+        // Label exists because we created it earlier with relabel
         QList<int> classes = trainingSet.collectValues<int>("Label");
         QMap<int, int> classCounts = trainingSet.countValues<int>("Label");
         const int numClasses = classCounts.size();
diff --git a/openbr/plugins/gallery.cpp b/openbr/plugins/gallery.cpp
index c928572..7b7393b 100644
--- a/openbr/plugins/gallery.cpp
+++ b/openbr/plugins/gallery.cpp
@@ -65,7 +65,7 @@ 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");
         }
@@ -518,9 +518,8 @@ 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;
+            // problem -cao
+            return value.value<QString>();
         } else if (value.canConvert<QString>()) {
             if (header) return key;
             else        return value.value<QString>();
diff --git a/openbr/plugins/independent.cpp b/openbr/plugins/independent.cpp
index 844a9da..5adff52 100644
--- a/openbr/plugins/independent.cpp
+++ b/openbr/plugins/independent.cpp
@@ -20,21 +20,23 @@ static TemplateList Downsample(const TemplateList &templates, const Transform *t
     const bool atLeast = transform->instances < 0;
     const int instances = abs(transform->instances);
 
-    QList<int> allLabels = templates.collectValues<int>("Label");
-    QList<int> uniqueLabels = allLabels.toSet().toList();
+    QList<QString> allLabels = templates.collectValues<QString>("Subject");
+    QList<QString> uniqueLabels = allLabels.toSet().toList();
     qSort(uniqueLabels);
 
-    QMap<int,int> counts = templates.countValues<int>("Label", 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 &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)))
diff --git a/openbr/plugins/meta.cpp b/openbr/plugins/meta.cpp
index 3d72379..ad39280 100644
--- a/openbr/plugins/meta.cpp
+++ b/openbr/plugins/meta.cpp
@@ -453,7 +453,8 @@ private:
         const QString &file = src.file;
         if (cache.contains(file)) {
             dst = cache[file];
-            dst.file.set("Label", src.file.value("Label"));
+            // don't get this -cao
+//            dst.file.set("Label", src.file.value("Label"));
         } else {
             transform->project(src, dst);
             cacheLock.lock();
diff --git a/openbr/plugins/normalize.cpp b/openbr/plugins/normalize.cpp
index b3bfc57..5c85415 100644
--- a/openbr/plugins/normalize.cpp
+++ b/openbr/plugins/normalize.cpp
@@ -126,7 +126,8 @@ private:
     {
         Mat m;
         OpenCVUtils::toMat(data.data()).convertTo(m, CV_64F);
-        const QList<int> labels = data.collectValues<int>("Label");
+
+        const QList<int> labels = data.indexProperty("Subject");
         const int dims = m.cols;
 
         vector<Mat> mv, av, bv;
diff --git a/openbr/plugins/output.cpp b/openbr/plugins/output.cpp
index 7996829..6c8233f 100644
--- a/openbr/plugins/output.cpp
+++ b/openbr/plugins/output.cpp
@@ -153,8 +153,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.collectValues<float>("Label");
-        QList<float> targetLabels = targetFiles.collectValues<float>("Label");
+
+        QList<QString> queryLabels = queryFiles.collectValues<QString>("Subject");
+        QList<QString> targetLabels = targetFiles.collectValues<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];
diff --git a/openbr/plugins/pixel.cpp b/openbr/plugins/pixel.cpp
index 7763cd9..6d58423 100644
--- a/openbr/plugins/pixel.cpp
+++ b/openbr/plugins/pixel.cpp
@@ -28,6 +28,7 @@ namespace br
  */
 class PerPixelClassifierTransform : public MetaTransform
 {
+    // problematic -cao
     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)
@@ -273,6 +274,7 @@ BR_REGISTER(Transform, ToBinaryVectorTransform)
  * \author E. Taborsky \cite mmtaborsky
  */
 
+// What does this do? -cao
 class ToMetadataTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
diff --git a/openbr/plugins/quality.cpp b/openbr/plugins/quality.cpp
index d28bd40..0920b7b 100644
--- a/openbr/plugins/quality.cpp
+++ b/openbr/plugins/quality.cpp
@@ -26,10 +26,10 @@ class ImpostorUniquenessMeasureTransform : public Transform
 
     float calculateIUM(const Template &probe, const TemplateList &gallery) const
     {
-        const int probeLabel = probe.file.get<float>("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.get<int>("Label") == probeLabel)
+            if (subset[j].file.get<QString>("Subject") == probeLabel)
                 subset.removeAt(j);
 
         QList<float> scores = distance->compare(subset, probe);
@@ -159,7 +159,7 @@ class MatchProbabilityDistance : public Distance
     {
         distance->train(src);
 
-        const QList<int> labels = src.collectValues<int>("Label");
+        const QList<int> labels = src.indexProperty("Subject");
         QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(src.size()), FileList(src.size())));
         distance->compare(src, src, matrixOutput.data());
 
@@ -219,7 +219,7 @@ class UnitDistance : public Distance
     void train(const TemplateList &templates)
     {
         const TemplateList samples = templates.mid(0, 2000);
-        const QList<float> sampleLabels = samples.collectValues<float>("Label");
+        const QList<int> sampleLabels = samples.indexProperty("Subject");
         QScopedPointer<MatrixOutput> matrixOutput(MatrixOutput::make(FileList(samples.size()), FileList(samples.size())));
         Distance::compare(samples, samples, matrixOutput.data());
 
diff --git a/openbr/plugins/quantize.cpp b/openbr/plugins/quantize.cpp
index 330ef50..94840f6 100644
--- a/openbr/plugins/quantize.cpp
+++ b/openbr/plugins/quantize.cpp
@@ -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.collectValues<int>("Label");
+        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.collectValues<int>("Label");
+
+        const QList<int> labels = src.indexProperty("Subject");
 
         Mat &lut = ProductQuantizationLUTs[index];
         lut = Mat(getDims(data.cols), 256*(256+1)/2, CV_32FC1);
diff --git a/openbr/plugins/quantize2.cpp b/openbr/plugins/quantize2.cpp
index 75fcfbf..63ea769 100644
--- a/openbr/plugins/quantize2.cpp
+++ b/openbr/plugins/quantize2.cpp
@@ -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.collectValues<int>("Label");
+        const QList<int> labels = src.indexProperty("Subject");
 
         thresholds = QVector<float>(256*data.cols);
 
diff --git a/openbr/plugins/svm.cpp b/openbr/plugins/svm.cpp
index 1f33b69..2e12978 100644
--- a/openbr/plugins/svm.cpp
+++ b/openbr/plugins/svm.cpp
@@ -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.collectValues<float>("Label"));
+        Mat lab;
+        // If we are doing regression, assume subject has float values
+        if (type == EPS_SVR || type == NU_SVR) {
+            lab = OpenCVUtils::toMat(_data.collectValues<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;
     }
 };
 
--
libgit2 0.21.4