Updates to trainable transforms

Scott Klum
1 parent d97f68bd
Showing 4 changed files with 35 additions and 31 deletions
openbr/plugins/distance/fuse.cpp
openbr/plugins/distance/neglogplusone.cpp
openbr/plugins/distance/pipe.cpp
openbr/plugins/distance/sum.cpp
@@ -18,6 +18,8 @@
 #include <openbr/plugins/openbr_internal.h>
+#include <QtConcurrent>
+
 namespace br
 {
@@ -31,26 +33,25 @@ class FuseDistance : public Distance
 {
     Q_OBJECT
     Q_ENUMS(Operation)
-    Q_PROPERTY(QStringList descriptions READ get_descriptions WRITE set_descriptions RESET reset_descriptions STORED false)
+    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)
-    QList<br::Distance*> distances;
-
 public:
     /*!< */
     enum Operation {Mean, Sum, Max, Min};
 private:
-    BR_PROPERTY(QStringList, descriptions, QStringList() << "L2")
+    BR_PROPERTY(QList<br::Distance*>, distances, QList<br::Distance*>())
     BR_PROPERTY(Operation, operation, Mean)
     BR_PROPERTY(QList<float>, weights, QList<float>())
-    void init()
+    bool trainable()
     {
-        for (int i=0; i<descriptions.size(); i++) {
-            distances.append(make(descriptions[i]));
-        }
+        for (int i=0; i<distances.size(); i++)
+            if (distances[i]->trainable())
+                return true;
+        return false;
     }
     void train(const TemplateList &src)
@@ -62,10 +63,10 @@ private:
         QList<TemplateList> partitionedSrc = src.partition(split);
         // Train on each of the partitions
-        for (int i=0; i<descriptions.size(); i++) {
-            distances.append(make(descriptions[i]));
-            distances[i]->train(partitionedSrc[i]);
-        }
+        QFutureSynchronizer<void> futures;
+        for (int i=0; i<distances.size(); i++)
+            futures.addFuture(QtConcurrent::run(distances[i], &Distance::train, partitionedSrc[i]));
+        futures.waitForFinished();
     }
     float compare(const Template &a, const Template &b) const
@@ -99,24 +100,6 @@ private:
         }
         return 0;
     }
-
-    void store(QDataStream &stream) const
-    {
-        stream << distances.size();
-        foreach (Distance *distance, distances)
-            distance->store(stream);
-    }
-
-    void load(QDataStream &stream)
-    {
-        int numDistances;
-        stream >> numDistances;
-        for (int i=0; i<descriptions.size(); i++) {
-            distances.append(make(descriptions[i]));
-            distances[i]->load(stream);
-        }
-
-    }
 };
 BR_REGISTER(Distance, FuseDistance)
@@ -24,12 +24,17 @@ namespace br
  * \brief Returns -log(distance(a,b)+1)
  * \author Josh Klontz \cite jklontz
  */
-class NegativeLogPlusOneDistance : public UntrainableDistance
+class NegativeLogPlusOneDistance : public Distance
 {
     Q_OBJECT
     Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
     BR_PROPERTY(br::Distance*, distance, NULL)
+    bool trainable()
+    {
+        return distance->trainable();
+    }
+
     void train(const TemplateList &src)
     {
         distance->train(src);
@@ -36,6 +36,14 @@ class PipeDistance : public Distance
     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)
     {
         QFutureSynchronizer<void> futures;
@@ -32,6 +32,14 @@ class SumDistance : public UntrainableDistance
     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)
     {
         QFutureSynchronizer<void> futures;