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

fix test

This commit is contained in:
Sébastien Loriot 2023-02-13 19:27:59 +01:00
parent 8d951594b7
commit 74b5d05698
2 changed files with 48 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh_planar_patches.h
View File

@ -1100,15 +1100,19 @@ bool decimate_meshes_with_common_interfaces_impl(TriangleMeshRange& meshes,
} }
std::size_t ncid=corners.size(); std::size_t ncid=corners.size();
typedef internal_np::Param_not_found PNF;
PNF pnf;
Triangle_index_tracker<Triangle_mesh, PNF, PNF> tracker(pnf, pnf);
bool all_patches_successfully_remeshed = bool all_patches_successfully_remeshed =
decimate_impl(tm, decimate_impl<Kernel>(tm,
nb_corners_and_nb_cc_all[mesh_id], nb_corners_and_nb_cc_all[mesh_id],
vertex_corner_id_maps[mesh_id], vertex_corner_id_maps[mesh_id],
edge_is_constrained_maps[mesh_id], edge_is_constrained_maps[mesh_id],
face_cc_ids_maps[mesh_id], face_cc_ids_maps[mesh_id],
vpms[mesh_id], vpms[mesh_id],
corners, corners,
all_triangles[mesh_id]) && all_triangles[mesh_id],
tracker) &&
is_polygon_soup_a_polygon_mesh(all_triangles[mesh_id]); is_polygon_soup_a_polygon_mesh(all_triangles[mesh_id]);
#ifdef CGAL_DEBUG_DECIMATION #ifdef CGAL_DEBUG_DECIMATION
std::cout << "all_patches_successfully_remeshed? " << all_patches_successfully_remeshed << "\n"; std::cout << "all_patches_successfully_remeshed? " << all_patches_successfully_remeshed << "\n";
@ -1466,6 +1470,9 @@ bool decimate_meshes_with_common_interfaces(TriangleMeshRange& meshes, double co
CGAL_assertion(coplanar_cos_threshold<0); CGAL_assertion(coplanar_cos_threshold<0);
typedef typename boost::property_traits<MeshMap>::value_type Triangle_mesh; typedef typename boost::property_traits<MeshMap>::value_type Triangle_mesh;
typedef typename std::iterator_traits<typename TriangleMeshRange::iterator>::value_type Mesh_descriptor; typedef typename std::iterator_traits<typename TriangleMeshRange::iterator>::value_type Mesh_descriptor;
typedef typename boost::property_map<Triangle_mesh, boost::vertex_point_t>::type VPM;
typedef typename boost::property_traits<VPM>::value_type Point_3;
typedef typename Kernel_traits<Point_3>::type Kernel;
/// @TODO turn into a range of named parameter /// @TODO turn into a range of named parameter
std::vector<typename boost::property_map<Triangle_mesh, boost::vertex_point_t>::type > vpms; std::vector<typename boost::property_map<Triangle_mesh, boost::vertex_point_t>::type > vpms;
@ -1473,7 +1480,7 @@ bool decimate_meshes_with_common_interfaces(TriangleMeshRange& meshes, double co
for(Mesh_descriptor& md : meshes) for(Mesh_descriptor& md : meshes)
vpms.push_back( get(boost::vertex_point, mesh_map[md]) ); vpms.push_back( get(boost::vertex_point, mesh_map[md]) );
return Planar_segmentation::decimate_meshes_with_common_interfaces_impl(meshes, mesh_map, coplanar_cos_threshold, vpms); return Planar_segmentation::decimate_meshes_with_common_interfaces_impl<Kernel>(meshes, mesh_map, coplanar_cos_threshold, vpms);
} }
template <class TriangleMesh> template <class TriangleMesh>

76
Polygon_mesh_processing/test/Polygon_mesh_processing/test_decimation_of_planar_patches.cpp
View File

