training label edge case bug fix

Josh Klontz
1 parent 08930f0b
Showing 2 changed files with 8 additions and 9 deletions
sdk/openbr_plugin.cpp
sdk/plugins/eigen3.cpp
@@ -112,13 +112,12 @@ float File::label() const
     const QVariant variant = value("Label");
     if (variant.isNull()) return -1;
-    if (variant.canConvert(QVariant::Double)) {
-        bool ok;
-        float val = variant.toFloat(&ok);
-        if (ok) return val;
-    }
+    if (Globals->classes.contains(variant.toString()))
+        return Globals->classes.value(variant.toString());
-    return Globals->classes.value(variant.toString(), -1);
+    bool ok;
+    const float val = variant.toFloat(&ok);
+    return ok ? val : -1;
 }
 void File::remove(const QString &key)
@@ -276,10 +276,10 @@ class LDA : public Transform
         int dimsIn = ldaTrainingSet.first().m().rows * ldaTrainingSet.first().m().cols;
-        // MM ensures that classes values range from 0 to numClasses-1.
-        QList<float> classes = trainingSet.labels<float>(); // PCA doesn't project metadata
+        // OpenBR ensures that class values range from 0 to numClasses-1.
+        QList<int> classes = trainingSet.labels<int>();
         QMap<int, int> classCounts = trainingSet.labelCounts();
-        int numClasses = classCounts.size();
+        const int numClasses = classCounts.size();
         // Map Eigen into OpenCV
         Eigen::MatrixXd data = Eigen::MatrixXd(dimsIn, instances);