generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added synonym CV_COMP_HELLIGNER for CV_COMP_BHATTACHARYAA to reflect the real formula used (bug report #2073)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-06-22 15:12:19 +00:00
parent 1365e28a54
commit 87d1731714
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/imgproc/doc/histograms.rst
View File

@@ -174,10 +174,12 @@ Compares two histograms.
* **CV_COMP_INTERSECT** Intersection * **CV_COMP_INTERSECT** Intersection
* **CV_COMP_BHATTACHARYYA** Bhattacharyya distance * **CV_COMP_BHATTACHARYYA** Bhattacharyya distance
* **CV_COMP_HELLINGER** Synonym for ``CV_COMP_BHATTACHARYYA``
The functions ``compareHist`` compare two dense or two sparse histograms using the specified method: The functions ``compareHist`` compare two dense or two sparse histograms using the specified method:
* Correlation (method=CV\_COMP\_CORREL) * Correlation (``method=CV_COMP_CORREL``)
.. math:: .. math::
@@ -192,19 +194,19 @@ The functions ``compareHist`` compare two dense or two sparse histograms using t
and and
:math:`N` is a total number of histogram bins. :math:`N` is a total number of histogram bins.
* Chi-Square (method=CV\_COMP\_CHISQR) * Chi-Square (``method=CV_COMP_CHISQR``)
.. math:: .. math::
d(H_1,H_2) = \sum _I \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)} d(H_1,H_2) = \sum _I \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)}
* Intersection (method=CV\_COMP\_INTERSECT) * Intersection (``method=CV_COMP_INTERSECT``)
.. math:: .. math::
d(H_1,H_2) = \sum _I \min (H_1(I), H_2(I)) d(H_1,H_2) = \sum _I \min (H_1(I), H_2(I))
* Bhattacharyya distance (method=CV\_COMP\_BHATTACHARYYA) * Bhattacharyya distance (``method=CV_COMP_BHATTACHARYYA`` or ``method=CV_COMP_HELLINGER``). In fact, OpenCV computes Hellinger distance, which is related to Bhattacharyya coefficient.
.. math:: .. math::

3
modules/imgproc/include/opencv2/imgproc/types_c.h
View File

@@ -460,7 +460,8 @@ enum
CV_COMP_CORREL =0, CV_COMP_CORREL =0,
CV_COMP_CHISQR =1, CV_COMP_CHISQR =1,
CV_COMP_INTERSECT =2, CV_COMP_INTERSECT =2,
CV_COMP_BHATTACHARYYA =3 CV_COMP_BHATTACHARYYA =3,
CV_COMP_HELLINGER =CV_COMP_BHATTACHARYYA
}; };
/* Mask size for distance transform */ /* Mask size for distance transform */