songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix candidate counting

This commit is contained in:
Simon Giraudot 2021-04-14 09:20:17 +02:00
parent 8f8679e038
commit e87747d082
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h
View File

@ -588,6 +588,7 @@ public:
generated_candidates++; generated_candidates++;
//add candidate for each type of primitives //add candidate for each type of primitives
bool candidate_success = false;
for(typename std::vector<Shape *(*)()>::iterator it = for(typename std::vector<Shape *(*)()>::iterator it =
m_shape_factories.begin(); it != m_shape_factories.end(); it++) { m_shape_factories.begin(); it != m_shape_factories.end(); it++) {
if (callback && !callback(num_invalid / double(m_num_total_points))) if (callback && !callback(num_invalid / double(m_num_total_points)))
@ -611,17 +612,19 @@ public:
best_expected = p->expected_value(); best_expected = p->expected_value();
candidates.push_back(p); candidates.push_back(p);
candidate_success = true;
} }
else { else {
failed_candidates++;
delete p; delete p;
} }
} }
else { else {
failed_candidates++;
delete p; delete p;
} }
} }
if (!candidate_success)
++ failed_candidates;
} }
if (failed_candidates >= limit_failed_candidates) if (failed_candidates >= limit_failed_candidates)