Merge branch 'master' of https://github.com/biometrics/openbr

Scott Klum
2 parents 4d39cf93 ae51527d
Showing 5 changed files with 89 additions and 35 deletions
openbr/plugins/cluster.cpp
openbr/plugins/draw.cpp
openbr/plugins/gallery.cpp
openbr/plugins/keypoint.cpp
openbr/plugins/svm.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "openbr_internal.h"
 #include <opencv2/flann/flann.hpp>
+#include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
 using namespace cv;
@@ -26,39 +26,40 @@ namespace br
 /*!
  * \ingroup transforms
- * \brief Wraps OpenCV kmeans
+ * \brief Wraps OpenCV kmeans and flann.
  * \author Josh Klontz \cite jklontz
  */
 class KMeansTransform : public Transform
 {
     Q_OBJECT
-    Q_PROPERTY(int k READ get_k WRITE set_k RESET reset_k)
-    BR_PROPERTY(int, k, 1)
+    Q_PROPERTY(int kTrain READ get_kTrain WRITE set_kTrain RESET reset_kTrain STORED false)
+    Q_PROPERTY(int kSearch READ get_kSearch WRITE set_kSearch RESET reset_kSearch STORED false)
+    BR_PROPERTY(int, kTrain, 256)
+    BR_PROPERTY(int, kSearch, 1)
     Mat centers;
-    QSharedPointer<flann::Index> index;
-    QSharedPointer<QMutex> indexLock;
+    mutable QScopedPointer<flann::Index> index;
+    mutable QMutex mutex;
     void reindex()
     {
-        index = QSharedPointer<flann::Index>(new flann::Index(centers, flann::LinearIndexParams()));
-        indexLock = QSharedPointer<QMutex>(new QMutex());
+        index.reset(new flann::Index(centers, flann::LinearIndexParams()));
     }
     void train(const TemplateList &data)
     {
         Mat bestLabels;
-        const double compactness = kmeans(OpenCVUtils::toMatByRow(data.data()), k, bestLabels, TermCriteria(TermCriteria::MAX_ITER, 10, 0), 3, KMEANS_PP_CENTERS, centers);
-        reindex();
+        const double compactness = kmeans(OpenCVUtils::toMatByRow(data.data()), kTrain, bestLabels, TermCriteria(TermCriteria::MAX_ITER, 10, 0), 3, KMEANS_PP_CENTERS, centers);
         qDebug("KMeans compactness = %f", compactness);
+        reindex();
     }
     void project(const Template &src, Template &dst) const
     {
-        Mat dists;
-        indexLock->lock();
-        index->knnSearch(src, dst, dists, 1);
-        indexLock->unlock();
+        QMutexLocker locker(&mutex);
+        Mat dists, indicies;
+        index->knnSearch(src, indicies, dists, kSearch);
+        dst = indicies.reshape(1, 1);
     }
     void load(QDataStream &stream)
@@ -31,11 +31,9 @@ namespace br
 class DrawTransform : public UntrainableTransform
 {
     Q_OBJECT
-    Q_PROPERTY(bool named READ get_named WRITE set_named RESET reset_named STORED false)
     Q_PROPERTY(bool verbose READ get_verbose WRITE set_verbose RESET reset_verbose STORED false)
     Q_PROPERTY(bool points READ get_points WRITE set_points RESET reset_points STORED false)
     Q_PROPERTY(bool rects READ get_rects WRITE set_rects RESET reset_rects STORED false)
-    BR_PROPERTY(bool, named, true)
     BR_PROPERTY(bool, verbose, false)
     BR_PROPERTY(bool, points, true)
     BR_PROPERTY(bool, rects, true)
@@ -47,7 +45,7 @@ class DrawTransform : public UntrainableTransform
         dst = src.m().clone();
         if (points) {
-            const QList<Point2f> pointsList = OpenCVUtils::toPoints(named ? src.file.namedPoints() : src.file.points());
+            const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.namedPoints() + src.file.points());
             for (int i=0; i<pointsList.size(); i++) {
                 const Point2f &point = pointsList[i];
                 circle(dst, point, 3, color, -1);
@@ -55,7 +53,7 @@ class DrawTransform : public UntrainableTransform
             }
         }
         if (rects) {
-            foreach (const Rect &rect, OpenCVUtils::toRects(named ? src.file.namedRects() : src.file.rects()))
+            foreach (const Rect &rect, OpenCVUtils::toRects(src.file.namedRects() + src.file.rects()))
                 rectangle(dst, rect, color);
         }
     }
