Peter M. Groen / openbr

Commit b418c8e3ebc38a8a428a282e887f8a9ce7b53f86

Authored by Josh Klontz
2 parents f8d93af0 f4bafe32

Merge pull request #432 from kashyap2690/patch-1 

Respect scoreNormalization flag in UnitDistance.
Inline Side-by-side
Showing 1 changed file with 8 additions and 2 deletions
openbr/plugins/distance/unit.cpp
  View file @b418c8e
@@ -76,12 +76,18 @@ class UnitDistance : public Distance @@ -76,12 +76,18 @@ class UnitDistance : public Distance
76 76
77 float compare(const Template &target, const Template &query) const 77 float compare(const Template &target, const Template &query) const
78 { 78 {
79 - return a * (distance->compare(target, query) - b); 79 + return normalize(distance->compare(target, query));
80 } 80 }
81 81
82 float compare(const cv::Mat &target, const cv::Mat &query) const 82 float compare(const cv::Mat &target, const cv::Mat &query) const
83 { 83 {
84 - return a * (distance->compare(target, query) - b); 84 + return normalize(distance->compare(target, query));
  85 + }
  86 +
  87 + float normalize(float score) const
  88 + {
  89 + if (!Globals->scoreNormalization) return score;
  90 + return a * (score - b);
85 } 91 }
86 }; 92 };
87 93