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

Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' into HEAD

This commit is contained in:
Sébastien Loriot 2017-03-16 10:41:40 +01:00
parent 8662845f35 d615e610c1
commit c360e025a1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
View File

@ -400,6 +400,7 @@ shape. The implementation follows \cgalCite{schnabel2007efficient}.
m_num_available_points = m_num_total_points; m_num_available_points = m_num_total_points;
clear_octrees(); clear_octrees();
clear_shape_factories();
} }
/// @} /// @}

5
Point_set_shape_detection_3/test/Point_set_shape_detection_3/test_regularization.cpp
View File

@ -132,7 +132,6 @@ int main()
Efficient_ransac ransac; Efficient_ransac ransac;
ransac.add_shape_factory<CGAL::Shape_detection_3::Plane<Traits> >();
const std::size_t nb_pts = 5000; const std::size_t nb_pts = 5000;
@ -156,6 +155,7 @@ int main()
5000, std::back_inserter (points)); 5000, std::back_inserter (points));
ransac.set_input(points); ransac.set_input(points);
ransac.add_shape_factory<CGAL::Shape_detection_3::Plane<Traits> >();
ransac.detect(op); ransac.detect(op);
check_ransac_size (ransac, 2); check_ransac_size (ransac, 2);
@ -187,6 +187,7 @@ int main()
ransac.set_input(points); ransac.set_input(points);
ransac.add_shape_factory<CGAL::Shape_detection_3::Plane<Traits> >();
ransac.detect(op); ransac.detect(op);
check_ransac_size (ransac, 2); check_ransac_size (ransac, 2);
@ -217,6 +218,7 @@ int main()
5000, std::back_inserter (points)); 5000, std::back_inserter (points));
ransac.set_input(points); ransac.set_input(points);
ransac.add_shape_factory<CGAL::Shape_detection_3::Plane<Traits> >();
ransac.detect(op); ransac.detect(op);
check_ransac_size (ransac, 2); check_ransac_size (ransac, 2);
@ -252,6 +254,7 @@ int main()
5000, std::back_inserter (points)); 5000, std::back_inserter (points));
ransac.set_input(points); ransac.set_input(points);
ransac.add_shape_factory<CGAL::Shape_detection_3::Plane<Traits> >();
ransac.detect(op); ransac.detect(op);
check_ransac_size (ransac, 2); check_ransac_size (ransac, 2);