potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #29290 from vrabaud:mcc2

Browse Source 
Get MCC to be deterministic
This commit is contained in:
Alexander Smorkalov
2026-06-15 17:08:29 +03:00
committed by GitHub
parent a18356853d 7b7a62528f
commit 8bbe8eeb86
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/mcc/checker_detector.cpp
+16 -2
View File
@@ -1265,6 +1265,18 @@ void CCheckerDetectorImpl::
void CCheckerDetectorImpl::
removeTooCloseDetections()
{
// Provide a deterministic output by sorting the checkers by their cost and
// then by their center coordinates.
std::sort(m_checkers.begin(), m_checkers.end(),
[](const Ptr<CChecker> &a, const Ptr<CChecker> &b) {
if (a->getCost() != b->getCost())
return a->getCost() < b->getCost();
Point2f ca = a->getCenter();
Point2f cb = b->getCenter();
if (ca.x != cb.x) return ca.x < cb.x;
return ca.y < cb.y;
});
// Remove these elements which corners are too close to each other.
// Eliminate overlaps!!!
// First detect candidates for removal:
@@ -1306,8 +1318,10 @@ void CCheckerDetectorImpl::
size_t removalIndex;
if (p1 < p2)
removalIndex = tooNearCandidates[i].second;
else
else if (p2 < p1)
removalIndex = tooNearCandidates[i].first;
else
removalIndex = std::max(tooNearCandidates[i].first, tooNearCandidates[i].second);
removalMask[removalIndex] = true;
}
@@ -1322,7 +1336,7 @@ void CCheckerDetectorImpl::
m_checkers.push_back(copy_m_checkers[i]);
}
sort( m_checkers.begin(), m_checkers.end(),
std::stable_sort( m_checkers.begin(), m_checkers.end(),
[&](const Ptr<CChecker> &a, const Ptr<CChecker> &b)
{
return a->getCost() < b->getCost();