Added ListDistance

Scott Klum
1 parent c01caf17
Showing 4 changed files with 23 additions and 33 deletions
openbr/plugins/distance/fuse.cpp
openbr/plugins/distance/pipe.cpp
openbr/plugins/distance/sum.cpp
openbr/plugins/openbr_internal.h
@@ -29,11 +29,10 @@ namespace br
  * \author Scott Klum \cite sklum
  * \note Operation: Mean, sum, min, max are supported.
  */
-class FuseDistance : public Distance
+class FuseDistance : public ListDistance
 {
     Q_OBJECT
     Q_ENUMS(Operation)
-    Q_PROPERTY(QList<br::Distance*> distances READ get_distances WRITE set_distances RESET reset_distances)
     Q_PROPERTY(Operation operation READ get_operation WRITE set_operation RESET reset_operation STORED false)
     Q_PROPERTY(QList<float> weights READ get_weights WRITE set_weights RESET reset_weights STORED false)
@@ -42,18 +41,9 @@ public:
     enum Operation {Mean, Sum, Max, Min};
 private:
-    BR_PROPERTY(QList<br::Distance*>, distances, QList<br::Distance*>())
     BR_PROPERTY(Operation, operation, Mean)
     BR_PROPERTY(QList<float>, weights, QList<float>())
-    bool trainable()
-    {
-        for (int i=0; i<distances.size(); i++)
-            if (distances[i]->trainable())
-                return true;
-        return false;
-    }
-
     void train(const TemplateList &src)
     {
         // Partition the templates by matrix
@@ -30,19 +30,9 @@ namespace br
  * If the result of the comparison with any given distance is -FLOAT_MAX then this result is returned early.
  * Otherwise the returned result is the value of comparing the templates using the last br::Distance.
  */
-class PipeDistance : public Distance
+class PipeDistance : public ListDistance
 {
     Q_OBJECT
-    Q_PROPERTY(QList<br::Distance*> distances READ get_distances WRITE set_distances RESET reset_distances)
-    BR_PROPERTY(QList<br::Distance*>, distances, QList<br::Distance*>())
-
-    bool trainable()
-    {
-        for (int i=0; i<distances.size(); i++)
-            if (distances[i]->trainable())
-                return true;
-        return false;
-    }
     void train(const TemplateList &data)
     {
@@ -26,19 +26,9 @@ namespace br
  * \brief Sum match scores across multiple distances
  * \author Scott Klum \cite sklum
  */
-class SumDistance : public Distance
+class SumDistance : public ListDistance
 {
     Q_OBJECT
-    Q_PROPERTY(QList<br::Distance*> distances READ get_distances WRITE set_distances RESET reset_distances)
-    BR_PROPERTY(QList<br::Distance*>, distances, QList<br::Distance*>())
-
-    bool trainable()
-    {
-        for (int i=0; i<distances.size(); i++)
-            if (distances[i]->trainable())
-                return true;
-        return false;
-    }
     void train(const TemplateList &data)
     {
@@ -485,6 +485,26 @@ private:
     void train(const TemplateList &data) { (void) data; }
 };
+/*!
+ * \brief A br::Distance that does not require training data.
+ */
+class BR_EXPORT ListDistance : public Distance
+{
+    Q_OBJECT
+
+public:
+    Q_PROPERTY(QList<br::Distance*> distances READ get_distances WRITE set_distances RESET reset_distances)
+    BR_PROPERTY(QList<br::Distance*>, distances, QList<br::Distance*>())
+
+    bool trainable()
+    {
+        for (int i=0; i<distances.size(); i++)
+            if (distances[i]->trainable())
+                return true;
+        return false;
+    }
+};
+
 }
 #endif // OPENBR_INTERNAL_H