@ -38,18 +38,14 @@ int main()
in >> sm; in >> sm;
// call the decimation function // call the decimation function
Surface_mesh out; Surface_mesh sm_out;
if (!PMP::remesh_planar_patches(sm, out)) PMP::remesh_planar_patches(sm, sm_out);
{
std::cerr << "ERROR: decimate failed to remesh some patches\n";
OK=false;
}
ss=std::stringstream(); ss=std::stringstream();
ss << "out" << i << ".off"; ss << "out" << i << ".off";
std::ofstream out(ss.str().c_str()); std::ofstream out(ss.str().c_str());
out << out; out << sm_out;
std::cout << " output written to out" << i << ".off\n"; std::cout << " output written to out" << i << ".off\n";
assert(is_valid_polygon_mesh(out)); assert(CGAL::is_valid_polygon_mesh(sm_out));
} }
// testing border non-manifold vertex: not working for now, test kept // testing border non-manifold vertex: not working for now, test kept
/* /*
@ -68,7 +64,7 @@ int main()
std::cerr << "ERROR: decimate failed to remesh some patches\n"; std::cerr << "ERROR: decimate failed to remesh some patches\n";
} }
std::ofstream("nm_m1.off") << std::setprecision(17) << sm; std::ofstream("nm_m1.off") << std::setprecision(17) << sm;
assert(is_valid_polygon_mesh(sm)); assert(CGAL::is_valid_polygon_mesh(sm));
} }
*/ */
// test duplicated vertex // test duplicated vertex
@ -82,12 +78,11 @@ int main()
CGAL::Euler::remove_face(halfedge(f2, sm), sm); CGAL::Euler::remove_face(halfedge(f2, sm), sm);
PMP::duplicate_non_manifold_vertices(sm); PMP::duplicate_non_manifold_vertices(sm);
std::size_t nbv_before = vertices(sm).size(); std::size_t nbv_before = vertices(sm).size();
Surface_mesh out; Surface_mesh sm_out;
if (!PMP::remesh_planar_patches(sm, out)) PMP::remesh_planar_patches(sm, sm_out);
std::cerr << "decimate failed to remesh some patches (expected)\n"; assert(vertices(sm_out).size()<nbv_before);
assert(vertices(out).size()<nbv_before); std::ofstream("nmd_m1.off") << std::setprecision(17) << sm_out;
std::ofstream("nmd_m1.off") << std::setprecision(17) << out; assert(CGAL::is_valid_polygon_mesh(sm_out));
assert(is_valid_polygon_mesh(out));
} }
// test duplicated vertex at patch interface // test duplicated vertex at patch interface
{ {
@ -100,12 +95,11 @@ int main()
CGAL::Euler::remove_face(halfedge(f2, sm), sm); CGAL::Euler::remove_face(halfedge(f2, sm), sm);
PMP::duplicate_non_manifold_vertices(sm); PMP::duplicate_non_manifold_vertices(sm);
std::size_t nbv_before = vertices(sm).size(); std::size_t nbv_before = vertices(sm).size();
Surface_mesh out; Surface_mesh sm_out;
if (!PMP::remesh_planar_patches(sm, out)) PMP::remesh_planar_patches(sm, sm_out);
std::cerr << "decimate failed to remesh some patches (expected)\n"; assert(vertices(sm_out).size()<nbv_before);
assert(vertices(out).size()<nbv_before); std::ofstream("nmdi_m1.off") << std::setprecision(17) << sm_out;
std::ofstream("nmdi_m1.off") << std::setprecision(17) << out; assert(CGAL::is_valid_polygon_mesh(sm_out));
assert(is_valid_polygon_mesh(out));
} }
assert(OK); assert(OK);
@ -120,18 +114,14 @@ int main()
in >> sm; in >> sm;
// call the decimation function // call the decimation function
Surface_mesh out; Surface_mesh sm_out;
if (!PMP::remesh_planar_patches(sm, out, CGAL::parameters::cosinus_threshold(-0.99))) PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosinus_threshold(-0.99));
{
OK=false;
std::cerr << "ERROR: decimate failed to remesh some patches\n";
}
ss=std::stringstream(); ss=std::stringstream();
ss << "out_a" << i << ".off"; ss << "out_a" << i << ".off";
std::ofstream out(ss.str().c_str()); std::ofstream out(ss.str().c_str());
out << out; out << sm_out;
std::cout << " output written to out_a" << i << ".off\n"; std::cout << " output written to out_a" << i << ".off\n";
assert(is_valid_polygon_mesh(out)); assert(CGAL::is_valid_polygon_mesh(sm_out));
} }
//testing decimation of meshes, preserving common interface //testing decimation of meshes, preserving common interface
@ -162,7 +152,7 @@ int main()
} }
std::cout << "\n"; std::cout << "\n";
for (int i=0; i<nb_meshes_range; ++i) for (int i=0; i<nb_meshes_range; ++i)
assert(is_valid_polygon_mesh(meshes[i])); assert(CGAL::is_valid_polygon_mesh(meshes[i]));
//testing decimation of meshes, preserving common interface and a patch that fails to simplify at the interface //testing decimation of meshes, preserving common interface and a patch that fails to simplify at the interface
meshes.clear(); meshes.clear();
@ -204,7 +194,7 @@ int main()
} }
std::cout << "\n"; std::cout << "\n";
for (int i=0; i<nb_meshes_range; ++i) for (int i=0; i<nb_meshes_range; ++i)
assert(is_valid_polygon_mesh(meshes[i])); assert(CGAL::is_valid_polygon_mesh(meshes[i]));
//testing decimation of meshes, preserving common interface with almost coplanar/collinear tests //testing decimation of meshes, preserving common interface with almost coplanar/collinear tests
meshes.clear(); meshes.clear();
@ -234,7 +224,7 @@ int main()
} }
std::cout << "\n"; std::cout << "\n";
for (int i=0; i<nb_meshes_range; ++i) for (int i=0; i<nb_meshes_range; ++i)
assert(is_valid_polygon_mesh(meshes[i])); assert(CGAL::is_valid_polygon_mesh(meshes[i]));
#if 0 // tests to be re-enable when using region growing #if 0 // tests to be re-enable when using region growing
// testing decimate function with almost coplanar/collinear tests using PCA // testing decimate function with almost coplanar/collinear tests using PCA
@ -259,7 +249,7 @@ int main()
std::ofstream out(ss.str().c_str()); std::ofstream out(ss.str().c_str());
out << sm; out << sm;
std::cout << " output written to out_a_pca" << i << ".off\n"; std::cout << " output written to out_a_pca" << i << ".off\n";
assert(is_valid_polygon_mesh(sm)); assert(CGAL::is_valid_polygon_mesh(sm));
} }
// testing decimation of meshes, preserving common interface with almost coplanar/collinear tests using PCA // testing decimation of meshes, preserving common interface with almost coplanar/collinear tests using PCA
@ -277,7 +267,7 @@ int main()
} }
std::cout << "\n"; std::cout << "\n";
for (int i=0; i<nb_meshes_range; ++i) for (int i=0; i<nb_meshes_range; ++i)
assert(is_valid_polygon_mesh(meshes[i])); assert(CGAL::is_valid_polygon_mesh(meshes[i]));
// two examples that fails with approximate but works with PCA // two examples that fails with approximate but works with PCA
//PCA first //PCA first
@ -293,7 +283,7 @@ int main()
std::ofstream out("sphere_pca.off"); std::ofstream out("sphere_pca.off");
out << sm; out << sm;
std::cout << "output written to sphere_pca.off\n"; std::cout << "output written to sphere_pca.off\n";
assert(is_valid_polygon_mesh(sm)); assert(CGAL::is_valid_polygon_mesh(sm));
} }
{ {
Surface_mesh sm; Surface_mesh sm;
@ -305,7 +295,7 @@ int main()
std::ofstream out("sphere_selection_pca.off"); std::ofstream out("sphere_selection_pca.off");
out << sm; out << sm;
std::cout << "output written to sphere_selection_pca.off\n"; std::cout << "output written to sphere_selection_pca.off\n";
assert(is_valid_polygon_mesh(sm)); assert(CGAL::is_valid_polygon_mesh(sm));
} }
#endif #endif
// Approximation then // Approximation then
@ -314,22 +304,20 @@ int main()
std::cout << "decimate of data/decimation/sphere.off using approximate predicates\n"; std::cout << "decimate of data/decimation/sphere.off using approximate predicates\n";
std::ifstream in("data/decimation/sphere.off"); std::ifstream in("data/decimation/sphere.off");
in >> sm; in >> sm;
Surface_mesh out; Surface_mesh sm_out;
if (!PMP::remesh_planar_patches(sm, out, CGAL::parameters::cosinus_threshold(-0.99))) PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosinus_threshold(-0.99));
std::cerr << "decimate failed to remesh some patches\n";
} }
{ {
Surface_mesh sm; Surface_mesh sm;
std::cout << "decimate of data/decimation/sphere_selection.off using approximate predicates\n"; std::cout << "decimate of data/decimation/sphere_selection.off using approximate predicates\n";
std::ifstream in("data/decimation/sphere_selection.off"); std::ifstream in("data/decimation/sphere_selection.off");
in >> sm; in >> sm;
Surface_mesh out; Surface_mesh sm_out;
if (!PMP::remesh_planar_patches(sm, out, CGAL::parameters::cosinus_threshold(-0.99))) PMP::remesh_planar_patches(sm, sm_out, CGAL::parameters::cosinus_threshold(-0.99));
std::cout << "decimate failed to remesh some patches (this is the expected behavior)\n";
std::ofstream out("sphere_selection_app.off"); std::ofstream out("sphere_selection_app.off");
out << out; out << sm_out;
std::cout << "output written to sphere_selection_app.off\n"; std::cout << "output written to sphere_selection_app.off\n";
assert(is_valid_polygon_mesh(out)); assert(CGAL::is_valid_polygon_mesh(sm_out));
} }
assert(OK); assert(OK);