Commit 378f8090bf9a102d081c3f66960cc066e11091c1
1 parent
a9b62f7a
Distance::compare sum fusion
Showing
1 changed file
with
8 additions
and
1 deletions
openbr/openbr_plugin.cpp
| @@ -1388,7 +1388,14 @@ QList<float> Distance::compare(const TemplateList &targets, const Template &quer | @@ -1388,7 +1388,14 @@ QList<float> Distance::compare(const TemplateList &targets, const Template &quer | ||
| 1388 | 1388 | ||
| 1389 | float Distance::compare(const Template &a, const Template &b) const | 1389 | float Distance::compare(const Template &a, const Template &b) const |
| 1390 | { | 1390 | { |
| 1391 | - return compare(a.m(), b.m()); | 1391 | + float similarity = 0; |
| 1392 | + foreach (const cv::Mat &ma, a) | ||
| 1393 | + foreach (const cv::Mat &mb, b) | ||
| 1394 | + similarity += compare(ma, mb); | ||
| 1395 | + const int comparisons = a.size() * b.size(); | ||
| 1396 | + if (comparisons > 0) similarity /= comparisons; | ||
| 1397 | + else similarity = -std::numeric_limits<float>::max(); | ||
| 1398 | + return similarity; | ||
| 1392 | } | 1399 | } |
| 1393 | 1400 | ||
| 1394 | float Distance::compare(const cv::Mat &, const cv::Mat &) const | 1401 | float Distance::compare(const cv::Mat &, const cv::Mat &) const |