Merge pull request #243 from biometrics/janus_search

Implemented openbr janus_search

Merge pull request #243 from biometrics/janus_search
Implemented openbr janus_search
sklum
2 parents f7e73dc8 fc1c58b6
Showing 5 changed files with 39 additions and 9 deletions
openbr/gui/faceviewer.h
openbr/gui/templateviewer.h
openbr/gui/templateviewergrid.cpp
openbr/gui/templateviewergrid.h
openbr/janus.cpp
@@ -19,7 +19,7 @@ public:
     explicit FaceViewer(QWidget *parent = 0);
 public slots:
-    void setFile(const File &file_);
+    void setFile(const br::File &file_);
 protected slots:
     void mouseMoveEvent(QMouseEvent *event);
@@ -24,7 +24,7 @@ public:
     explicit TemplateViewer(QWidget *parent = 0);
 public slots:
-    void setFile(const File &file);
+    void setFile(const br::File &file);
     void setEditable(bool enabled);
     void setMousePoint(const QPointF &mousePoint);
     void setFormat(const QString &format);
@@ -52,10 +52,10 @@ protected slots:
     void paintEvent(QPaintEvent *event);
 signals:
-    void newInput(File);
+    void newInput(br::File);
     void newInput(QImage);
     void newMousePoint(QPointF);
-    void selectedInput(File);
+    void selectedInput(br::File);
 };
 }
@@ -18,10 +18,10 @@ void TemplateViewerGrid::setFiles(const FileList &amp;files)
     const int size = std::max(1, (int)ceil(sqrt((float)files.size())));
     while (templateViewers.size() < size*size) {
         templateViewers.append(QSharedPointer<TemplateViewer>(new TemplateViewer()));
-        connect(templateViewers.last().data(), SIGNAL(newInput(File)), this, SIGNAL(newInput(File)));
+        connect(templateViewers.last().data(), SIGNAL(newInput(br::File)), this, SIGNAL(newInput(br::File)));
         connect(templateViewers.last().data(), SIGNAL(newInput(QImage)), this, SIGNAL(newInput(QImage)));
         connect(templateViewers.last().data(), SIGNAL(newMousePoint(QPointF)), this, SIGNAL(newMousePoint(QPointF)));
-        connect(templateViewers.last().data(), SIGNAL(selectedInput(File)), this, SIGNAL(selectedInput(File)));
+        connect(templateViewers.last().data(), SIGNAL(selectedInput(br::File)), this, SIGNAL(selectedInput(br::File)));
     }
     { // Clear layout
@@ -24,15 +24,15 @@ public:
     explicit TemplateViewerGrid(QWidget *parent = 0);
 public slots:
-    void setFiles(const FileList &file);
+    void setFiles(const br::FileList &file);
     void setFormat(const QString &format);
     void setMousePoint(const QPointF &mousePoint);
 signals:
-    void newInput(File);
+    void newInput(br::File);
     void newInput(QImage);
     void newMousePoint(QPointF);
-    void selectedInput(File);
+    void selectedInput(br::File);
 };
 } // namespace br
 #include "janus.h"
 #include "janus_io.h"
 #include "openbr_plugin.h"
+#include "openbr/core/opencvutils.h"
+#include "openbr/core/common.h"
 using namespace br;
@@ -154,6 +156,34 @@ janus_error janus_gallery_size(janus_gallery gallery, size_t *size)
     return JANUS_SUCCESS;
 }
+janus_error janus_search(const janus_template template_, janus_gallery gallery, int requested_returns, janus_template_id *template_ids, float *similarities, int *actual_returns)
+{
+    TemplateList query;
+    query.append(*template_);
+
+    const TemplateList targets = TemplateList::fromGallery(gallery);
+
+    if (targets.size() < requested_returns) *actual_returns = targets.size();
+    else                                    *actual_returns = requested_returns;
+
+    QScopedPointer<MatrixOutput> matrix(MatrixOutput::make(targets.files(), query.files()));
+    distance->compare(targets, query, matrix.data());
+
+    typedef QPair<float,int> Pair;
+    QList<Pair> sortedSimilarities = Common::Sort(OpenCVUtils::matrixToVector<float>(matrix.data()->data.row(0)), true, *actual_returns);
+
+    FileList targetFiles;
+    for (int i=0; i<sortedSimilarities.size(); i++) {
+        matrix.data()->data.at<float>(0,i) = sortedSimilarities[i].first;
+        targetFiles.append(targets[sortedSimilarities[i].second]);
+    }
+    const QVector<janus_template_id> targetIds = File::get<janus_template_id,File>(targetFiles, "TEMPLATE_ID").toVector();
+
+    memcpy(similarities, matrix->data.data, *actual_returns * sizeof(float));
+    memcpy(template_ids, targetIds.data(), *actual_returns * sizeof(janus_template_id));
+    return JANUS_SUCCESS;
+}
+
 janus_error janus_compare(janus_gallery target, janus_gallery query, float *similarity_matrix, janus_template_id *target_ids, janus_template_id *query_ids)
 {
     const TemplateList targets = TemplateList::fromGallery(target);