Rename collectValues to get, add a values method

These names mirroring File functionality. Fixed SVMDistance dropped unnecessary second relabel in LDATransform::train

Rename collectValues to get, add a values method
These names mirroring File functionality. Fixed SVMDistance dropped unnecessary second relabel in LDATransform::train
Charles Otto
1 parent 39d1c697
Showing 8 changed files with 22 additions and 18 deletions
openbr/core/bee.cpp
openbr/core/cluster.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/eigen3.cpp
openbr/plugins/independent.cpp
openbr/plugins/output.cpp
openbr/plugins/svm.cpp
@@ -262,8 +262,8 @@ cv::Mat BEE::makeMask(const br::FileList &amp;targets, const br::FileList &amp;queries, 
 {
     // 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<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();
@@ -280,7 +280,7 @@ void br::EvalClustering(const QString &amp;csv, const QString &amp;input)
     // 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");
+    QList<int> labels = TemplateList::fromGallery(input).files().get<int>("Subject");
     QHash<int, int> labelToIndex;
     int nClusters = 0;
@@ -437,7 +437,7 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
 // stores the index values in "Label" of the output template list -cao
 TemplateList TemplateList::relabel(const TemplateList &tl, const QString & propName)
 {
-    const QList<QString> originalLabels = tl.collectValues<QString>(propName);
+    const QList<QString> originalLabels = tl.get<QString>(propName);
     QHash<QString,int> labelTable;
     foreach (const QString & label, originalLabels)
         if (!labelTable.contains(label))
@@ -465,7 +465,7 @@ QList&lt;int&gt; TemplateList::indexProperty(const QString &amp; propName, QHash&lt;QString, 
     valueMap.clear();
     reverseLookup.clear();
-    const QList<QVariant> originalLabels = collectValues<QVariant>(propName);
+    const QList<QVariant> originalLabels = values(propName);
     foreach (const QVariant & label, originalLabels) {
         QString labelString = label.toString();
         if (!valueMap.contains(labelString)) {
@@ -484,7 +484,7 @@ QList&lt;int&gt; TemplateList::indexProperty(const QString &amp; propName, QHash&lt;QString, 
 // 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);
+    const QList<QString> originalLabels = get<QString>(propName);
     QList<int> result;
     for (int i=0; i<originalLabels.size(); i++) {
@@ -297,9 +297,9 @@ 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. */
-     /*!< \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> collectValues(const QString & propName) const
+    QList<T> get(const QString & propName) const
     {
         QList<T> values; values.reserve(size());
         foreach (const File &f, *this)
@@ -307,7 +307,7 @@ struct BR_EXPORT FileList : public QList&lt;File&gt;
         return values;
     }
     template<typename T>
-    QList<T> collectValues(const QString & propName, T defaultValue) const
+    QList<T> get(const QString & propName, T defaultValue) const
     {
         QList<T> values; values.reserve(size());
         foreach (const File &f, *this)
@@ -480,12 +480,18 @@ struct TemplateList : public QList&lt;Template&gt;
      * \brief Returns br::Template::label() for each template in the list.
      */
     template<typename T>
-    QList<T> collectValues(const QString & propName) const
+    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<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.
@@ -343,14 +343,12 @@ 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.
         // Label exists because we created it earlier with relabel
-        QList<int> classes = trainingSet.collectValues<int>("Label");
+        QList<int> classes = trainingSet.get<int>("Label");
         QMap<int, int> classCounts = trainingSet.countValues<int>("Label");
         const int numClasses = classCounts.size();
@@ -20,7 +20,7 @@ static TemplateList Downsample(const TemplateList &amp;templates, const Transform *t
     const bool atLeast = transform->instances < 0;
     const int instances = abs(transform->instances);
-    QList<QString> allLabels = templates.collectValues<QString>("Subject");
+    QList<QString> allLabels = templates.get<QString>("Subject");
     QList<QString> uniqueLabels = allLabels.toSet().toList();
     qSort(uniqueLabels);
@@ -146,8 +146,8 @@ class meltOutput : public MatrixOutput
         QStringList lines;
         if (file.baseName() != "terminal") lines.append(QString("Query,Target,Mask,Similarity%1").arg(keys));
-        QList<QString> queryLabels = queryFiles.collectValues<QString>("Subject");
-        QList<QString> targetLabels = targetFiles.collectValues<QString>("Subject");
+        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++) {
@@ -130,7 +130,7 @@ private:
         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"));
+            lab = OpenCVUtils::toMat(_data.get<float>("Subject"));
         }
         // If we are doing classification, assume subject has discrete values, map them
         // and store the mapping data
@@ -200,7 +200,7 @@ private:
     void train(const TemplateList &src)
     {
         const Mat data = OpenCVUtils::toMat(src.data());
-        const QList<int> lab = src.collectValues<int>("Label");
+        const QList<int> lab = src.indexProperty("Subject");
         const int instances = data.rows * (data.rows+1) / 2;
         Mat deltaData(instances, data.cols, data.type());