@@ -36,6 +36,50 @@ namespace br
 /*!
  * \ingroup galleries
+ * \brief Weka ARFF file format.
+ * \author Josh Klontz \cite jklontz
+ */
+class arffGallery : public Gallery
+{
+    Q_OBJECT
+    QFile arffFile;
+
+    TemplateList readBlock(bool *done)
+    {
+        (void) done;
+        qFatal("Not implemented.");
+        return TemplateList();
+    }
+
+    void write(const Template &t)
+    {
+        if (!arffFile.isOpen()) {
+            arffFile.setFileName(file.name);
+            arffFile.open(QFile::WriteOnly);
+            arffFile.write("% OpenBR templates\n"
+                           "@RELATION OpenBR\n"
+                           "\n");
+
+            arffFile.write("@ATTRIBUTE filename STRING\n");
+            arffFile.write(qPrintable("@ATTRIBUTE class {" + QStringList(Globals->classes.keys()).join(',') + "}\n"));
+
+            const int dimensions = t.m().rows * t.m().cols;
+            for (int i=0; i<dimensions; i++)
+                arffFile.write(qPrintable("@ATTRIBUTE v" + QString::number(i) + " NUMERIC\n"));
+
+            arffFile.write("\n@DATA\n");
+        }
+
+        arffFile.write(qPrintable("'" + t.file.name + "',"));
+        arffFile.write(qPrintable("'" + t.file.subject() + "',"));
+        arffFile.write(qPrintable(OpenCVUtils::matrixToStringList(t).join(',')+"\n"));
+    }
+};
+
+BR_REGISTER(Gallery, arffGallery)
+
+/*!
+ * \ingroup galleries
  * \brief A binary gallery.
  * \author Josh Klontz \cite jklontz
  */
@@ -395,12 +439,19 @@ class csvGallery : public Gallery
         if (!file.exists()) return templates;
         QStringList lines = QtUtils::readLines(file);
-        if (!lines.isEmpty()) lines.removeFirst(); // Remove header
+        QRegExp regexp("\\s*,\\s*");
+        QStringList headers;
+        if (!lines.isEmpty()) headers = lines.takeFirst().split(regexp);
         foreach (const QString &line, lines) {
-            QStringList words = line.split(',');
-            if (words.isEmpty()) continue;
-            templates.append(File(words[fileIndex], words.size() > 1 ? words.takeLast() : ""));
+            QStringList words = line.split(regexp);
+            if (words.size() != headers.size()) continue;
+            File f;
+            for (int i=0; i<words.size(); i++) {
+                if (i == 0) f.name = words[i];
+                else        f.set(headers[i], words[i]);
+            }
+            templates.append(f);
         }
         return templates;
@@ -413,7 +464,11 @@ class csvGallery : public Gallery
     static QString getCSVElement(const QString &key, const QVariant &value, bool header)
     {
-        if (value.canConvert<QString>()) {
+        if ((key == "Label") && !header) {
+            QString stringLabel = Globals->classes.key(value.value<int>());
+            if (stringLabel.isEmpty()) return value.value<QString>();
+            else                       return stringLabel;
+        } else if (value.canConvert<QString>()) {
             if (header) return key;
             else        return value.value<QString>();
         } else if (value.canConvert<QPointF>()) {
@@ -58,7 +58,7 @@ class KeyPointDetectorTransform : public UntrainableTransform
         QList<Rect> rects;
         foreach (const KeyPoint &keyPoint, keyPoints)
-            rects.append(Rect(keyPoint.pt.x, keyPoint.pt.y, keyPoint.size, keyPoint.size));
+            rects.append(Rect(keyPoint.pt.x-keyPoint.size/2, keyPoint.pt.y-keyPoint.size/2, keyPoint.size, keyPoint.size));
         dst.file.setRects(OpenCVUtils::fromRects(rects));
     }
 };
@@ -90,13 +90,12 @@ class KeyPointDescriptorTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         std::vector<KeyPoint> keyPoints;
-        if (size == -1) {
+        if (size == -1)
             foreach (const QRectF &ROI, src.file.rects())
-                keyPoints.push_back(KeyPoint(ROI.x(), ROI.y(), (ROI.width() + ROI.height())/2));
-        } else {
+                keyPoints.push_back(KeyPoint(ROI.x()+ROI.width()/2, ROI.y()+ROI.height()/2, (ROI.width() + ROI.height())/2));
+        else
             foreach (const QPointF &landmark, src.file.points())
                 keyPoints.push_back(KeyPoint(landmark.x(), landmark.y(), size));
-        }
         descriptorExtractor->compute(src, keyPoints, dst);
     }
 };
@@ -75,14 +75,15 @@ private:
         cv::Mat data = OpenCVUtils::toMat(_data.data());
         cv::Mat lab = OpenCVUtils::toMat(_data.labels<float>());
-        // Scale labels to [-1,1]
-        double min, max;
-        cv::minMaxLoc(lab, &min, &max);
-        if (max > min) {
-            a = 2.0/(max-min);
-            b = -(min*a+1);
-            lab = (lab * a) + b;
+        if ((type == EPS_SVR) || (type == NU_SVR)) {
+            // Scale labels to [-1,1]
+            double min, max;
             cv::minMaxLoc(lab, &min, &max);
+            if (max > min) {
+                a = 2.0/(max-min);
+                b = -(min*a+1);
+                lab = (lab * a) + b;
+            }
         }
         if (data.type() != CV_32FC1)