Slight re-organization of some code in core/cluster.cpp

put "neighbor" class definitions in openbr_internal.h, export a couple additional functions in openbr_plugin.h. Add a function to get the comparison transformation used by an algorithm

Slight re-organization of some code in core/cluster.cpp
put "neighbor" class definitions in openbr_internal.h, export a couple additional functions in openbr_plugin.h. Add a function to get the comparison transformation used by an algorithm
Charles Otto
1 parent 4d4fe90d
Showing 5 changed files with 60 additions and 10 deletions
openbr/core/cluster.cpp
openbr/core/core.cpp
openbr/openbr_plugin.h
openbr/plugins/cluster.cpp
openbr/plugins/openbr_internal.h
@@ -25,13 +25,12 @@
  
 #include "openbr/core/bee.h"
 #include "openbr/core/cluster.h"
+#include "openbr/plugins/openbr_internal.h"
  
-typedef QPair<int,float> Neighbor; // QPair<id,similarity>
-typedef QList<Neighbor> Neighbors;
-typedef QVector<Neighbors> Neighborhood;
+using namespace br;
  
 // Compare function used to order neighbors from highest to lowest similarity
-static bool compareNeighbors(const Neighbor &a, const Neighbor &b)
+bool br::compareNeighbors(const Neighbor &a, const Neighbor &b)
 {
     if (a.second == b.second)
         return a.first < b.first;
@@ -715,6 +715,11 @@ void br::Deduplicate(const File &amp;inputGallery, const File &amp;outputGallery, const 
     else qFatal("Unable to convert deduplication threshold to float.");
 }
  
+QSharedPointer<br::Transform> br::Transform::fromComparison(const QString &algorithm)
+{
+    return AlgorithmManager::getAlgorithm(algorithm)->comparison;
+}
+
 QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algorithm, bool preprocess)
 {
     if (!preprocess)
@@ -461,9 +461,9 @@ struct TemplateList : public QList&lt;Template&gt;
     /*!< \brief Ensure labels are in the range [0,numClasses-1]. */
     BR_EXPORT static TemplateList relabel(const TemplateList &tl, const QString &propName, bool preserveIntegers);
  
-    QList<int> indexProperty(const QString &propName, QHash<QString, int> * valueMap=NULL,QHash<int, QVariant> * reverseLookup = NULL) const;
-    QList<int> indexProperty(const QString &propName, QHash<QString, int> &valueMap, QHash<int, QVariant> &reverseLookup) const;
-    QList<int> applyIndex(const QString &propName, const QHash<QString, int> &valueMap) const;
+    BR_EXPORT QList<int> indexProperty(const QString &propName, QHash<QString, int> * valueMap=NULL,QHash<int, QVariant> * reverseLookup = NULL) const;
+    BR_EXPORT QList<int> indexProperty(const QString &propName, QHash<QString, int> &valueMap, QHash<int, QVariant> &reverseLookup) const;
+    BR_EXPORT QList<int> applyIndex(const QString &propName, const QHash<QString, int> &valueMap) const;
  
     /*!
      * \brief Returns the total number of bytes in all the templates.
@@ -1163,6 +1163,7 @@ public:
     virtual ~Transform() {}
     static Transform *make(QString str, QObject *parent); /*!< \brief Make a transform from a string. */
     static QSharedPointer<Transform> fromAlgorithm(const QString &algorithm, bool preprocess=true); /*!< \brief Retrieve an algorithm's transform. If preprocess is true, attaches a stream transform as the root of the algorithm*/
+    static QSharedPointer<Transform> fromComparison(const QString &algorithm);
  
     virtual Transform *clone() const; /*!< \brief Copy the transform. */
  
@@ -1446,6 +1447,10 @@ BR_EXPORT void Cat(const QStringList &amp;inputGalleries, const QString &amp;outputGalle
  */
 BR_EXPORT void Deduplicate(const File &inputGallery, const File &outputGallery, const QString &threshold);
  
+BR_EXPORT Transform *wrapTransform(Transform *base, const QString &target);
+
+BR_EXPORT Transform *pipeTransforms(QList<Transform *> &transforms);
+
 /*! @}*/
  
 } // namespace br
@@ -204,6 +204,44 @@ class RandomCentroidsTransform : public Transform
  
 BR_REGISTER(Transform, RandomCentroidsTransform)
  
+class RegInitializer : public Initializer
+{
+    Q_OBJECT
+
+    void initialize() const
+    {
+        qRegisterMetaType<br::Neighbors>();
+    }
+};
+BR_REGISTER(Initializer, RegInitializer)
+
+class CollectNNTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int keep READ get_keep WRITE set_keep RESET reset_keep STORED false)
+    BR_PROPERTY(int, keep, 20)
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst.file = src.file;
+        dst.m() = cv::Mat();
+        Neighbors neighbors;
+        for (int i=0; i < src.m().cols;i++) {
+            // skip self compares
+            if (i == src.file.get<int>("FrameNumber"))
+                continue;
+            neighbors.append(Neighbor(i, src.m().at<float>(0,i)));
+        }
+        int actuallyKeep = std::min(keep, neighbors.size());
+        std::partial_sort(neighbors.begin(), neighbors.begin()+actuallyKeep, neighbors.end(), compareNeighbors);
+
+        Neighbors selected = neighbors.mid(0, actuallyKeep);
+        dst.file.set("neighbors", QVariant::fromValue(selected));
+    }
+};
+BR_REGISTER(Transform, CollectNNTransform)
+
 } // namespace br
  
 #include "cluster.moc"
@@ -477,9 +477,6 @@ public:
  
 void applyAdditionalProperties(const File &temp, Transform *target);
  
-Transform *wrapTransform(Transform *base, const QString &target);
-
-Transform *pipeTransforms(QList<Transform *> &transforms);
  
 inline void splitFTEs(TemplateList &src, TemplateList  &ftes)
 {
@@ -494,6 +491,12 @@ inline void splitFTEs(TemplateList &amp;src, TemplateList  &amp;ftes)
     }
 }
  
+typedef QPair<int,float> Neighbor; // QPair<id,similarity>
+typedef QList<Neighbor> Neighbors;
+typedef QVector<Neighbors> Neighborhood;
+
+BR_EXPORT bool compareNeighbors(const Neighbor &a, const Neighbor &b);
+
 }
  
 #endif // OPENBR_INTERNAL_H