Merge pull request #288 from biometrics/classification_interface

Implementation of Classification Interface

Merge pull request #288 from biometrics/classification_interface
Implementation of Classification Interface
JordanCheney
2 parents 416bc1c7 34937da0
Showing 5 changed files with 38 additions and 14 deletions
openbr/gui/classifier.cpp
openbr/gui/classifier.h
openbr/gui/templatemetadata.cpp
openbr/gui/templatemetadata.h
openbr/openbr_plugin.h
@@ -7,7 +7,7 @@ using namespace br;
 /**** CLASSIFIER ****/
 /*** PUBLIC ***/
-Classifier::Classifier(QWidget *parent)
+GUIClassifier::GUIClassifier(QWidget *parent)
     : QLabel(parent)
 {
     setAlignment(Qt::AlignCenter);
@@ -15,26 +15,26 @@ Classifier::Classifier(QWidget *parent)
     connect(this, SIGNAL(newClassification(QString,QString)), this, SLOT(setClassification(QString,QString)));
 }
-void Classifier::setAlgorithm(const QString &algorithm)
+void GUIClassifier::setAlgorithm(const QString &algorithm)
 {
     this->algorithm = algorithm;
 }
 /*** PUBLIC SLOTS ***/
-void Classifier::classify(const File &file)
+void GUIClassifier::classify(const File &file)
 {
-    QtConcurrent::run(this, &Classifier::_classify, file);
+    QtConcurrent::run(this, &GUIClassifier::_classify, file);
 }
 /*** PRIVATE SLOTS ***/
-void Classifier::setClassification(const QString &key, const QString &value)
+void GUIClassifier::setClassification(const QString &key, const QString &value)
 {
     if (key.isEmpty()) clear();
     else               setText(QString("%1: <b>%2</b>").arg(key, value));
 }
 /*** PRIVATE ***/
-void Classifier::_classify(File file)
+void GUIClassifier::_classify(File file)
 {
     QString key, value;
     QSharedPointer<Transform> transform = Transform::fromAlgorithm(algorithm);
-#ifndef BR_CLASSIFIER_H
-#define BR_CLASSIFIER_H
+#ifndef BR_GUICLASSIFIER_H
+#define BR_GUICLASSIFIER_H
 #include <QLabel>
 #include <QWidget>
@@ -9,13 +9,13 @@
 namespace br
 {
-class BR_EXPORT Classifier : public QLabel
+class BR_EXPORT GUIClassifier : public QLabel
 {
     Q_OBJECT
     QString algorithm;
 public:
-    explicit Classifier(QWidget *parent = 0);
+    explicit GUIClassifier(QWidget *parent = 0);
     void setAlgorithm(const QString &algorithm);
 public slots:
@@ -33,4 +33,4 @@ signals:
 } // namespace br
-#endif // BR_CLASSIFIER_H
+#endif // BR_GUICLASSIFIER_H
@@ -21,7 +21,7 @@ TemplateMetadata::TemplateMetadata(QWidget *parent)
 void TemplateMetadata::addClassifier(const QString &classifier_, const QString algorithm)
 {
-    QSharedPointer<Classifier> classifier(new Classifier());
+    QSharedPointer<GUIClassifier> classifier(new GUIClassifier());
     classifier->setAlgorithm(classifier_);
     layout->addWidget(classifier.data());
     conditionalClassifiers.append(ConditionalClassifier(algorithm, classifier));
@@ -24,10 +24,10 @@ class BR_EXPORT TemplateMetadata : public QWidget
     struct ConditionalClassifier
     {
         QString algorithm;
-        QSharedPointer<Classifier> classifier;
+        QSharedPointer<GUIClassifier> classifier;
         ConditionalClassifier() {}
-        ConditionalClassifier(const QString &algorithm_, const QSharedPointer<Classifier> &classifier_)
+        ConditionalClassifier(const QString &algorithm_, const QSharedPointer<GUIClassifier> &classifier_)
             : algorithm(algorithm_), classifier(classifier_) {}
     };
     QList<ConditionalClassifier> conditionalClassifiers;
@@ -1376,6 +1376,30 @@ private:
         { (void) targetGallery; (void) queryGallery; (void) output; return false; }
 };
+class BR_EXPORT Representation : public Object
+{
+    Q_OBJECT
+
+public:
+    virtual ~Representation() {}
+
+    virtual cv::Mat preprocess(const cv::Mat &image) const { return image; }
+    // By convention, an empty indices list will result in all feature responses being calculated
+    // and returned.
+    virtual cv::Mat evaluate(const cv::Mat &image, const QList<int> &indices = QList<int>()) const = 0;
+};
+
+class BR_EXPORT Classifier : public Object
+{
+    Q_OBJECT
+
+public:
+    virtual ~Classifier() {}
+
+    virtual void train(const QList<cv::Mat> &images, const QList<float> &labels) = 0;
+    virtual float classify(const cv::Mat &image) const = 0;
+};
+
 /*!
 * \brief Returns \c true if the algorithm is a classifier, \c false otherwise.
 *