From a6ea5c0b22ef55f58dfbd46e3b08a082d22a4b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 30 Jan 2015 18:02:36 +0100 Subject: [PATCH] update orient_polygon_soup testsuite --- .../test/Polygon_mesh_processing/CMakeLists.txt | 1 + .../Polygon_mesh_processing}/data_polygon_soup/bad_cube.off | 0 .../data_polygon_soup/incompatible_orientation.off | 0 .../data_polygon_soup/isolated_singular_vertex_one_cc.off | 0 .../data_polygon_soup/isolated_vertices.off | 0 .../data_polygon_soup/nm_vertex_and_edge.off | 0 .../data_polygon_soup/one_duplicated_edge.off | 0 .../one_duplicated_edge_sharing_vertex.off | 0 .../data_polygon_soup/partial_overlap.off | 0 .../Polygon_mesh_processing}/test_orient_polygon_soup.cpp | 6 +++--- 10 files changed, 4 insertions(+), 3 deletions(-) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/bad_cube.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/incompatible_orientation.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/isolated_singular_vertex_one_cc.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/isolated_vertices.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/nm_vertex_and_edge.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/one_duplicated_edge.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/one_duplicated_edge_sharing_vertex.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/data_polygon_soup/partial_overlap.off (100%) rename {Operations_on_polyhedra/test/Operations_on_polyhedra => Polygon_mesh_processing/test/Polygon_mesh_processing}/test_orient_polygon_soup.cpp (87%) diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt index d7e3c2d261a..5dae97eb287 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt @@ -73,6 +73,7 @@ create_single_source_cgal_program( "self_intersection_surface_mesh_test.cpp" ) create_single_source_cgal_program( "triangulate_hole_Polyhedron_3_test.cpp" ) create_single_source_cgal_program( "triangulate_hole_Polyhedron_3_no_delaunay_test.cpp" ) create_single_source_cgal_program( "triangulate_hole_polyline_test.cpp" ) +create_single_source_cgal_program( "test_orient_polygon_soup.cpp") else(EIGEN3_FOUND) message(STATUS "NOTICE: Some examples require Eigen 3.1 (or greater) and will not be compiled.") diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/bad_cube.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/bad_cube.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/bad_cube.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/bad_cube.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/incompatible_orientation.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/incompatible_orientation.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/incompatible_orientation.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/incompatible_orientation.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/isolated_singular_vertex_one_cc.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/isolated_singular_vertex_one_cc.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/isolated_singular_vertex_one_cc.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/isolated_singular_vertex_one_cc.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/isolated_vertices.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/isolated_vertices.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/isolated_vertices.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/isolated_vertices.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/nm_vertex_and_edge.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/nm_vertex_and_edge.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/nm_vertex_and_edge.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/nm_vertex_and_edge.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/one_duplicated_edge.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/one_duplicated_edge.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/one_duplicated_edge.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/one_duplicated_edge.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/one_duplicated_edge_sharing_vertex.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/one_duplicated_edge_sharing_vertex.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/one_duplicated_edge_sharing_vertex.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/one_duplicated_edge_sharing_vertex.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/partial_overlap.off b/Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/partial_overlap.off similarity index 100% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/data_polygon_soup/partial_overlap.off rename to Polygon_mesh_processing/test/Polygon_mesh_processing/data_polygon_soup/partial_overlap.off diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/test_orient_polygon_soup.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_polygon_soup.cpp similarity index 87% rename from Operations_on_polyhedra/test/Operations_on_polyhedra/test_orient_polygon_soup.cpp rename to Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_polygon_soup.cpp index c5ce5e0f31b..ed834468101 100644 --- a/Operations_on_polyhedra/test/Operations_on_polyhedra/test_orient_polygon_soup.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_polygon_soup.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -30,12 +30,12 @@ void test(std::string fname, std::size_t expected_duplicated_vertices) } std::size_t initial_nb_points = points.size(); - CGAL::orient_polygon_soup(points, polygons); + CGAL::Polygon_mesh_processing::orient_polygon_soup(points, polygons); assert(expected_duplicated_vertices == points.size()-initial_nb_points); Polyhedron P; - CGAL::polygon_soup_to_polyhedron_3(P, points, polygons); + CGAL::Polygon_mesh_processing::polygon_soup_to_polygon_mesh(points, polygons, P); assert(P.is_valid()); std::cout << fname << " OK\n"; }