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

Clean up code

This commit is contained in:
Simon Giraudot 2016-04-21 07:56:03 +02:00
parent b101e9bc4c
commit abf2070f77
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Point_set_shape_detection_3/include/CGAL/regularize_planes.h
View File

@ -70,9 +70,6 @@ typename Traits::Vector_3 regularize_normal
typedef typename Traits::Line_3 Line;
typedef typename Traits::Plane_3 Plane;
// if (symmetry_direction == CGAL::NULL_VECTOR)
// return n;
Point pt_symmetry = CGAL::ORIGIN + cos_symmetry* symmetry_direction;
Plane plane_symmetry (pt_symmetry, symmetry_direction);
@ -117,9 +114,6 @@ typename Traits::Vector_3 regularize_normals_from_prior
typedef typename Traits::Line_3 Line;
typedef typename Traits::Plane_3 Plane;
// if (symmetry_direction == CGAL::NULL_VECTOR)
// return n;
Plane plane_orthogonality (CGAL::ORIGIN, np);
Point pt_symmetry = CGAL::ORIGIN + cos_symmetry* symmetry_direction;
@ -439,8 +433,6 @@ void subgraph_mutually_orthogonal_clusters (PlaneClusterContainer& clusters,
subgraph_clusters_prop.push_back(subgraph_clusters_prop_temp);
}
std::cerr << "B " << clusters[0].normal << " " << clusters[1].normal << std::endl;
//regularization of cluster normals : in eachsubgraph, we start
//from the largest area cluster and we propage over the subgraph
//by regularizing the normals of the clusters accorting to
@ -485,7 +477,6 @@ void subgraph_mutually_orthogonal_clusters (PlaneClusterContainer& clusters,
std::size_t cluster_index_2 = clusters[cluster_index].orthogonal_clusters[j];
if(clusters[cluster_index_2].is_free)
{
std::cerr << "Propagation" << std::endl;
propagation = true;
index_container_current_ring.push_back(cluster_index_2);
clusters[cluster_index_2].is_free = false;
@ -653,7 +644,6 @@ void regularize_planes (const Shape_detection_3::Efficient_RANSAC<EfficientRANSA
{
if (std::fabs (clusters[i].normal * clusters[j].normal) < tolerance_cosangle_ortho)
{
std::cerr << "Clustered " << std::endl;
clusters[i].orthogonal_clusters.push_back (j);
clusters[j].orthogonal_clusters.push_back (i);
}

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

@ -174,34 +174,34 @@ int main()
}
// Test orthogonality
// std::cerr << "Testing orthogonality..." << std::endl;
// {
// Pwn_vector points;
std::cerr << "Testing orthogonality..." << std::endl;
{
Pwn_vector points;
// generate_random_points (Point (0., 0., 0.), vy, vz,
// 5000, std::back_inserter (points));
generate_random_points (Point (0., 0., 0.), vy, vz,
5000, std::back_inserter (points));
// generate_random_points (Point (0.5, 0., 0.), dvx, vy,
// 5000, std::back_inserter (points));
generate_random_points (Point (0.5, 0., 0.), dvx, vy,
5000, std::back_inserter (points));
// ransac.set_input(points);
// ransac.detect(op);
// check_ransac_size (ransac, 2);
ransac.set_input(points);
ransac.detect(op);
check_ransac_size (ransac, 2);
// std::vector<Plane> before = get_ransac_planes(ransac);
// CGAL::regularize_planes (ransac, false, true, false, true, 5., 0.01, Vector(1.,0.,0.));
// std::vector<Plane> after = get_ransac_planes(ransac);
std::vector<Plane> before = get_ransac_planes(ransac);
CGAL::regularize_planes (ransac, false, true, false, true, 5.);
std::vector<Plane> after = get_ransac_planes(ransac);
// std::cerr << " * Nothing should change now..." << std::endl;
// check_planes_unchanged (before, after);
std::cerr << " * Nothing should change now..." << std::endl;
check_planes_unchanged (before, after);
// CGAL::regularize_planes (ransac, false, true, false, true, 15.);
// after = get_ransac_planes(ransac);
CGAL::regularize_planes (ransac, false, true, false, true, 15.);
after = get_ransac_planes(ransac);
// std::cerr << " * Something should change now..." << std::endl;
// check_planes_changed (before, after);
// ransac.clear ();
// }
std::cerr << " * Something should change now..." << std::endl;
check_planes_changed (before, after);
ransac.clear ();
}
std::cerr << "Testing coplanarity..." << std::endl;
{