Distance::_compare ==> Distance::compare

Josh Klontz
1 parent 51a99b9f
Showing 8 changed files with 20 additions and 21 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/compare.cpp
sdk/plugins/ct8.cpp
sdk/plugins/keypoint.cpp
sdk/plugins/nt4.cpp
sdk/plugins/pp5.cpp
sdk/plugins/quality.cpp
@@ -1308,11 +1308,6 @@ void Distance::compare(const TemplateList &amp;target, const TemplateList &amp;query, Ou
     if (Globals->parallelism) Globals->trackFutures(futures);
 }
-float Distance::compare(const Template &target, const Template &query) const
-{
-    return _compare(target, query);
-}
-
 QList<float> Distance::compare(const TemplateList &targets, const Template &query) const
 {
     QList<float> scores; scores.reserve(targets.size());
@@ -1071,15 +1071,14 @@ public:
     static QSharedPointer<Distance> fromAlgorithm(const QString &algorithm); /*!< \brief Retrieve an algorithm's distance. */
     virtual void train(const TemplateList &src) { (void) src; } /*!< \brief Train the distance. */
     virtual void compare(const TemplateList &target, const TemplateList &query, Output *output) const; /*!< \brief Compare two template lists. */
-    float compare(const Template &target, const Template &query) const; /*!< \brief Compute the normalized distance between two templates. */
     QList<float> compare(const TemplateList &targets, const Template &query) const; /*!< \brief Compute the normalized distance between a template and a template list. */
+    virtual float compare(const Template &a, const Template &b) const = 0; /*!< \brief Compute the distance between two templates. */
 protected:
     inline Distance *make(const QString &description) { return make(description, this); } /*!< \brief Make a subdistance. */
 private:
     virtual void compareBlock(const TemplateList &target, const TemplateList &query, Output *output, int targetOffset, int queryOffset) const;
-    virtual float _compare(const Template &a, const Template &b) const = 0; /*!< \brief Compute the distance between two templates. */
 };
 /*!
@@ -49,7 +49,7 @@ public:
 private:
     BR_PROPERTY(Metric, metric, L2)
-    float _compare(const Template &a, const Template &b) const
+    float compare(const Template &a, const Template &b) const
     {
         if ((a.m().size != b.m().size) ||
             (a.m().type() != b.m().type()))
@@ -123,7 +123,7 @@ class ByteL1Distance : public Distance
 {
     Q_OBJECT
-    float _compare(const Template &a, const Template &b) const
+    float compare(const Template &a, const Template &b) const
     {
         return l1(a.m().data, b.m().data, a.m().total());
     }
@@ -141,7 +141,7 @@ class HalfByteL1Distance : public Distance
 {
     Q_OBJECT
-    float _compare(const Template &a, const Template &b) const
+    float compare(const Template &a, const Template &b) const
     {
         return packed_l1(a.m().data, b.m().data, a.m().total());
     }
@@ -158,7 +158,7 @@ class IdenticalDistance : public Distance
 {
     Q_OBJECT
-    float _compare(const Template &a, const Template &b) const
+    float compare(const Template &a, const Template &b) const
     {
         const Mat &am = a.m();
         const Mat &bm = b.m();
@@ -441,7 +441,7 @@ struct CT8Compare : public Distance,
     Q_OBJECT
     // Compare pre-extracted facevacs templates
-    float _compare(const Template &srcA, const Template &srcB) const
+    float compare(const Template &srcA, const Template &srcB) const
     {
         const float DefaultNonMatchScore = 0;
         if (!srcA.m().data || !srcB.m().data) return DefaultNonMatchScore;
@@ -126,7 +126,7 @@ class KeyPointMatcherTransform : public Distance
             qFatal("KeyPointMatcher::make failed to create DescriptorMatcher: %s", qPrintable(matcher));
     }
-    float _compare(const Template &a, const Template &b) const
+    float compare(const Template &a, const Template &b) const
     {
         if ((a.m().rows < 2) || (b.m().rows < 2)) return 0;
@@ -424,7 +424,7 @@ class NT4Compare : public Distance
     Resource<NT4Context> contexts;
-    float _compare(const br::Template &a, const br::Template &b) const
+    float compare(const br::Template &a, const br::Template &b) const
     {
         const float DefaultNonMatchScore = 0;
@@ -284,7 +284,7 @@ class PP5Compare : public Distance
     Q_OBJECT
-    float _compare(const Template &target, const Template &query) const
+    float compare(const Template &target, const Template &query) const
     {
         qFatal("PP5Compare: _compare should never be called");
         return 0;
@@ -181,7 +181,7 @@ class MPDistance : public Distance
             mps.insert(key, MP(genuineScores[key], impostorScores[key]));
     }
-    float _compare(const Template &target, const Template &query) const
+    float compare(const Template &target, const Template &query) const
     {
         return mps[query.file.getString(binKey, "")](distance->compare(target, query), gaussian, log);
     }
@@ -221,7 +221,7 @@ class UnitDistance : public Distance
         const TemplateList samples = templates.mid(0, 2000);
         const QList<float> sampleLabels = samples.labels<float>();
         QScopedPointer<MatrixOutput> memoryOutput(dynamic_cast<MatrixOutput*>(Output::make(".Matrix", FileList(samples.size()), FileList(samples.size()))));
-        compare(samples, samples, memoryOutput.data());
+        Distance::compare(samples, samples, memoryOutput.data());
         double genuineAccumulator, impostorAccumulator;
         int genuineCount, impostorCount;
@@ -254,7 +254,7 @@ class UnitDistance : public Distance
         qDebug("a = %f, b = %f", a, b);
     }
-    float _compare(const Template &target, const Template &query) const
+    float compare(const Template &target, const Template &query) const
     {
         return a * (distance->compare(target, query) - b);
     }
@@ -270,10 +270,15 @@ BR_REGISTER(Distance, UnitDistance)
 class MetadataDistance : public Distance
 {
     Q_OBJECT
-    Q_PROPERTY(Distance *distance READ get_distance WRITE set_distance RESET reset_distance)
-    BR_PROPERTY(Distance*, distance, make("Dist(L2)"))
+    Q_PROPERTY(br::Distance *distance READ get_distance WRITE set_distance RESET reset_distance)
+    BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
+
+    void train(const TemplateList &src)
+    {
+        distance->train(src);
+    }
-    float _compare(const Template &a, const Template &b) const
+    float compare(const Template &a, const Template &b) const
     {
         foreach (const QString &filter, Globals->demographicFilters.keys()) {
             const QString metadata = a.file.getString(filter, "");