From 95b3da51cfbf60212eda80514a068b5d4f2d9a1c Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Tue, 12 Oct 2021 16:31:52 +0200 Subject: [PATCH] move all MDS_3 to TMDS_3 (with T for Tetrahedral) --- Installation/CHANGES.md | 2 +- .../Mesh_complex_3_in_triangulation_3_fwd.h | 8 +++--- .../CGAL/license/{MDS_3.h => TMDS_3.h} | 20 +++++++------- MDS_3/package_info/MDS_3/description.txt | 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 +- Mesh_3/include/CGAL/Mesh_3/Mesher_3.h | 2 +- .../CGAL/Mesh_3/Protect_edges_sizing_field.h | 6 ++--- Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h | 2 +- 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/include/CGAL/refine_mesh_3.h | 2 +- .../CGAL/Periodic_3_mesh_3/IO/File_medit.h | 2 +- .../Protect_edges_sizing_field.h | 6 ++--- .../CGAL/Periodic_3_mesh_triangulation_3.h | 2 +- .../include/CGAL/refine_periodic_3_mesh_3.h | 2 +- .../Polyhedron/Plugins/IO/VTK_io_plugin.cpp | 6 ++--- .../Plugins/Mesh_3/C3t3_io_plugin.cpp | 6 ++--- ...shComplexWithFeatures_3InTriangulation_3.h | 0 .../Concepts/MeshComplex_3InTriangulation_3.h | 0 .../MDS_3 => TMDS_3/doc/TMDS_3}/Doxyfile.in | 4 +-- .../doc/TMDS_3}/PackageDescription.txt | 0 .../MDS_3.txt => TMDS_3/doc/TMDS_3/TMDS_3.txt | 0 .../MDS_3 => TMDS_3/doc/TMDS_3}/dependencies | 0 .../MDS_3 => TMDS_3/doc/TMDS_3}/examples.txt | 0 .../examples/TMDS_3}/CMakeLists.txt | 2 +- .../examples/TMDS_3}/c3t3_example.cpp | 0 .../tetrahedron_soup_to_c3t3_example.cpp | 0 .../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 +-- {MDS_3 => TMDS_3}/include/CGAL/IO/File_maya.h | 2 +- .../include/CGAL/IO/File_medit.h | 27 +++++++++++-------- .../include/CGAL/IO/File_tetgen.h | 14 +++++----- .../IO/facets_in_complex_3_to_triangle_mesh.h | 2 +- .../include/CGAL/IO/output_to_vtu.h | 0 .../CGAL/Mesh_complex_3_in_triangulation_3.h | 26 +++++++++--------- .../include/CGAL/TMDS_3}/Dump_c3t3.h | 4 +-- .../include/CGAL/TMDS_3}/io_signature.h | 0 .../include/CGAL/TMDS_3}/tet_soup_to_c3t3.h | 12 ++++----- .../include/CGAL/TMDS_3}/utilities.h | 12 ++++----- .../facets_in_complex_3_to_triangle_mesh.h | 10 +++---- ...n_of_complex_3_in_triangulation_3_to_off.h | 6 ++--- .../TMDS_3}/Handle_IO_for_pair_of_int.h | 4 +-- .../CGAL/internal/TMDS_3/TMDS_3_helper.h | 12 ++++----- .../tetrahedron_soup_to_triangulation_3.h | 20 +++++++------- .../package_info/TMDS_3}/copyright | 0 .../package_info/TMDS_3}/dependencies | 2 +- TMDS_3/package_info/TMDS_3/description.txt | 2 ++ .../package_info/TMDS_3}/license.txt | 0 .../package_info/TMDS_3}/maintainer | 0 .../test/TMDS_3}/CMakeLists.txt | 2 +- .../test/TMDS_3}/test_c3t3.cpp | 0 ...est_c3t3_extract_subdomains_boundaries.cpp | 0 .../test/TMDS_3}/test_c3t3_into_facegraph.cpp | 4 +-- .../test/TMDS_3}/test_c3t3_io.cpp | 2 +- .../test/TMDS_3}/test_c3t3_io_MEDIT.cpp | 0 .../test/TMDS_3}/test_c3t3_with_features.cpp | 0 .../test/TMDS_3}/test_utilities.h | 0 .../internal/collapse_short_edges.h | 4 +-- 63 files changed, 132 insertions(+), 127 deletions(-) rename Installation/include/CGAL/{MDS_3 => TMDS_3}/Mesh_complex_3_in_triangulation_3_fwd.h (84%) rename Installation/include/CGAL/license/{MDS_3.h => TMDS_3.h} (72%) delete mode 100644 MDS_3/package_info/MDS_3/description.txt rename {MDS_3/doc/MDS_3 => TMDS_3/doc/TMDS_3}/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h (100%) rename {MDS_3/doc/MDS_3 => TMDS_3/doc/TMDS_3}/Concepts/MeshComplex_3InTriangulation_3.h (100%) rename {MDS_3/doc/MDS_3 => TMDS_3/doc/TMDS_3}/Doxyfile.in (83%) rename {MDS_3/doc/MDS_3 => TMDS_3/doc/TMDS_3}/PackageDescription.txt (100%) rename MDS_3/doc/MDS_3/MDS_3.txt => TMDS_3/doc/TMDS_3/TMDS_3.txt (100%) rename {MDS_3/doc/MDS_3 => TMDS_3/doc/TMDS_3}/dependencies (100%) rename {MDS_3/doc/MDS_3 => TMDS_3/doc/TMDS_3}/examples.txt (100%) rename {MDS_3/examples/MDS_3 => TMDS_3/examples/TMDS_3}/CMakeLists.txt (95%) rename {MDS_3/examples/MDS_3 => TMDS_3/examples/TMDS_3}/c3t3_example.cpp (100%) rename {MDS_3/examples/MDS_3 => TMDS_3/examples/TMDS_3}/tetrahedron_soup_to_c3t3_example.cpp (100%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h (100%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/File_avizo.h (100%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/File_binary_mesh_3.h (96%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/File_maya.h (99%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/File_medit.h (97%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/File_tetgen.h (95%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h (95%) rename {MDS_3 => TMDS_3}/include/CGAL/IO/output_to_vtu.h (100%) rename {MDS_3 => TMDS_3}/include/CGAL/Mesh_complex_3_in_triangulation_3.h (98%) rename {MDS_3/include/CGAL/MDS_3 => TMDS_3/include/CGAL/TMDS_3}/Dump_c3t3.h (98%) rename {MDS_3/include/CGAL/MDS_3 => TMDS_3/include/CGAL/TMDS_3}/io_signature.h (100%) rename {MDS_3/include/CGAL/MDS_3 => TMDS_3/include/CGAL/TMDS_3}/tet_soup_to_c3t3.h (98%) rename {MDS_3/include/CGAL/MDS_3 => TMDS_3/include/CGAL/TMDS_3}/utilities.h (94%) rename {MDS_3 => TMDS_3}/include/CGAL/facets_in_complex_3_to_triangle_mesh.h (97%) rename {MDS_3/include/CGAL/internal/MDS_3 => TMDS_3/include/CGAL/internal/TMDS_3}/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h (92%) rename {MDS_3/include/CGAL/internal/MDS_3 => TMDS_3/include/CGAL/internal/TMDS_3}/Handle_IO_for_pair_of_int.h (97%) rename MDS_3/include/CGAL/internal/MDS_3/MDS_3_helper.h => TMDS_3/include/CGAL/internal/TMDS_3/TMDS_3_helper.h (90%) rename {MDS_3 => TMDS_3}/include/CGAL/tetrahedron_soup_to_triangulation_3.h (92%) rename {MDS_3/package_info/MDS_3 => TMDS_3/package_info/TMDS_3}/copyright (100%) rename {MDS_3/package_info/MDS_3 => TMDS_3/package_info/TMDS_3}/dependencies (98%) create mode 100644 TMDS_3/package_info/TMDS_3/description.txt rename {MDS_3/package_info/MDS_3 => TMDS_3/package_info/TMDS_3}/license.txt (100%) rename {MDS_3/package_info/MDS_3 => TMDS_3/package_info/TMDS_3}/maintainer (100%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/CMakeLists.txt (97%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/test_c3t3.cpp (100%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/test_c3t3_extract_subdomains_boundaries.cpp (100%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/test_c3t3_into_facegraph.cpp (96%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/test_c3t3_io.cpp (99%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/test_c3t3_io_MEDIT.cpp (100%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/test_c3t3_with_features.cpp (100%) rename {MDS_3/test/MDS_3 => TMDS_3/test/TMDS_3}/test_utilities.h (100%) diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index 160c1e06e79..2b7f142b513 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -34,7 +34,7 @@ Release date: December 2021 Release date: -### [Mesh Data Structure 3](https://doc.cgal.org/5.4/Manual/packages.html#PkgMDS3) (new package) +### [Tetrahedral Mesh Data Structure 3](https://doc.cgal.org/5.4/Manual/packages.html#PkgTMDS3) (new package) - This new package wraps all the existing code that deals with a ` MeshComplex_3InTriangulation_3`, and makes the data structure independant diff --git a/Installation/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_fwd.h b/Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h similarity index 84% rename from Installation/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_fwd.h rename to Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h index f21ddcb751b..8cb740bac2e 100644 --- a/Installation/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_fwd.h +++ b/Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h @@ -7,8 +7,8 @@ // SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial // -#ifndef CGAL_MDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H -#define CGAL_MDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H +#ifndef CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H +#define CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H /// \file Mesh_complex_3_in_triangulation_3_fwd.h /// Forward declarations of the MDS_3 package. @@ -35,7 +35,7 @@ namespace IO { ); } -namespace MDS_3 { +namespace TMDS_3 { template bool build_triangulation_from_file(std::istream& is, @@ -47,6 +47,6 @@ namespace MDS_3 { } // CGAL #endif -#endif /* CGAL_MDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */ +#endif /* CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */ diff --git a/Installation/include/CGAL/license/MDS_3.h b/Installation/include/CGAL/license/TMDS_3.h similarity index 72% rename from Installation/include/CGAL/license/MDS_3.h rename to Installation/include/CGAL/license/TMDS_3.h index e3f38693334..d253e2563cf 100644 --- a/Installation/include/CGAL/license/MDS_3.h +++ b/Installation/include/CGAL/license/TMDS_3.h @@ -11,15 +11,15 @@ // // Warning: this file is generated, see include/CGAL/licence/README.md -#ifndef CGAL_LICENSE_MDS_3_H -#define CGAL_LICENSE_MDS_3_H +#ifndef CGAL_LICENSE_TMDS_3_H +#define CGAL_LICENSE_TMDS_3_H #include #include -#ifdef CGAL_MDS_3_COMMERCIAL_LICENSE +#ifdef CGAL_TMDS_3_COMMERCIAL_LICENSE -# if CGAL_MDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE +# if CGAL_TMDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE # if defined(CGAL_LICENSE_WARNING) @@ -33,22 +33,22 @@ You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR -# endif // CGAL_MDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE +# endif // CGAL_TMDS_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE -#else // no CGAL_MDS_3_COMMERCIAL_LICENSE +#else // no CGAL_TMDS_3_COMMERCIAL_LICENSE # if defined(CGAL_LICENSE_WARNING) - CGAL_pragma_warning("\nThe macro CGAL_MDS_3_COMMERCIAL_LICENSE is not defined." + CGAL_pragma_warning("\nThe macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined." "\nYou use the CGAL 3D Mesh Data Structure package under " "the terms of the GPLv3+.") # endif // CGAL_LICENSE_WARNING # ifdef CGAL_LICENSE_ERROR -# error "The macro CGAL_MDS_3_COMMERCIAL_LICENSE is not defined.\ +# error "The macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined.\ You use the CGAL 3D Mesh Data Structure package under the terms of \ the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR -#endif // no CGAL_MDS_3_COMMERCIAL_LICENSE +#endif // no CGAL_TMDS_3_COMMERCIAL_LICENSE -#endif // CGAL_LICENSE_MDS_3_H +#endif // CGAL_LICENSE_TMDS_3_H diff --git a/MDS_3/package_info/MDS_3/description.txt b/MDS_3/package_info/MDS_3/description.txt deleted file mode 100644 index 7a83f60476c..00000000000 --- a/MDS_3/package_info/MDS_3/description.txt +++ /dev/null @@ -1,2 +0,0 @@ -Package MDS_3 : -Mesh Data Structures for dimension <=3 \ No newline at end of file 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 5201a9b9a86..2dc8389b0c2 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 59da02ae1cf..abf18700098 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 e2b1873281f..91dcd0d9a8a 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/Mesher_3.h b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h index 1293735a210..c6f0db691b3 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h @@ -36,7 +36,7 @@ #include -#include +#include #include #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 296c5d441bc..f10a7db926a 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::MDS_3::internal::Debug_messages_tools + : public CGAL::TMDS_3::internal::Debug_messages_tools { typedef Protect_edges_sizing_field Self; diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h index 540ea98b912..3f1a4925a92 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h +++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h @@ -38,7 +38,7 @@ #ifdef CGAL_MESH_3_PROFILING #include #endif -#include +#include #include diff --git a/Mesh_3/include/CGAL/Mesh_cell_base_3.h b/Mesh_3/include/CGAL/Mesh_cell_base_3.h index b659a74c2b3..ad8fbebf0eb 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 5d4225225d3..eb32483c3f0 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 6694284ccfc..381a824a2c6 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 #include diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h index 256e92aadf8..025f27062c1 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/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h index 19f94e8787d..d437db609e6 100644 --- a/Mesh_3/include/CGAL/refine_mesh_3.h +++ b/Mesh_3/include/CGAL/refine_mesh_3.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h index 84cc5434be6..77eff5443cc 100644 --- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h +++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h @@ -308,7 +308,7 @@ void output_to_medit(std::ostream& os, #endif CGAL_precondition(c3t3.triangulation().is_1_cover()); - typedef CGAL::MDS_3::Medit_pmap_generator Generator; + typedef CGAL::TMDS_3::Medit_pmap_generator Generator; typedef typename Generator::Cell_pmap Cell_pmap; typedef typename Generator::Facet_pmap Facet_pmap; typedef typename Generator::Facet_pmap_twice Facet_pmap_twice; diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h index c394b70b9fc..2b8eb20e50b 100644 --- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h +++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h @@ -31,12 +31,12 @@ #include -#include +#include #ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS #include #endif #include -#include +#include #include #include @@ -75,7 +75,7 @@ namespace Periodic_3_mesh_3 { template class Protect_edges_sizing_field - : public CGAL::MDS_3::internal::Debug_messages_tools + : public CGAL::TMDS_3::internal::Debug_messages_tools { typedef Protect_edges_sizing_field Self; diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h index 7abce20f71f..7ccffde6123 100644 --- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h +++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h b/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h index b3a8c8f465f..e8c27e63802 100644 --- a/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h +++ b/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp index cb4fa8cbfe9..6ad9ca71932 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp @@ -10,7 +10,7 @@ // Jane Tournois // -#include +#include #include #include "Scene_surface_mesh_item.h" @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include @@ -421,7 +421,7 @@ public: } } - CGAL::MDS_3::build_triangulation(c3t3_item->c3t3().triangulation(), + CGAL::TMDS_3::build_triangulation(c3t3_item->c3t3().triangulation(), points, finite_cells, border_facets); for( C3t3::Triangulation::Finite_cells_iterator diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp index 7e18ca9a3e3..7f4db8c8ed3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp @@ -1,6 +1,6 @@ -#include +#include #include "Scene_c3t3_item.h" -#include +#include #include #include #include @@ -127,7 +127,7 @@ Polyhedron_demo_c3t3_binary_io_plugin::load( item->setName(fileinfo.baseName()); item->set_valid(false); - if(CGAL::MDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true)) + if(CGAL::TMDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true)) { item->c3t3().rescan_after_load_of_triangulation(); for( C3t3::Cell_handle cit : item->c3t3().triangulation().finite_cell_handles()) diff --git a/MDS_3/doc/MDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h b/TMDS_3/doc/TMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h similarity index 100% rename from MDS_3/doc/MDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h rename to TMDS_3/doc/TMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h diff --git a/MDS_3/doc/MDS_3/Concepts/MeshComplex_3InTriangulation_3.h b/TMDS_3/doc/TMDS_3/Concepts/MeshComplex_3InTriangulation_3.h similarity index 100% rename from MDS_3/doc/MDS_3/Concepts/MeshComplex_3InTriangulation_3.h rename to TMDS_3/doc/TMDS_3/Concepts/MeshComplex_3InTriangulation_3.h diff --git a/MDS_3/doc/MDS_3/Doxyfile.in b/TMDS_3/doc/TMDS_3/Doxyfile.in similarity index 83% rename from MDS_3/doc/MDS_3/Doxyfile.in rename to TMDS_3/doc/TMDS_3/Doxyfile.in index c7b9e9a3e10..458ecb92569 100644 --- a/MDS_3/doc/MDS_3/Doxyfile.in +++ b/TMDS_3/doc/TMDS_3/Doxyfile.in @@ -1,6 +1,6 @@ @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} -PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 3D Mesh Data Structures" +PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - Tetrahedral Mesh Data Structures" #custom options EXTRACT_ALL = false @@ -13,7 +13,7 @@ WARN_IF_UNDOCUMENTED = false INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/IO -EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/internal/MDS_3 +EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/internal/TMDS_3 HTML_EXTRA_FILES = ${CGAL_PACKAGE_DOC_DIR}/fig/c3t3.jpg \ # ${CGAL_PACKAGE_DOC_DIR}/fig/no-protection-complex.png diff --git a/MDS_3/doc/MDS_3/PackageDescription.txt b/TMDS_3/doc/TMDS_3/PackageDescription.txt similarity index 100% rename from MDS_3/doc/MDS_3/PackageDescription.txt rename to TMDS_3/doc/TMDS_3/PackageDescription.txt diff --git a/MDS_3/doc/MDS_3/MDS_3.txt b/TMDS_3/doc/TMDS_3/TMDS_3.txt similarity index 100% rename from MDS_3/doc/MDS_3/MDS_3.txt rename to TMDS_3/doc/TMDS_3/TMDS_3.txt diff --git a/MDS_3/doc/MDS_3/dependencies b/TMDS_3/doc/TMDS_3/dependencies similarity index 100% rename from MDS_3/doc/MDS_3/dependencies rename to TMDS_3/doc/TMDS_3/dependencies diff --git a/MDS_3/doc/MDS_3/examples.txt b/TMDS_3/doc/TMDS_3/examples.txt similarity index 100% rename from MDS_3/doc/MDS_3/examples.txt rename to TMDS_3/doc/TMDS_3/examples.txt diff --git a/MDS_3/examples/MDS_3/CMakeLists.txt b/TMDS_3/examples/TMDS_3/CMakeLists.txt similarity index 95% rename from MDS_3/examples/MDS_3/CMakeLists.txt rename to TMDS_3/examples/TMDS_3/CMakeLists.txt index 2093c8a33df..4b7847f6747 100644 --- a/MDS_3/examples/MDS_3/CMakeLists.txt +++ b/TMDS_3/examples/TMDS_3/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.1...3.20) -project(MDS_3_Examples) +project(TMDS_3_Examples) # CGAL and its components find_package(CGAL REQUIRED) diff --git a/MDS_3/examples/MDS_3/c3t3_example.cpp b/TMDS_3/examples/TMDS_3/c3t3_example.cpp similarity index 100% rename from MDS_3/examples/MDS_3/c3t3_example.cpp rename to TMDS_3/examples/TMDS_3/c3t3_example.cpp diff --git a/MDS_3/examples/MDS_3/tetrahedron_soup_to_c3t3_example.cpp b/TMDS_3/examples/TMDS_3/tetrahedron_soup_to_c3t3_example.cpp similarity index 100% rename from MDS_3/examples/MDS_3/tetrahedron_soup_to_c3t3_example.cpp rename to TMDS_3/examples/TMDS_3/tetrahedron_soup_to_c3t3_example.cpp diff --git a/MDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h b/TMDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h similarity index 100% rename from MDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h rename to TMDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h diff --git a/MDS_3/include/CGAL/IO/File_avizo.h b/TMDS_3/include/CGAL/IO/File_avizo.h similarity index 100% rename from MDS_3/include/CGAL/IO/File_avizo.h rename to TMDS_3/include/CGAL/IO/File_avizo.h diff --git a/MDS_3/include/CGAL/IO/File_binary_mesh_3.h b/TMDS_3/include/CGAL/IO/File_binary_mesh_3.h similarity index 96% rename from MDS_3/include/CGAL/IO/File_binary_mesh_3.h rename to TMDS_3/include/CGAL/IO/File_binary_mesh_3.h index 94972317b76..854518f8c82 100644 --- a/MDS_3/include/CGAL/IO/File_binary_mesh_3.h +++ b/TMDS_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/MDS_3/include/CGAL/IO/File_maya.h b/TMDS_3/include/CGAL/IO/File_maya.h similarity index 99% rename from MDS_3/include/CGAL/IO/File_maya.h rename to TMDS_3/include/CGAL/IO/File_maya.h index e4f4803744c..bc46b9eeff5 100644 --- a/MDS_3/include/CGAL/IO/File_maya.h +++ b/TMDS_3/include/CGAL/IO/File_maya.h @@ -12,7 +12,7 @@ #ifndef CGAL_IO_FILE_MAYA_H #define CGAL_IO_FILE_MAYA_H -#include +#include #include #include diff --git a/MDS_3/include/CGAL/IO/File_medit.h b/TMDS_3/include/CGAL/IO/File_medit.h similarity index 97% rename from MDS_3/include/CGAL/IO/File_medit.h rename to TMDS_3/include/CGAL/IO/File_medit.h index dbb0f40d5d7..6806b1cf808 100644 --- a/MDS_3/include/CGAL/IO/File_medit.h +++ b/TMDS_3/include/CGAL/IO/File_medit.h @@ -14,11 +14,11 @@ #ifndef CGAL_IO_FILE_MEDIT_H #define CGAL_IO_FILE_MEDIT_H -#include +#include -#include +#include #include -#include +#include #include #include @@ -40,7 +40,7 @@ namespace CGAL { -namespace MDS_3 { +namespace TMDS_3 { //------------------------------------------------------- // Needed in verbose mode @@ -777,7 +777,9 @@ output_to_medit(std::ostream& os, { os << "Vertices\n" << tr.number_of_vertices() << '\n'; - for (Vertex_handle vit : tr.finite_vertex_handles()) + for (typename Tr::Finite_vertices_iterator vit = tr.finite_vertices_begin(); + vit != tr.finite_vertices_end(); + ++vit) { V[vit] = inum++; Point p = tr.point(vit); @@ -867,7 +869,10 @@ output_to_medit(std::ostream& os, if (all_cells) { - for (Cell_handle cit : c3t3.triangulation().finite_cell_handles()) + for (typename C3T3::Triangulation::Finite_cells_iterator + cit = c3t3.triangulation().finite_cells_begin(); + cit != c3t3.triangulation().finite_cells_end(); + ++cit) { for (int i = 0; i < 4; i++) os << V[cit->vertex(i)] << ' '; @@ -925,19 +930,19 @@ output_to_medit(std::ostream& os, if ( rebind ) { if ( show_patches ) - CGAL::MDS_3::output_to_medit(os, c3t3, + CGAL::TMDS_3::output_to_medit(os, c3t3, all_vertices, all_cells); else - CGAL::MDS_3::output_to_medit(os, c3t3, + CGAL::TMDS_3::output_to_medit(os, c3t3, all_vertices, all_cells); } else { if ( show_patches ) - CGAL::MDS_3::output_to_medit(os, c3t3, + CGAL::TMDS_3::output_to_medit(os, c3t3, all_vertices, all_cells); else - CGAL::MDS_3::output_to_medit(os, c3t3, + CGAL::TMDS_3::output_to_medit(os, c3t3, all_vertices, all_cells); } } @@ -1114,7 +1119,7 @@ template bool read_MEDIT(std::istream& in, T3& t3) { CGAL_assertion(!(!in)); - return CGAL::MDS_3::build_triangulation_from_file(in, t3); + return CGAL::TMDS_3::build_triangulation_from_file(in, t3); } } // namespace IO diff --git a/MDS_3/include/CGAL/IO/File_tetgen.h b/TMDS_3/include/CGAL/IO/File_tetgen.h similarity index 95% rename from MDS_3/include/CGAL/IO/File_tetgen.h rename to TMDS_3/include/CGAL/IO/File_tetgen.h index dc09aab3d85..8461645bf81 100644 --- a/MDS_3/include/CGAL/IO/File_tetgen.h +++ b/TMDS_3/include/CGAL/IO/File_tetgen.h @@ -13,7 +13,7 @@ #ifndef CGAL_IO_FILE_TETGEN_H #define CGAL_IO_FILE_TETGEN_H -#include +#include #include #include @@ -25,7 +25,7 @@ namespace CGAL { -namespace MDS_3 { +namespace TMDS_3 { template void @@ -185,7 +185,7 @@ output_to_tetgen(std::string filename, //------------------------------------------------------- } // end output_to_tetgen(...) -} // end namespace Mesh_3 +} // end namespace TMDS_3 namespace IO { @@ -211,16 +211,16 @@ output_to_tetgen(std::string filename, if ( rebind ) { if ( show_patches ) - MDS_3::output_to_tetgen(filename,c3t3); + TMDS_3::output_to_tetgen(filename,c3t3); else - MDS_3::output_to_tetgen(filename,c3t3); + TMDS_3::output_to_tetgen(filename,c3t3); } else { if ( show_patches ) - MDS_3::output_to_tetgen(filename,c3t3); + TMDS_3::output_to_tetgen(filename,c3t3); else - MDS_3::output_to_tetgen(filename,c3t3); + TMDS_3::output_to_tetgen(filename,c3t3); } } diff --git a/MDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h b/TMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h similarity index 95% rename from MDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h rename to TMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h index 4ac835a78d0..d474615ac52 100644 --- a/MDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h +++ b/TMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h @@ -14,7 +14,7 @@ #ifndef CGAL_IO_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H #define CGAL_IO_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H -#include +#include #ifndef CGAL_NO_DEPRECATED_CODE #include diff --git a/MDS_3/include/CGAL/IO/output_to_vtu.h b/TMDS_3/include/CGAL/IO/output_to_vtu.h similarity index 100% rename from MDS_3/include/CGAL/IO/output_to_vtu.h rename to TMDS_3/include/CGAL/IO/output_to_vtu.h diff --git a/MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/TMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h similarity index 98% rename from MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h rename to TMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h index 71ff2bc315b..857fae54889 100644 --- a/MDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h +++ b/TMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h @@ -18,17 +18,17 @@ #ifndef CGAL_MESH_COMPLEX_3_IN_TRIANGULATION_3_H #define CGAL_MESH_COMPLEX_3_IN_TRIANGULATION_3_H -#include +#include -#include +#include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ namespace CGAL { namespace CGAL { - namespace MDS_3 { + namespace TMDS_3 { namespace details { @@ -112,8 +112,8 @@ namespace CGAL { } }; // end class template C3t3_helper_class - } // end namespace MDS_3::details - } //end namesapce MDS_3 + } // end namespace TMDS_3::details + } //end namesapce TMDS_3 /*! \ingroup PkgMDS3Classes @@ -160,8 +160,8 @@ template class Mesh_complex_3_in_triangulation_3 #ifndef DOXYGEN_RUNNING - : public CGAL::MDS_3::details::C3t3_helper_class - , public CGAL::MDS_3::internal::Debug_messages_tools + : public CGAL::TMDS_3::details::C3t3_helper_class + , public CGAL::TMDS_3::internal::Debug_messages_tools #endif { public: @@ -170,7 +170,7 @@ public: private: typedef Mesh_complex_3_in_triangulation_3< Tr,CornerIndex,CurveIndex> Self; - typedef MDS_3::details::C3t3_helper_class Base; + typedef TMDS_3::details::C3t3_helper_class Base; typedef CGAL::Hash_handles_with_or_without_timestamps Hash_fct; public: @@ -792,7 +792,7 @@ private: } }; // end class Cell_not_in_complex - typedef MDS_3::internal::Iterator_not_in_complex Iterator_not_in_complex; + typedef TMDS_3::internal::Iterator_not_in_complex Iterator_not_in_complex; class Facet_iterator_not_in_complex { @@ -856,7 +856,7 @@ private: // Iterator type to get the first element of pair typedef boost::transform_iterator < - MDS_3::internal::First_of, + TMDS_3::internal::First_of, Vertex_map_filter_iterator > Vertex_map_iterator_first; // Iterator type to remove a level of referencing diff --git a/MDS_3/include/CGAL/MDS_3/Dump_c3t3.h b/TMDS_3/include/CGAL/TMDS_3/Dump_c3t3.h similarity index 98% rename from MDS_3/include/CGAL/MDS_3/Dump_c3t3.h rename to TMDS_3/include/CGAL/TMDS_3/Dump_c3t3.h index 69b73bcd8e0..066993f2ab4 100644 --- a/MDS_3/include/CGAL/MDS_3/Dump_c3t3.h +++ b/TMDS_3/include/CGAL/TMDS_3/Dump_c3t3.h @@ -13,11 +13,11 @@ #ifndef CGAL_MESH_3_DUMP_C3T3_H #define CGAL_MESH_3_DUMP_C3T3_H -#include +#include #include -#include +#include #include #include diff --git a/MDS_3/include/CGAL/MDS_3/io_signature.h b/TMDS_3/include/CGAL/TMDS_3/io_signature.h similarity index 100% rename from MDS_3/include/CGAL/MDS_3/io_signature.h rename to TMDS_3/include/CGAL/TMDS_3/io_signature.h diff --git a/MDS_3/include/CGAL/MDS_3/tet_soup_to_c3t3.h b/TMDS_3/include/CGAL/TMDS_3/tet_soup_to_c3t3.h similarity index 98% rename from MDS_3/include/CGAL/MDS_3/tet_soup_to_c3t3.h rename to TMDS_3/include/CGAL/TMDS_3/tet_soup_to_c3t3.h index 69ed6902211..da6869025ba 100644 --- a/MDS_3/include/CGAL/MDS_3/tet_soup_to_c3t3.h +++ b/TMDS_3/include/CGAL/TMDS_3/tet_soup_to_c3t3.h @@ -14,10 +14,10 @@ // //****************************************************************************** -#ifndef CGAL_MDS_3_TET_SOUP_TO_C3T3_H -#define CGAL_MDS_3_TET_SOUP_TO_C3T3_H +#ifndef CGAL_TMDS_3_TET_SOUP_TO_C3T3_H +#define CGAL_TMDS_3_TET_SOUP_TO_C3T3_H -#include +#include #include #include @@ -32,7 +32,7 @@ namespace CGAL { -namespace MDS_3 +namespace TMDS_3 { template std::array make_ordered_vertex_array(const Vh vh0, const Vh vh1, const Vh vh2) @@ -535,9 +535,9 @@ bool build_triangulation_from_file(std::istream& is, replace_domain_0 && !dont_replace_domain_0); } -} // namespace MDS_3 +} // namespace TMDS_3 } // namespace CGAL #include -#endif // CGAL_MDS_3_TET_SOUP_TO_C3T3_H +#endif // CGAL_TMDS_3_TET_SOUP_TO_C3T3_H diff --git a/MDS_3/include/CGAL/MDS_3/utilities.h b/TMDS_3/include/CGAL/TMDS_3/utilities.h similarity index 94% rename from MDS_3/include/CGAL/MDS_3/utilities.h rename to TMDS_3/include/CGAL/TMDS_3/utilities.h index 02bbd8454f1..214d1f89560 100644 --- a/MDS_3/include/CGAL/MDS_3/utilities.h +++ b/TMDS_3/include/CGAL/TMDS_3/utilities.h @@ -14,10 +14,10 @@ // File Description : //****************************************************************************** -#ifndef CGAL_MDS_3_UTILITIES_H -#define CGAL_MDS_3_UTILITIES_H +#ifndef CGAL_TMDS_3_UTILITIES_H +#define CGAL_TMDS_3_UTILITIES_H -#include +#include #include #include @@ -25,7 +25,7 @@ #include namespace CGAL { -namespace MDS_3 { +namespace TMDS_3 { namespace internal { struct Debug_messages_tools { @@ -115,7 +115,7 @@ public: } // end namespace internal -} // end namespace MDS_3 +} // end namespace TMDS_3 } //namespace CGAL -#endif // CGAL_MDS_3_UTILITIES_H +#endif // CGAL_TMDS_3_UTILITIES_H diff --git a/MDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h b/TMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h similarity index 97% rename from MDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h rename to TMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h index 47e67437a9e..28c3495b3ae 100644 --- a/MDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h +++ b/TMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h @@ -14,7 +14,7 @@ #ifndef CGAL_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H #define CGAL_FACETS_IN_COMPLEX_3_TO_TRIANGLE_MESH_H -#include +#include #include #include @@ -34,7 +34,7 @@ namespace CGAL { -namespace MDS_3 { +namespace TMDS_3 { namespace internal { @@ -171,7 +171,7 @@ void set_face_patches(const Index2FaceMap& i2f, } // end namespace internal -} // end namespace MDS_3 +} // end namespace TMDS_3 /** * @ingroup PkgMDS3Functions @@ -216,7 +216,7 @@ void set_face_patches(const Index2FaceMap& i2f, std::vector patches; std::vector points; - MDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches); + TMDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches); if (!PMP::is_polygon_soup_a_polygon_mesh(faces)) PMP::orient_polygon_soup(points, faces); @@ -229,7 +229,7 @@ void set_face_patches(const Index2FaceMap& i2f, using parameters::choose_parameter; using parameters::get_parameter; - MDS_3::internal::set_face_patches(i2f, + TMDS_3::internal::set_face_patches(i2f, patches, get_parameter(np, internal_np::face_patch)); } diff --git a/MDS_3/include/CGAL/internal/MDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h b/TMDS_3/include/CGAL/internal/TMDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h similarity index 92% rename from MDS_3/include/CGAL/internal/MDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h rename to TMDS_3/include/CGAL/internal/TMDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h index 22ad3eaffd7..288be2b28af 100644 --- a/MDS_3/include/CGAL/internal/MDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h +++ b/TMDS_3/include/CGAL/internal/TMDS_3/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h @@ -12,7 +12,7 @@ #ifndef CGAL_INTERNAL_MESH_3_BOUNDARY_OF_SUDDOMAIN_OF_COMPLEX_3_IN_TRIANGULATION_3_TO_OFF_H #define CGAL_INTERNAL_MESH_3_BOUNDARY_OF_SUDDOMAIN_OF_COMPLEX_3_IN_TRIANGULATION_3_TO_OFF_H -#include +#include #include @@ -64,7 +64,7 @@ output_boundary_of_c3t3_to_off(const C3T3& c3t3, std::vector faces; std::vector patches; - CGAL::MDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, sd_index, points, faces, + CGAL::TMDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, sd_index, points, faces, patches, normals_point_outside_of_the_subdomain); return output_polygon_soup_to_off(points, faces, out); @@ -83,7 +83,7 @@ output_facets_in_complex_to_off(const C3T3& c3t3, std::vector faces; std::vector patches; - CGAL::MDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches); + CGAL::TMDS_3::internal::facets_in_complex_3_to_triangle_soup(c3t3, points, faces, patches); return output_polygon_soup_to_off(points, faces, out); } diff --git a/MDS_3/include/CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h b/TMDS_3/include/CGAL/internal/TMDS_3/Handle_IO_for_pair_of_int.h similarity index 97% rename from MDS_3/include/CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h rename to TMDS_3/include/CGAL/internal/TMDS_3/Handle_IO_for_pair_of_int.h index 99d6bdb71a9..16c1af90b57 100644 --- a/MDS_3/include/CGAL/internal/MDS_3/Handle_IO_for_pair_of_int.h +++ b/TMDS_3/include/CGAL/internal/TMDS_3/Handle_IO_for_pair_of_int.h @@ -13,12 +13,12 @@ #ifndef CGAL_INTERNAL_MESH_3_INTERNAL_HANDLE_IO_FOR_PAIR_OF_INT_H #define CGAL_INTERNAL_MESH_3_INTERNAL_HANDLE_IO_FOR_PAIR_OF_INT_H -#include +#include #include #include -#include +#include #include #include #include diff --git a/MDS_3/include/CGAL/internal/MDS_3/MDS_3_helper.h b/TMDS_3/include/CGAL/internal/TMDS_3/TMDS_3_helper.h similarity index 90% rename from MDS_3/include/CGAL/internal/MDS_3/MDS_3_helper.h rename to TMDS_3/include/CGAL/internal/TMDS_3/TMDS_3_helper.h index 4aa2c59ad09..3798ffbb1bb 100644 --- a/MDS_3/include/CGAL/internal/MDS_3/MDS_3_helper.h +++ b/TMDS_3/include/CGAL/internal/TMDS_3/TMDS_3_helper.h @@ -10,10 +10,10 @@ // // Author(s) : Jane Tournois -#ifndef CGAL_INTERNAL_MDS_3_HELPERS_H -#define CGAL_INTERNAL_MDS_3_HELPERS_H +#ifndef CGAL_INTERNAL_TMDS_3_HELPERS_H +#define CGAL_INTERNAL_TMDS_3_HELPERS_H -#include +#include #include @@ -21,7 +21,7 @@ #include namespace CGAL { -namespace MDS_3 { +namespace TMDS_3 { namespace internal { template @@ -63,7 +63,7 @@ namespace internal { } } // end namespace internal -} // end namespace MDS_3 +} // end namespace TMDS_3 } // end namespace CGAL -#endif // CGAL_INTERNAL_MDS_3_HELPERS_H +#endif // CGAL_INTERNAL_TMDS_3_HELPERS_H diff --git a/MDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h b/TMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h similarity index 92% rename from MDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h rename to TMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h index 5725fc04568..2a4fe0f62c7 100644 --- a/MDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h +++ b/TMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h @@ -15,13 +15,13 @@ // File Description : //****************************************************************************** -#ifndef CGAL_MDS_3_TETRAHEDRON_SOUP_TO_C3T3_H -#define CGAL_MDS_3_TETRAHEDRON_SOUP_TO_C3T3_H +#ifndef CGAL_TMDS_3_TETRAHEDRON_SOUP_TO_C3T3_H +#define CGAL_TMDS_3_TETRAHEDRON_SOUP_TO_C3T3_H -#include +#include -#include -#include +#include +#include #include #include @@ -88,9 +88,9 @@ namespace CGAL { finite_cells.push_back(cell); } - CGAL::MDS_3::build_triangulation(tr, points, finite_cells, border_facets); + CGAL::TMDS_3::build_triangulation(tr, points, finite_cells, border_facets); - CGAL_assertion(CGAL::MDS_3::internal::is_convex(tr)); + CGAL_assertion(CGAL::TMDS_3::internal::is_convex(tr)); } /** \ingroup PkgMDS3Functions @@ -149,9 +149,9 @@ namespace CGAL { typename Triangulation::Cell::Surface_patch_index> empty_map; auto facets = choose_parameter(get_parameter(np, internal_np::surface_facets), empty_map); - CGAL::MDS_3::build_triangulation(tr, points, tets, facets); + CGAL::TMDS_3::build_triangulation(tr, points, tets, facets); - CGAL_assertion(CGAL::MDS_3::internal::is_convex(tr)); + CGAL_assertion(CGAL::TMDS_3::internal::is_convex(tr)); } template #include -#include +#include #include #include @@ -42,7 +42,7 @@ int main (int argc, char** argv){ return 1; } C3t3 c3t3; - if(CGAL::MDS_3::build_triangulation_from_file(in, c3t3.triangulation())) + if(CGAL::TMDS_3::build_triangulation_from_file(in, c3t3.triangulation())) { for( C3t3::Triangulation::Finite_cells_iterator cit = c3t3.triangulation().finite_cells_begin(); diff --git a/MDS_3/test/MDS_3/test_c3t3_io.cpp b/TMDS_3/test/TMDS_3/test_c3t3_io.cpp similarity index 99% rename from MDS_3/test/MDS_3/test_c3t3_io.cpp rename to TMDS_3/test/TMDS_3/test_c3t3_io.cpp index c2398fa4402..8673d34dee4 100644 --- a/MDS_3/test/MDS_3/test_c3t3_io.cpp +++ b/TMDS_3/test/TMDS_3/test_c3t3_io.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/MDS_3/test/MDS_3/test_c3t3_io_MEDIT.cpp b/TMDS_3/test/TMDS_3/test_c3t3_io_MEDIT.cpp similarity index 100% rename from MDS_3/test/MDS_3/test_c3t3_io_MEDIT.cpp rename to TMDS_3/test/TMDS_3/test_c3t3_io_MEDIT.cpp diff --git a/MDS_3/test/MDS_3/test_c3t3_with_features.cpp b/TMDS_3/test/TMDS_3/test_c3t3_with_features.cpp similarity index 100% rename from MDS_3/test/MDS_3/test_c3t3_with_features.cpp rename to TMDS_3/test/TMDS_3/test_c3t3_with_features.cpp diff --git a/MDS_3/test/MDS_3/test_utilities.h b/TMDS_3/test/TMDS_3/test_utilities.h similarity index 100% rename from MDS_3/test/MDS_3/test_utilities.h rename to TMDS_3/test/TMDS_3/test_utilities.h diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h index 5d2275eb335..6fe757e9a0a 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include @@ -109,7 +109,7 @@ public: // finished std::vector new_vertices; std::map border_facets; - if (CGAL::MDS_3::build_triangulation(triangulation, + if (CGAL::TMDS_3::build_triangulation(triangulation, points, finite_cells, border_facets, new_vertices /*, verbose*/)) {