From e0335e3e5e99ecc1194f6b60c1efb64ff0ce5732 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 23 Apr 2021 13:54:37 +0200 Subject: [PATCH] move everything about C3t3 to new package MDS_3 --- .../doc/MDS_3}/CGAL/IO/File_avizo.h | 0 .../doc/MDS_3}/CGAL/IO/File_medit.h | 0 .../doc/MDS_3}/CGAL/IO/File_tetgen.h | 0 .../IO/facets_in_complex_3_to_triangle_mesh.h | 0 .../doc/MDS_3}/CGAL/IO/output_to_vtu.h | 0 .../CGAL/Mesh_complex_3_in_triangulation_3.h | 0 ...shComplexWithFeatures_3InTriangulation_3.h | 0 MDS_3/doc/MDS_3/MDS_3.txt | 16 ++++++ .../IO/Complex_3_in_triangulation_3_to_vtk.h | 0 .../include/CGAL/IO/File_avizo.h | 0 .../include/CGAL/IO/File_binary_mesh_3.h | 4 +- {Mesh_3 => MDS_3}/include/CGAL/IO/File_maya.h | 0 .../include/CGAL/IO/File_tetgen.h | 0 .../IO/facets_in_complex_3_to_triangle_mesh.h | 0 .../include/CGAL/IO/output_to_vtu.h | 0 MDS_3/include/CGAL/MDS_3/Dump_c3t3.h | 2 +- .../Mesh_complex_3_in_triangulation_3_base.h | 12 ++--- .../include/CGAL/MDS_3}/io_signature.h | 0 .../include/CGAL/MDS_3}/utilities.h | 12 ++--- .../CGAL/Mesh_complex_3_in_triangulation_3.h | 16 +++--- ...n_of_complex_3_in_triangulation_3_to_off.h | 0 .../MDS_3}/Handle_IO_for_pair_of_int.h | 2 +- MDS_3/test/MDS_3/CMakeLists.txt | 36 +++++++++++++ .../Mesh_3 => MDS_3/test/MDS_3}/test_c3t3.cpp | 4 +- ...est_c3t3_extract_subdomains_boundaries.cpp | 0 .../test/MDS_3}/test_c3t3_into_facegraph.cpp | 0 .../test/MDS_3}/test_c3t3_io.cpp | 2 +- .../test/MDS_3}/test_c3t3_with_features.cpp | 0 MDS_3/test/MDS_3/test_utilities.h | 51 +++++++++++++++++++ Mesh_3/doc/Mesh_3/PackageDescription.txt | 7 --- Mesh_3/doc/Mesh_3/dependencies | 2 + .../include/CGAL/Compact_mesh_cell_base_3.h | 2 +- Mesh_3/include/CGAL/Labeled_mesh_domain_3.h | 2 +- .../CGAL/Mesh_3/Mesh_surface_cell_base_3.h | 2 +- .../CGAL/Mesh_3/Protect_edges_sizing_field.h | 6 +-- Mesh_3/include/CGAL/Mesh_cell_base_3.h | 2 +- Mesh_3/include/CGAL/Mesh_triangulation_3.h | 2 +- Mesh_3/include/CGAL/Mesh_vertex_base_3.h | 2 +- .../include/CGAL/Polyhedral_mesh_domain_3.h | 2 +- Mesh_3/test/Mesh_3/CMakeLists.txt | 10 ---- .../test/Mesh_3/test_meshing_polyhedron.cpp | 2 +- 41 files changed, 143 insertions(+), 55 deletions(-) rename {Mesh_3/doc/Mesh_3 => MDS_3/doc/MDS_3}/CGAL/IO/File_avizo.h (100%) rename {Mesh_3/doc/Mesh_3 => MDS_3/doc/MDS_3}/CGAL/IO/File_medit.h (100%) rename {Mesh_3/doc/Mesh_3 => MDS_3/doc/MDS_3}/CGAL/IO/File_tetgen.h (100%) rename {Mesh_3/doc/Mesh_3 => MDS_3/doc/MDS_3}/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h (100%) rename {Mesh_3/doc/Mesh_3 => MDS_3/doc/MDS_3}/CGAL/IO/output_to_vtu.h (100%) rename {Mesh_3/doc/Mesh_3 => MDS_3/doc/MDS_3}/CGAL/Mesh_complex_3_in_triangulation_3.h (100%) rename {Mesh_3/doc/Mesh_3 => MDS_3/doc/MDS_3}/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h (100%) rename {Mesh_3 => MDS_3}/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h (100%) rename {Mesh_3 => MDS_3}/include/CGAL/IO/File_avizo.h (100%) rename {Mesh_3 => MDS_3}/include/CGAL/IO/File_binary_mesh_3.h (95%) rename {Mesh_3 => MDS_3}/include/CGAL/IO/File_maya.h (100%) rename {Mesh_3 => MDS_3}/include/CGAL/IO/File_tetgen.h (100%) rename {Mesh_3 => MDS_3}/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h (100%) rename {Mesh_3 => MDS_3}/include/CGAL/IO/output_to_vtu.h (100%) rename {Mesh_3/include/CGAL/Mesh_3 => MDS_3/include/CGAL/MDS_3}/io_signature.h (100%) rename {Mesh_3/include/CGAL/Mesh_3 => MDS_3/include/CGAL/MDS_3}/utilities.h (93%) rename {Mesh_3/include/CGAL/internal/Mesh_3 => MDS_3/include/CGAL/internal/MDS_3}/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h (100%) rename {Mesh_3/include/CGAL/internal/Mesh_3 => MDS_3/include/CGAL/internal/MDS_3}/Handle_IO_for_pair_of_int.h (98%) create mode 100644 MDS_3/test/MDS_3/CMakeLists.txt rename {Mesh_3/test/Mesh_3 => MDS_3/test/MDS_3}/test_c3t3.cpp (99%) rename {Mesh_3/test/Mesh_3 => MDS_3/test/MDS_3}/test_c3t3_extract_subdomains_boundaries.cpp (100%) rename {Mesh_3/test/Mesh_3 => MDS_3/test/MDS_3}/test_c3t3_into_facegraph.cpp (100%) rename {Mesh_3/test/Mesh_3 => MDS_3/test/MDS_3}/test_c3t3_io.cpp (99%) rename {Mesh_3/test/Mesh_3 => MDS_3/test/MDS_3}/test_c3t3_with_features.cpp (100%) create mode 100644 MDS_3/test/MDS_3/test_utilities.h diff --git a/Mesh_3/doc/Mesh_3/CGAL/IO/File_avizo.h b/MDS_3/doc/MDS_3/CGAL/IO/File_avizo.h similarity index 100% rename from Mesh_3/doc/Mesh_3/CGAL/IO/File_avizo.h rename to MDS_3/doc/MDS_3/CGAL/IO/File_avizo.h diff --git a/Mesh_3/doc/Mesh_3/CGAL/IO/File_medit.h b/MDS_3/doc/MDS_3/CGAL/IO/File_medit.h similarity index 100% rename from Mesh_3/doc/Mesh_3/CGAL/IO/File_medit.h rename to MDS_3/doc/MDS_3/CGAL/IO/File_medit.h diff --git a/Mesh_3/doc/Mesh_3/CGAL/IO/File_tetgen.h b/MDS_3/doc/MDS_3/CGAL/IO/File_tetgen.h similarity index 100% rename from Mesh_3/doc/Mesh_3/CGAL/IO/File_tetgen.h rename to MDS_3/doc/MDS_3/CGAL/IO/File_tetgen.h diff --git a/Mesh_3/doc/Mesh_3/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h b/MDS_3/doc/MDS_3/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h similarity index 100% rename from Mesh_3/doc/Mesh_3/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h rename to MDS_3/doc/MDS_3/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h diff --git a/Mesh_3/doc/Mesh_3/CGAL/IO/output_to_vtu.h b/MDS_3/doc/MDS_3/CGAL/IO/output_to_vtu.h similarity index 100% rename from Mesh_3/doc/Mesh_3/CGAL/IO/output_to_vtu.h rename to MDS_3/doc/MDS_3/CGAL/IO/output_to_vtu.h diff --git a/Mesh_3/doc/Mesh_3/CGAL/Mesh_complex_3_in_triangulation_3.h b/MDS_3/doc/MDS_3/CGAL/Mesh_complex_3_in_triangulation_3.h similarity index 100% rename from Mesh_3/doc/Mesh_3/CGAL/Mesh_complex_3_in_triangulation_3.h rename to MDS_3/doc/MDS_3/CGAL/Mesh_complex_3_in_triangulation_3.h diff --git a/Mesh_3/doc/Mesh_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h b/MDS_3/doc/MDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h similarity index 100% rename from Mesh_3/doc/Mesh_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h rename to MDS_3/doc/MDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h diff --git a/MDS_3/doc/MDS_3/MDS_3.txt b/MDS_3/doc/MDS_3/MDS_3.txt index d9978f0a0ab..0fb6558590d 100644 --- a/MDS_3/doc/MDS_3/MDS_3.txt +++ b/MDS_3/doc/MDS_3/MDS_3.txt @@ -17,6 +17,22 @@ This package is devoted to the representation of 3-Dimensional Mesh Data Structu The domain to be meshed is a subset of 3D space, required to be bounded. +//The template parameter `C3T3` is required to be a model of +//the concept +//`MeshComplex_3InTriangulation_3`, a data structure devised to +//represent a three dimensional complex embedded in a 3D +//triangulation. In both functions, an instance of type `C3T3` is used to maintain the current +//approximating simplicial mesh +//and to represent the final 3D mesh at the end +//of the procedure. +// +//The embedding 3D triangulation is required to be the nested type +//`CGAL::Mesh_triangulation_3::type`, provided by the class template +//`CGAL::Mesh_triangulation_3`. The type for this triangulation is a +//wrapper around the class `CGAL::Regular_triangulation_3` whose vertex and cell base classes +//are respectively models of the concepts `MeshVertexBase_3` and +//`MeshCellBase_3`. + \subsection MDS_3ImplementationHistory Implementation History The code of the package `MDS_3` was initially part of the package `Mesh_3`. diff --git a/Mesh_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h b/MDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h similarity index 100% rename from Mesh_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h rename to MDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h diff --git a/Mesh_3/include/CGAL/IO/File_avizo.h b/MDS_3/include/CGAL/IO/File_avizo.h similarity index 100% rename from Mesh_3/include/CGAL/IO/File_avizo.h rename to MDS_3/include/CGAL/IO/File_avizo.h diff --git a/Mesh_3/include/CGAL/IO/File_binary_mesh_3.h b/MDS_3/include/CGAL/IO/File_binary_mesh_3.h similarity index 95% rename from Mesh_3/include/CGAL/IO/File_binary_mesh_3.h rename to MDS_3/include/CGAL/IO/File_binary_mesh_3.h index 52ac49d057b..a0198d49402 100644 --- a/Mesh_3/include/CGAL/IO/File_binary_mesh_3.h +++ b/MDS_3/include/CGAL/IO/File_binary_mesh_3.h @@ -13,13 +13,13 @@ #ifndef CGAL_IO_FILE_BINARY_MESH_3_H #define CGAL_IO_FILE_BINARY_MESH_3_H -#include +#include #include #include #include -#include +#include namespace CGAL { diff --git a/Mesh_3/include/CGAL/IO/File_maya.h b/MDS_3/include/CGAL/IO/File_maya.h similarity index 100% rename from Mesh_3/include/CGAL/IO/File_maya.h rename to MDS_3/include/CGAL/IO/File_maya.h diff --git a/Mesh_3/include/CGAL/IO/File_tetgen.h b/MDS_3/include/CGAL/IO/File_tetgen.h similarity index 100% rename from Mesh_3/include/CGAL/IO/File_tetgen.h rename to MDS_3/include/CGAL/IO/File_tetgen.h diff --git a/Mesh_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h b/MDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h similarity index 100% rename from Mesh_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h rename to MDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h diff --git a/Mesh_3/include/CGAL/IO/output_to_vtu.h b/MDS_3/include/CGAL/IO/output_to_vtu.h similarity index 100% rename from Mesh_3/include/CGAL/IO/output_to_vtu.h rename to MDS_3/include/CGAL/IO/output_to_vtu.h diff --git a/MDS_3/include/CGAL/MDS_3/Dump_c3t3.h b/MDS_3/include/CGAL/MDS_3/Dump_c3t3.h index bb9e11080aa..de57437424f 100644 --- a/MDS_3/include/CGAL/MDS_3/Dump_c3t3.h +++ b/MDS_3/include/CGAL/MDS_3/Dump_c3t3.h @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/MDS_3/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_base.h b/MDS_3/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_base.h index 618d8c51b8b..093a639a589 100644 --- a/MDS_3/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_base.h +++ b/MDS_3/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_base.h @@ -24,12 +24,12 @@ #include -#include +#include #include #include #include #include -#include +#include #include #include @@ -70,7 +70,7 @@ namespace CGAL { #endif namespace CGAL { -namespace Mesh_3 { +namespace MDS_3 { namespace details { @@ -110,7 +110,7 @@ namespace Mesh_3 { }; // end class template C3t3_helper_class - } // end namespace Mesh_3::details + } // end namespace MDS_3::details /** * @class Mesh_complex_3_in_triangulation_3_base @@ -675,7 +675,7 @@ private: // Traversal //------------------------------------------------------- private: - typedef Mesh_3::internal::Iterator_not_in_complex Iterator_not_in_complex; + typedef MDS_3::internal::Iterator_not_in_complex Iterator_not_in_complex; class Facet_iterator_not_in_complex { @@ -1136,7 +1136,7 @@ rescan_after_load_of_triangulation() { } } -} // end namespace Mesh_3 +} // end namespace MDS_3 } // end namespace CGAL #include diff --git a/Mesh_3/include/CGAL/Mesh_3/io_signature.h b/MDS_3/include/CGAL/MDS_3/io_signature.h similarity index 100% rename from Mesh_3/include/CGAL/Mesh_3/io_signature.h rename to MDS_3/include/CGAL/MDS_3/io_signature.h diff --git a/Mesh_3/include/CGAL/Mesh_3/utilities.h b/MDS_3/include/CGAL/MDS_3/utilities.h similarity index 93% rename from Mesh_3/include/CGAL/Mesh_3/utilities.h rename to MDS_3/include/CGAL/MDS_3/utilities.h index 5e49f7a617e..02bbd8454f1 100644 --- a/Mesh_3/include/CGAL/Mesh_3/utilities.h +++ b/MDS_3/include/CGAL/MDS_3/utilities.h @@ -14,10 +14,10 @@ // File Description : //****************************************************************************** -#ifndef CGAL_MESH_3_UTILITIES_H -#define CGAL_MESH_3_UTILITIES_H +#ifndef CGAL_MDS_3_UTILITIES_H +#define CGAL_MDS_3_UTILITIES_H -#include +#include #include #include @@ -25,7 +25,7 @@ #include namespace CGAL { -namespace Mesh_3 { +namespace MDS_3 { namespace internal { struct Debug_messages_tools { @@ -115,7 +115,7 @@ public: } // end namespace internal -} // end namespace Mesh_3 +} // end namespace MDS_3 } //namespace CGAL -#endif // CGAL_MESH_3_UTILITIES_H +#endif // CGAL_MDS_3_UTILITIES_H diff --git a/MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h index e934cec6ce9..36c98d89222 100644 --- a/MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h +++ b/MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h @@ -23,9 +23,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include @@ -42,9 +42,9 @@ template class Mesh_complex_3_in_triangulation_3 : - public Mesh_3::Mesh_complex_3_in_triangulation_3_base< + public MDS_3::Mesh_complex_3_in_triangulation_3_base< Tr, typename Tr::Concurrency_tag> - , public CGAL::Mesh_3::internal::Debug_messages_tools + , public CGAL::MDS_3::internal::Debug_messages_tools { public: typedef typename Tr::Concurrency_tag Concurrency_tag; @@ -52,7 +52,7 @@ public: private: typedef Mesh_complex_3_in_triangulation_3< Tr,CornerIndex,CurveIndex> Self; - typedef Mesh_3::Mesh_complex_3_in_triangulation_3_base< + typedef MDS_3::Mesh_complex_3_in_triangulation_3_base< Tr,Concurrency_tag> Base; public: @@ -454,7 +454,7 @@ private: // Iterator type to get the first element of pair typedef boost::transform_iterator < - Mesh_3::internal::First_of, + MDS_3::internal::First_of, Vertex_map_filter_iterator > Vertex_map_iterator_first; // Iterator type to remove a level of referencing @@ -775,7 +775,7 @@ operator<< (std::ostream& os, // TODO: implement edge saving typedef typename Mesh_complex_3_in_triangulation_3::Concurrency_tag Concurrency_tag; return os << static_cast< - const Mesh_3::Mesh_complex_3_in_triangulation_3_base&>(c3t3); + const MDS_3::Mesh_complex_3_in_triangulation_3_base&>(c3t3); } @@ -787,7 +787,7 @@ operator>> (std::istream& is, // TODO: implement edge loading typedef typename Mesh_complex_3_in_triangulation_3::Concurrency_tag Concurrency_tag; is >> static_cast< - Mesh_3::Mesh_complex_3_in_triangulation_3_base&>(c3t3); + MDS_3::Mesh_complex_3_in_triangulation_3_base&>(c3t3); c3t3.rescan_after_load_of_triangulation(); return is; } diff --git a/Mesh_3/include/CGAL/internal/Mesh_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h b/MDS_3/include/CGAL/internal/MDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h similarity index 100% rename from Mesh_3/include/CGAL/internal/Mesh_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h rename to MDS_3/include/CGAL/internal/MDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h diff --git a/Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h b/MDS_3/include/CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h similarity index 98% rename from Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h rename to MDS_3/include/CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h index 7def0a39e9b..0520ca92ea1 100644 --- a/Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h +++ b/MDS_3/include/CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/MDS_3/test/MDS_3/CMakeLists.txt b/MDS_3/test/MDS_3/CMakeLists.txt new file mode 100644 index 00000000000..697236746d3 --- /dev/null +++ b/MDS_3/test/MDS_3/CMakeLists.txt @@ -0,0 +1,36 @@ +# Created by the script cgal_create_cmake_script +# This is the CMake script for compiling a CGAL application. + +cmake_minimum_required(VERSION 3.1...3.15) +project( MDS_3_Tests ) + +if(POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() + +find_package(CGAL REQUIRED) + +# Use Eigen +find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) +include(CGAL_Eigen3_support) +if (NOT TARGET CGAL::Eigen3_support) + message(STATUS "This project requires the Eigen library, and will not be compiled.") + return() +endif() + +create_single_source_cgal_program( "test_c3t3.cpp" ) +create_single_source_cgal_program( "test_c3t3_io.cpp" ) +create_single_source_cgal_program( "test_c3t3_with_features.cpp" ) +create_single_source_cgal_program( "test_c3t3_into_facegraph.cpp" ) +create_single_source_cgal_program( "test_c3t3_extract_subdomains_boundaries.cpp" ) + +foreach(target + test_c3t3 + test_c3t3_io + test_c3t3_with_features + test_c3t3_into_facegraph + test_c3t3_extract_subdomains_boundaries) + if(TARGET ${target}) + target_link_libraries(${target} PUBLIC CGAL::Eigen3_support) + endif() +endforeach() diff --git a/Mesh_3/test/Mesh_3/test_c3t3.cpp b/MDS_3/test/MDS_3/test_c3t3.cpp similarity index 99% rename from Mesh_3/test/Mesh_3/test_c3t3.cpp rename to MDS_3/test/MDS_3/test_c3t3.cpp index 7e4828a460d..a20a8ba74c2 100644 --- a/Mesh_3/test/Mesh_3/test_c3t3.cpp +++ b/MDS_3/test/MDS_3/test_c3t3.cpp @@ -37,9 +37,9 @@ struct Tester typedef typename CGAL::Mesh_triangulation_3::type Tr; typedef CGAL::Mesh_complex_3_in_triangulation_3 C3t3; - typedef CGAL::Mesh_3::Mesh_complex_3_in_triangulation_3_base C3t3_base_sequential; - typedef CGAL::Mesh_3::Mesh_complex_3_in_triangulation_3_base C3t3_base_parallel; typedef typename Tr::Bare_point Bare_point; diff --git a/Mesh_3/test/Mesh_3/test_c3t3_extract_subdomains_boundaries.cpp b/MDS_3/test/MDS_3/test_c3t3_extract_subdomains_boundaries.cpp similarity index 100% rename from Mesh_3/test/Mesh_3/test_c3t3_extract_subdomains_boundaries.cpp rename to MDS_3/test/MDS_3/test_c3t3_extract_subdomains_boundaries.cpp diff --git a/Mesh_3/test/Mesh_3/test_c3t3_into_facegraph.cpp b/MDS_3/test/MDS_3/test_c3t3_into_facegraph.cpp similarity index 100% rename from Mesh_3/test/Mesh_3/test_c3t3_into_facegraph.cpp rename to MDS_3/test/MDS_3/test_c3t3_into_facegraph.cpp diff --git a/Mesh_3/test/Mesh_3/test_c3t3_io.cpp b/MDS_3/test/MDS_3/test_c3t3_io.cpp similarity index 99% rename from Mesh_3/test/Mesh_3/test_c3t3_io.cpp rename to MDS_3/test/MDS_3/test_c3t3_io.cpp index 03f8e8e0a2d..b590fa9c08f 100644 --- a/Mesh_3/test/Mesh_3/test_c3t3_io.cpp +++ b/MDS_3/test/MDS_3/test_c3t3_io.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/Mesh_3/test/Mesh_3/test_c3t3_with_features.cpp b/MDS_3/test/MDS_3/test_c3t3_with_features.cpp similarity index 100% rename from Mesh_3/test/Mesh_3/test_c3t3_with_features.cpp rename to MDS_3/test/MDS_3/test_c3t3_with_features.cpp diff --git a/MDS_3/test/MDS_3/test_utilities.h b/MDS_3/test/MDS_3/test_utilities.h new file mode 100644 index 00000000000..16797ae26bc --- /dev/null +++ b/MDS_3/test/MDS_3/test_utilities.h @@ -0,0 +1,51 @@ +// Copyright (c) 2009 INRIA Sophia-Antipolis (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org). +// +// $URL$ +// $Id$ +// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial +// +// +// Author(s) : Stephane Tayeb +// +//****************************************************************************** +// File Description : +// +//****************************************************************************** + +#ifndef CGAL_MESH_3_TEST_TEST_UTILITIES_H +#define CGAL_MESH_3_TEST_TEST_UTILITIES_H + +#include +#include + +#include +#include + +#include + +typedef CGAL::Exact_predicates_inexact_constructions_kernel K_e_i; +typedef CGAL::Exact_predicates_exact_constructions_kernel K_e_e; + +namespace CGAL { +namespace details { + +template<> +struct Mesh_geom_traits_generator +{ +private: + typedef K_e_e Geom_traits; + +public: + typedef Geom_traits type; + typedef type Type; +}; // end struct Mesh_geom_traits_generator<...> + +} // end namespace details +} // end namespace CGAL + +#include + +#endif // CGAL_MESH_3_TEST_TEST_UTILITIES_H diff --git a/Mesh_3/doc/Mesh_3/PackageDescription.txt b/Mesh_3/doc/Mesh_3/PackageDescription.txt index 9d9edbfd5ac..4947d2a4fce 100644 --- a/Mesh_3/doc/Mesh_3/PackageDescription.txt +++ b/Mesh_3/doc/Mesh_3/PackageDescription.txt @@ -57,8 +57,6 @@ Here are the main concepts of this package: - `MeshTriangulationTraits_3` -- `MeshComplex_3InTriangulation_3` -- `MeshComplexWithFeatures_3InTriangulation_3` - `MeshDomain_3` - `MeshDomainWithFeatures_3` - `MeshCriteria_3` @@ -80,7 +78,6 @@ related to the template parameters of some models of the main concepts: \cgalCRPSection{Classes} -- `CGAL::Mesh_complex_3_in_triangulation_3` - `CGAL::Mesh_triangulation_3` - `CGAL::Mesh_vertex_base_3` - `CGAL::Compact_mesh_cell_base_3` @@ -114,7 +111,6 @@ and their associated classes: - `CGAL::perturb_mesh_3()` - `CGAL::lloyd_optimize_mesh_3()` - `CGAL::odt_optimize_mesh_3()` -- `CGAL::facets_in_complex_3_to_triangle_mesh()` \cgalCRPSection{CGAL::parameters Functions} @@ -137,8 +133,5 @@ and their associated classes: - `CGAL::Mesh_optimization_return_code` - `CGAL::Mesh_facet_topology` -\cgalCRPSection{Input/Output Functions} -- `CGAL::output_to_medit()` -- `CGAL::output_to_vtu()` */ diff --git a/Mesh_3/doc/Mesh_3/dependencies b/Mesh_3/doc/Mesh_3/dependencies index 8dc427e241e..8d1e9d646e9 100644 --- a/Mesh_3/doc/Mesh_3/dependencies +++ b/Mesh_3/doc/Mesh_3/dependencies @@ -13,3 +13,5 @@ Polyhedron Miscellany Mesh_2 Polygon_mesh_processing +MDS_3 + diff --git a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h index 13fd9f70083..36a9b2215a1 100644 --- a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h +++ b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include diff --git a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h index 0dceef7f282..81d262fe4e7 100644 --- a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h +++ b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h @@ -33,7 +33,7 @@ #include -#include +#include #include // support for `CGAL::Image_3` diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesh_surface_cell_base_3.h b/Mesh_3/include/CGAL/Mesh_3/Mesh_surface_cell_base_3.h index 90a0e1ec909..d9667ca1a67 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Mesh_surface_cell_base_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Mesh_surface_cell_base_3.h @@ -24,7 +24,7 @@ #include #include -#include +#include #ifdef CGAL_LINKED_WITH_TBB # include diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h index ab9a4844e5f..8291c2ee81b 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h @@ -28,11 +28,11 @@ #include #include -#include +#include #ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS # include #endif -#include +#include #include #include #include @@ -108,7 +108,7 @@ void debug_dump_c3t3(const std::string filename, const C3t3& c3t3) template class Protect_edges_sizing_field - : public CGAL::Mesh_3::internal::Debug_messages_tools + : public CGAL::MDS_3::internal::Debug_messages_tools { typedef Protect_edges_sizing_field Self; diff --git a/Mesh_3/include/CGAL/Mesh_cell_base_3.h b/Mesh_3/include/CGAL/Mesh_cell_base_3.h index 2babd0cc5db..3bb5e2c30d9 100644 --- a/Mesh_3/include/CGAL/Mesh_cell_base_3.h +++ b/Mesh_3/include/CGAL/Mesh_cell_base_3.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/Mesh_3/include/CGAL/Mesh_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_triangulation_3.h index 8d97e0696fe..5d4225225d3 100644 --- a/Mesh_3/include/CGAL/Mesh_triangulation_3.h +++ b/Mesh_3/include/CGAL/Mesh_triangulation_3.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace CGAL { diff --git a/Mesh_3/include/CGAL/Mesh_vertex_base_3.h b/Mesh_3/include/CGAL/Mesh_vertex_base_3.h index ecb1f9464c5..de112e16f4b 100644 --- a/Mesh_3/include/CGAL/Mesh_vertex_base_3.h +++ b/Mesh_3/include/CGAL/Mesh_vertex_base_3.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h index ce7d0088fe3..256e92aadf8 100644 --- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h +++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h @@ -59,7 +59,7 @@ // To handle I/O for Surface_patch_index if that is a pair of `int` (the // default) -#include +#include #include diff --git a/Mesh_3/test/Mesh_3/CMakeLists.txt b/Mesh_3/test/Mesh_3/CMakeLists.txt index f30b1c82b46..376aea84c2f 100644 --- a/Mesh_3/test/Mesh_3/CMakeLists.txt +++ b/Mesh_3/test/Mesh_3/CMakeLists.txt @@ -29,16 +29,12 @@ if ( CGAL_FOUND ) endif() create_single_source_cgal_program( "test_boost_has_xxx.cpp" ) - create_single_source_cgal_program( "test_c3t3.cpp" ) create_single_source_cgal_program( "test_mesh_capsule_var_distance_bound.cpp" ) create_single_source_cgal_program( "test_implicit_multi_domain_to_labeling_function_wrapper.cpp" ) - create_single_source_cgal_program( "test_c3t3_io.cpp" ) - create_single_source_cgal_program( "test_c3t3_with_features.cpp" ) create_single_source_cgal_program( "test_criteria.cpp" ) create_single_source_cgal_program( "test_domain_with_polyline_features.cpp" ) create_single_source_cgal_program( "test_labeled_mesh_domain_3.cpp" ) create_single_source_cgal_program( "test_mesh_criteria_creation.cpp" ) - create_single_source_cgal_program( "test_c3t3_into_facegraph.cpp" ) create_single_source_cgal_program( "test_without_detect_features.cpp" ) if(CGAL_ImageIO_USE_ZLIB) create_single_source_cgal_program( "test_meshing_3D_image.cpp" ) @@ -58,7 +54,6 @@ if ( CGAL_FOUND ) create_single_source_cgal_program( "test_meshing_unit_tetrahedron.cpp" ) create_single_source_cgal_program( "test_meshing_with_default_edge_size.cpp" ) create_single_source_cgal_program( "test_meshing_determinism.cpp" ) - create_single_source_cgal_program( "test_c3t3_extract_subdomains_boundaries.cpp" ) create_single_source_cgal_program( "test_mesh_3_issue_1554.cpp" ) create_single_source_cgal_program( "test_mesh_polyhedral_domain_with_features_deprecated.cpp" ) create_single_source_cgal_program( "test_meshing_with_one_step.cpp" ) @@ -66,16 +61,12 @@ if ( CGAL_FOUND ) foreach(target test_boost_has_xxx - test_c3t3 test_mesh_capsule_var_distance_bound test_implicit_multi_domain_to_labeling_function_wrapper - test_c3t3_io - test_c3t3_with_features test_criteria test_domain_with_polyline_features test_labeled_mesh_domain_3 test_mesh_criteria_creation - test_c3t3_into_facegraph test_without_detect_features test_meshing_3D_image test_meshing_3D_image_deprecated @@ -91,7 +82,6 @@ if ( CGAL_FOUND ) test_meshing_unit_tetrahedron test_meshing_with_default_edge_size test_meshing_determinism - test_c3t3_extract_subdomains_boundaries test_mesh_3_issue_1554 test_mesh_polyhedral_domain_with_features_deprecated test_mesh_cell_base_3 diff --git a/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp b/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp index 999faf85a56..6acba7b342b 100644 --- a/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp +++ b/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp @@ -15,7 +15,7 @@ // File Description : //****************************************************************************** -#include +#include #include "test_meshing_utilities.h" #include #include