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

Mark Burge
2 parents 8c3d1bf1 edabd67a
Showing 8 changed files with 67 additions and 27 deletions
openbr/core/eigenutils.cpp
openbr/core/eigenutils.h
openbr/janus
openbr/janus.cpp
openbr/openbr_plugin.h
openbr/plugins/gallery.cpp
openbr/plugins/template.cpp
scripts/lfpwToSigset.py
@@ -16,4 +16,32 @@ void writeEigen(MatrixXf X, QString filename) {
     format->write(br::Template(m));
 }
  
+void writeEigen(MatrixXd X, QString filename) {
+    Mat m(X.rows(),X.cols(),CV_32FC1);
+    for (int i = 0; i < X.rows(); i++) {
+        for (int j = 0; j < X.cols(); j++) {
+            m.at<float>(i,j) = (float)X(i,j);
+        }
+    }
+    QScopedPointer<br::Format> format(br::Factory<br::Format>::make(filename));
+    format->write(br::Template(m));
+}
  
+void writeEigen(VectorXd X, QString filename) {
+    Mat m(X.size(),1,CV_32FC1);
+    for (int i = 0; i < X.rows(); i++) {
+        m.at<float>(i,0) = (float)X(i);
+    }
+    QScopedPointer<br::Format> format(br::Factory<br::Format>::make(filename));
+    format->write(br::Template(m));
+}
+
+void printEigen(Eigen::MatrixXd X) {
+    for (int i = 0; i < X.rows(); i++) {
+        QString str;
+        for (int j = 0; j < X.cols(); j++) {
+            str.append(QString::number(X(i,j)) + " ");
+        }
+        qDebug() << str;
+    }
+}
@@ -22,6 +22,9 @@
 #include <assert.h>
  
 void writeEigen(Eigen::MatrixXf X, QString filename);
+void writeEigen(Eigen::MatrixXd X, QString filename);
+void writeEigen(Eigen::VectorXd X, QString filename);
+void printEigen(Eigen::MatrixXd X);
  
 template<typename _Scalar, int _Rows, int _Cols, int _Options, int _MaxRows, int _MaxCols>
 inline QDataStream &operator<<(QDataStream &stream, const Eigen::Matrix< _Scalar, _Rows, _Cols, _Options, _MaxRows, _MaxCols > &mat)
-Subproject commit b5c3cae0a3134f66b7668a8b928d39288f83b568
+Subproject commit aa2abb334a3179a04e14b713cd31f133d0c81321
@@ -112,3 +112,14 @@ janus_error janus_verify(const janus_template a, const janus_template b, float *
     *similarity = a_templates * b_templates / dist;
     return JANUS_SUCCESS;
 }
+
+struct janus_incomplete_gallery_type
+{
+    QList< QPair<janus_template, janus_template_id> > templates;
+};
+
+janus_error janus_initialize_gallery(janus_incomplete_gallery *incomplete_gallery)
+{
+    *incomplete_gallery = new janus_incomplete_gallery_type();
+    return JANUS_SUCCESS;
+}
@@ -239,6 +239,13 @@ struct BR_EXPORT File
         return variant.value<T>();
     }
  
+    /*!< \brief Specialization for boolean type. */
+    template <bool>
+    bool get(const QString &key) const
+    {
+        return getBool(key);
+    }
+
     /*!< \brief Returns a value for the key, returning \em defaultValue if the key does not exist or can't be converted. */
     template <typename T>
     T get(const QString &key, const T &defaultValue) const
@@ -250,6 +257,13 @@ struct BR_EXPORT File
     }
  
     /*!< \brief Specialization for boolean type. */
+    template <bool>
+    bool get(const QString &key, const bool &defaultValue) const
+    {
+        return getBool(key, defaultValue);
+    }
+
+    /*!< \brief Specialization for boolean type. */
     bool getBool(const QString &key, bool defaultValue = false) const;
  
     /*!< \brief Specialization for list type. Returns a list of type T for the key, throwing an error if the key does not exist or if the value cannot be converted to the specified type. */
@@ -99,12 +99,12 @@ class galGallery : public Gallery
     void init()
     {
         gallery.setFileName(file);
-        if (file.get<bool>("remove", false))
+        if (file.get<bool>("remove"))
             gallery.remove();
         QtUtils::touchDir(gallery);
         QFile::OpenMode mode = QFile::ReadWrite;
  
-        if (file.contains("append"))
+        if (file.get<bool>("append"))
             mode |= QFile::Append;
  
         if (!gallery.open(mode))
@@ -52,39 +52,23 @@ BR_REGISTER(Transform, RemoveTemplatesTransform)
  
 /*!
  * \ingroup transforms
- * \brief Filters a gallery based on the value of a metadata field.
+ * \brief Removes a metadata field from all templates
  * \author Brendan Klare \cite bklare
  */
-class FilterOnMetadataTransform : public UntrainableMetaTransform
+class RemoveMetadataTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(QString attributeName READ get_attributeName WRITE set_attributeName RESET reset_attributeName STORED false)
-    Q_PROPERTY(float threshold READ get_threshold WRITE set_threshold RESET reset_threshold STORED false)
-    Q_PROPERTY(bool isGreaterThan READ get_isGreaterThan WRITE set_isGreaterThan RESET reset_isGreaterThan STORED false)
-    BR_PROPERTY(QString, attributeName, "Confidence")
-    BR_PROPERTY(float, threshold, 0)
-    BR_PROPERTY(bool, isGreaterThan, true)
-
-    void project(const TemplateList &src, TemplateList &dst) const
-    {
-        QList<Template> filtered;
-        foreach (Template t, src) {
-            if (!t.file.contains(attributeName))
-                continue;
-            bool pass = t.file.get<float>(attributeName) > threshold;
-            if (isGreaterThan ? pass : !pass)
-                filtered.append(t);
-        }
-        dst = TemplateList(filtered);
-    }
+    BR_PROPERTY(QString, attributeName, "None")
  
     void project(const Template &src, Template &dst) const
     {
-        (void) src; (void) dst; qFatal("shouldn't be here");
+        dst = src;
+        if (dst.file.contains(attributeName))
+            dst.file.remove(attributeName);
     }
 };
-
-BR_REGISTER(Transform, FilterOnMetadataTransform)
+BR_REGISTER(Transform, RemoveMetadataTransform)
  
 } // namespace br
  
@@ -37,7 +37,7 @@ for lfpwType in [&#39;train&#39;,&#39;test&#39;]:
     if not os.path.exists('sigset'):
         os.mkdir('sigset')
     out = open('sigset/%s.xml' % lfpwType,'w')
-    print >> out, xmlRoot.toprettyxml()
+    out.write(xmlRoot.toprettyxml())
     out.close()