diff --git a/Documentation/doc/Documentation/packages.txt b/Documentation/doc/Documentation/packages.txt index fbb18f73bed..9fd4bb20491 100644 --- a/Documentation/doc/Documentation/packages.txt +++ b/Documentation/doc/Documentation/packages.txt @@ -71,7 +71,7 @@ \package_listing{Triangulation_on_sphere_2} \package_listing{Periodic_2_triangulation_2} \package_listing{Hyperbolic_triangulation_2} -\package_listing{Hyperbolic_surface_triangulation_2} +\package_listing{Triangulation_on_hyperbolic_surface_2} \package_listing{Periodic_4_hyperbolic_triangulation_2} \package_listing{Triangulation_3} \package_listing{TDS_3} diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/examples.txt b/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/examples.txt deleted file mode 100644 index 1b3c6c47dbc..00000000000 --- a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/examples.txt +++ /dev/null @@ -1,3 +0,0 @@ -/*! -\example Hyperbolic_surface_triangulation_2/hyperbolic_surface_triangulation.cpp -*/ diff --git a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/CMakeLists.txt b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt similarity index 66% rename from Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/CMakeLists.txt rename to Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt index d40f18d832d..ace8d3a3074 100644 --- a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/CMakeLists.txt +++ b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1...3.15) -project( Hyperbolic_surface_triangulation_2_Demo ) +project( Triangulation_on_hyperbolic_surface_2_Demo ) # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -43,12 +43,12 @@ endif() # ui files, created with Qt Designer qt6_wrap_ui(UIS drawing_window_description.ui) -add_executable( Hyperbolic_surface_triangulation_2_demo Hyperbolic_surface_triangulation_2_demo.cpp window.cpp ${UIS}) +add_executable( Triangulation_on_hyperbolic_surface_2_demo Triangulation_on_hyperbolic_surface_2_demo.cpp window.cpp ${UIS}) -add_to_cached_list( CGAL_EXECUTABLE_TARGETS Hyperbolic_surface_triangulation_2_demo ) +add_to_cached_list( CGAL_EXECUTABLE_TARGETS Triangulation_on_hyperbolic_surface_2_demo ) -target_link_libraries(Hyperbolic_surface_triangulation_2_demo PRIVATE CGAL::CGAL CGAL::CGAL_Qt6 Qt6::Widgets ) +target_link_libraries(Triangulation_on_hyperbolic_surface_2_demo PRIVATE CGAL::CGAL CGAL::CGAL_Qt6 Qt6::Widgets ) set(CMAKE_BUILD_TYPE "Release") -target_include_directories(Hyperbolic_surface_triangulation_2_demo PRIVATE ../../include/) +target_include_directories(Triangulation_on_hyperbolic_surface_2_demo PRIVATE ../../include/) diff --git a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/Hyperbolic_surface_triangulation_2_demo.cpp b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2_demo.cpp similarity index 93% rename from Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/Hyperbolic_surface_triangulation_2_demo.cpp rename to Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2_demo.cpp index 17dced0e6f3..8e9252a2bb7 100644 --- a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/Hyperbolic_surface_triangulation_2_demo.cpp +++ b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2_demo.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include using namespace CGAL; @@ -14,7 +14,7 @@ typedef Hyperbolic_Delaunay_triangulation_traits_2 ParentTr typedef Hyperbolic_surface_traits_2 Traits; typedef Hyperbolic_fundamental_domain_2 Domain; typedef Hyperbolic_fundamental_domain_factory_2 Factory; -typedef Hyperbolic_surface_triangulation_2 Triangulation; +typedef Triangulation_on_hyperbolic_surface_2 Triangulation; ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/drawing_window_description.ui b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/drawing_window_description.ui similarity index 100% rename from Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/drawing_window_description.ui rename to Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/drawing_window_description.ui diff --git a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/window.cpp b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/window.cpp similarity index 100% rename from Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/window.cpp rename to Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/window.cpp diff --git a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/window.h b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/window.h similarity index 88% rename from Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/window.h rename to Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/window.h index 75100ab93ba..56d7376e4d5 100644 --- a/Hyperbolic_surface_triangulation_2/demo/Hyperbolic_surface_triangulation_2/window.h +++ b/Triangulation_on_hyperbolic_surface_2/demo/Triangulation_on_hyperbolic_surface_2/window.h @@ -10,8 +10,8 @@ // // Author(s) : Vincent Despré, Loïc Dubois, Monique Teillaud -#ifndef CGAL_HYPERBOLIC_SURFACE_TRIANGULATION_2_DEMO_WINDOW -#define CGAL_HYPERBOLIC_SURFACE_TRIANGULATION_2_DEMO_WINDOW +#ifndef CGAL_TRIANGULATION_ON_HYPERBOLIC_SURFACE_DEMO_WINDOW +#define CGAL_TRIANGULATION_ON_HYPERBOLIC_SURFACE_DEMO_WINDOW // Qt headers #include @@ -25,13 +25,13 @@ #include #include #include -#include +#include -typedef CGAL::Simple_cartesian Kernel; -typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; -typedef CGAL::Hyperbolic_surface_traits_2 Traits; -typedef Traits::Hyperbolic_point_2 Point; -typedef CGAL::Hyperbolic_surface_triangulation_2 Triangulation; +typedef CGAL::Simple_cartesian Kernel; +typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; +typedef CGAL::Hyperbolic_surface_traits_2 Traits; +typedef Traits::Hyperbolic_point_2 Point; +typedef CGAL::Triangulation_on_hyperbolic_surface_2 Triangulation; class DemoWindowItem : public CGAL::Qt::GraphicsItem @@ -98,4 +98,4 @@ public: void keyPressEvent(QKeyEvent* event); }; -#endif // CGAL_HYPERBOLIC_SURFACE_TRIANGULATION_2_DEMO_WINDOW +#endif // CGAL_TRIANGULATION_ON_HYPERBOLIC_SURFACE_DEMO_WINDOW diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Complex_number.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Complex_number.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Complex_number.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Complex_number.h diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_fundamental_domain_2.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_fundamental_domain_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_fundamental_domain_2.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_fundamental_domain_2.h diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_fundamental_domain_factory_2.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_fundamental_domain_factory_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_fundamental_domain_factory_2.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_fundamental_domain_factory_2.h diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_isometry_2.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_isometry_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_isometry_2.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_isometry_2.h diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_surface_traits_2.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_surface_traits_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_surface_traits_2.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Hyperbolic_surface_traits_2.h diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_surface_triangulation_2.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Triangulation_on_hyperbolic_surface_2.h similarity index 93% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_surface_triangulation_2.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Triangulation_on_hyperbolic_surface_2.h index aec19e100f9..e5e9206fc8c 100644 --- a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_surface_triangulation_2.h +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/CGAL/Triangulation_on_hyperbolic_surface_2.h @@ -35,7 +35,8 @@ the Delaunay flip algorithm, and the construction of a portion of the lift of th decorated with complex numbers to represent cross ratios. */ template> -class Hyperbolic_surface_triangulation_2{ +class Triangulation_on_hyperbolic_surface_2 +{ public: /// \name Types /// @{ @@ -94,7 +95,7 @@ public: /*! Default constructor. */ - Hyperbolic_surface_triangulation_2() {}; + Triangulation_on_hyperbolic_surface_2() {}; /*! Constructor from a convex fundamental domain: triangulates the polygon of @@ -103,12 +104,12 @@ public: three vertices of indices size-1, 0 and 1 and the dart is the one between the vertices of indices size-1 and 0.) */ - Hyperbolic_surface_triangulation_2(const Hyperbolic_fundamental_domain_2& domain); + Triangulation_on_hyperbolic_surface_2(const Hyperbolic_fundamental_domain_2& domain); /*! Constructor from a decorated combinatorial map and an anchor. */ - Hyperbolic_surface_triangulation_2(Combinatorial_map_with_cross_ratios& cmap, Anchor& an_anchor); + Triangulation_on_hyperbolic_surface_2(Combinatorial_map_with_cross_ratios& cmap, Anchor& an_anchor); /// @} /// \name Assignment @@ -116,7 +117,7 @@ public: /*! \pre other.is_valid() */ - Hyperbolic_surface_triangulation_2& operator=(Hyperbolic_surface_triangulation_2 other); + Triangulation_on_hyperbolic_surface_2& operator=(Triangulation_on_hyperbolic_surface_2 other); /// @} /// \name Access Functions @@ -237,13 +238,13 @@ Face_const_range faces_const_range() const; \pre is_valid() */ - std::ostream& operator<<(std::ostream& s, const Hyperbolic_surface_triangulation_2& triangulation); + std::ostream& operator<<(std::ostream& s, const Triangulation_on_hyperbolic_surface_2& triangulation); /*! reads the triangulation from a stream. The format of the input should be the same as the format of the output of the '<<' operator. */ - std::istream& operator>>(std::istream& s, Hyperbolic_surface_triangulation_2& triangulation); + std::istream& operator>>(std::istream& s, Triangulation_on_hyperbolic_surface_2& triangulation); /// @} }; diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Concepts/ComplexNumber.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Concepts/ComplexNumber.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Concepts/ComplexNumber.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Concepts/ComplexNumber.h diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Concepts/HyperbolicSurfaceTraits_2.h b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Concepts/HyperbolicSurfaceTraits_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Concepts/HyperbolicSurfaceTraits_2.h rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Concepts/HyperbolicSurfaceTraits_2.h diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Doxyfile.in b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Doxyfile.in similarity index 100% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Doxyfile.in rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Doxyfile.in diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/PackageDescription.txt b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/PackageDescription.txt similarity index 87% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/PackageDescription.txt rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/PackageDescription.txt index 81a5a2c221c..6855654c8a6 100644 --- a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/PackageDescription.txt +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/PackageDescription.txt @@ -43,7 +43,7 @@ \cgalCRPSection{Classes} -- `CGAL::Hyperbolic_surface_triangulation_2` represents a triangulation of a closed orientable hyperbolic surface. It offers functionalities such as the generation of the triangulation from a convex fundamental domain, the Delaunay flip algorithm, and the construction of a portion of the lift of the triangulation in the hyperbolic plane. +- `CGAL::Triangulation_on_hyperbolic_surface_2` represents a triangulation of a closed orientable hyperbolic surface. It offers functionalities such as the generation of the triangulation from a convex fundamental domain, the Delaunay flip algorithm, and the construction of a portion of the lift of the triangulation in the hyperbolic plane. - `CGAL::Hyperbolic_fundamental_domain_2` represents a fundamental domain of a closed orientable hyperbolic surface. diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Hyperbolic_surface_triangulation_2.txt b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2.txt similarity index 94% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Hyperbolic_surface_triangulation_2.txt rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2.txt index 9d9a6eb898c..9c621340c38 100644 --- a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Hyperbolic_surface_triangulation_2.txt +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2.txt @@ -111,7 +111,7 @@ This algorithm terminates, and outputs a Delaunay triangulation of \f$ S \f$ \cg The package contains three main classes: -- `CGAL::Hyperbolic_surface_triangulation_2` represents a triangulation of a hyperbolic surface. It offers functionalities such as the generation of the triangulation from a convex fundamental domain, the Delaunay flip algorithm and the construction of a portion of the lift of the triangulation in the Poincaré disk. +- `CGAL::Triangulation_on_hyperbolic_surface_2` represents a triangulation of a hyperbolic surface. It offers functionalities such as the generation of the triangulation from a convex fundamental domain, the Delaunay flip algorithm and the construction of a portion of the lift of the triangulation in the Poincaré disk. - `CGAL::Hyperbolic_fundamental_domain_2` represents a convex fundamental domain of a hyperbolic surface. @@ -125,12 +125,12 @@ Also, the concept `ComplexNumber` describes a complex number type modeled by `CG \section Visualization_Triangulation_lift Visualization of a triangulation lifted in the hyperbolic plane -The function `CGAL::Hyperbolic_surface_triangulation_2::lift()` enables to visualize a triangulation by computing a lift of every triangle in the hyperbolic plane, it is illustrated in the demo. +The function `CGAL::Triangulation_on_hyperbolic_surface_2::lift()` enables to visualize a triangulation by computing a lift of every triangle in the hyperbolic plane, it is illustrated in the demo. \section Section_Hyperbolic_Surface_Triangulations_Example Example The example below generates a convex fundamental domain of a surface of genus 2, triangulates the domain, applies the Delaunay flip algorithm to the resulting triangulation, saves and prints the Delaunay triangulation. -\cgalExample{Hyperbolic_surface_triangulation_2/hyperbolic_surface_triangulation.cpp} +\cgalExample{Triangulation_on_hyperbolic_surface_2/hyperbolic_surface_triangulation.cpp} \section Section_Hyperbolic_Surface_Implementation_History Design and Implementation History diff --git a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/dependencies b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/dependencies similarity index 57% rename from Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/dependencies rename to Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/dependencies index a6b5fbecc9f..dbe174d8cc2 100644 --- a/Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/dependencies +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/dependencies @@ -3,4 +3,5 @@ Stream_support Number_types Combinatorial_map Hyperbolic_triangulation_2 -Algebraic_foundations \ No newline at end of file +Algebraic_foundations +Periodic_4_hyperbolic_triangulation_2 diff --git a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/examples.txt b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/examples.txt new file mode 100644 index 00000000000..48841947a20 --- /dev/null +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/examples.txt @@ -0,0 +1,3 @@ +/*! +\example Triangulation_on_hyperbolic_surface_2/hyperbolic_surface_triangulation.cpp +*/ diff --git a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/cover.svg b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/cover.svg new file mode 100644 index 00000000000..7ae13820ecd --- /dev/null +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/cover.svg @@ -0,0 +1,260 @@ + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/crossratio.svg b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/crossratio.svg new file mode 100644 index 00000000000..4962a10b947 --- /dev/null +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/crossratio.svg @@ -0,0 +1,41 @@ + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/demo-output.png b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/demo-output.png new file mode 100644 index 00000000000..48b7bca18eb Binary files /dev/null and b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/demo-output.png differ diff --git a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/header.svg b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/header.svg new file mode 100644 index 00000000000..bd7d98ab9ec --- /dev/null +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/header.svg @@ -0,0 +1,4137 @@ + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/octagon.svg b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/octagon.svg new file mode 100644 index 00000000000..1bfdfa54980 --- /dev/null +++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/fig/octagon.svg @@ -0,0 +1,83 @@ + + + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/CMakeLists.txt b/Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt similarity index 84% rename from Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/CMakeLists.txt rename to Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt index e71019842e2..e27b2b41a66 100644 --- a/Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/CMakeLists.txt +++ b/Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1...3.23) -project( Hyperbolic_surface_triangulation_2_Examples ) +project( Triangulation_on_hyperbolic_surface_2_Examples ) # CGAL and its components find_package( CGAL REQUIRED ) diff --git a/Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/Triangulation_on_hyperbolic_surface_2.cpp b/Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2.cpp similarity index 91% rename from Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/Triangulation_on_hyperbolic_surface_2.cpp rename to Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2.cpp index b235d026ed9..03cc0f020a0 100644 --- a/Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/Triangulation_on_hyperbolic_surface_2.cpp +++ b/Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/Triangulation_on_hyperbolic_surface_2.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include typedef CGAL::Exact_rational Rational; @@ -12,7 +12,7 @@ typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTrait typedef CGAL::Hyperbolic_surface_traits_2 Traits; typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; typedef CGAL::Hyperbolic_fundamental_domain_factory_2 Factory; -typedef CGAL::Hyperbolic_surface_triangulation_2 Triangulation; +typedef CGAL::Triangulation_on_hyperbolic_surface_2 Triangulation; int main(){ // Generates the domain: diff --git a/Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/hyperbolic_surface_triangulation.cpp b/Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/hyperbolic_surface_triangulation.cpp similarity index 91% rename from Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/hyperbolic_surface_triangulation.cpp rename to Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/hyperbolic_surface_triangulation.cpp index c4093696613..ef047040944 100644 --- a/Hyperbolic_surface_triangulation_2/examples/Hyperbolic_surface_triangulation_2/hyperbolic_surface_triangulation.cpp +++ b/Triangulation_on_hyperbolic_surface_2/examples/Triangulation_on_hyperbolic_surface_2/hyperbolic_surface_triangulation.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include typedef CGAL::Exact_rational Rational; @@ -12,7 +12,7 @@ typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTrait typedef CGAL::Hyperbolic_surface_traits_2 Traits; typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; typedef CGAL::Hyperbolic_fundamental_domain_factory_2 Factory; -typedef CGAL::Hyperbolic_surface_triangulation_2 Triangulation; +typedef CGAL::Triangulation_on_hyperbolic_surface_2 Triangulation; int main(){ // Generates the domain: diff --git a/Hyperbolic_surface_triangulation_2/include/CGAL/Complex_number.h b/Triangulation_on_hyperbolic_surface_2/include/CGAL/Complex_number.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/include/CGAL/Complex_number.h rename to Triangulation_on_hyperbolic_surface_2/include/CGAL/Complex_number.h diff --git a/Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_fundamental_domain_2.h b/Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_fundamental_domain_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_fundamental_domain_2.h rename to Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_fundamental_domain_2.h diff --git a/Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_fundamental_domain_factory_2.h b/Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_fundamental_domain_factory_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_fundamental_domain_factory_2.h rename to Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_fundamental_domain_factory_2.h diff --git a/Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_isometry_2.h b/Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_isometry_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_isometry_2.h rename to Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_isometry_2.h diff --git a/Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_surface_traits_2.h b/Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_surface_traits_2.h similarity index 100% rename from Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_surface_traits_2.h rename to Triangulation_on_hyperbolic_surface_2/include/CGAL/Hyperbolic_surface_traits_2.h diff --git a/Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_surface_triangulation_2.h b/Triangulation_on_hyperbolic_surface_2/include/CGAL/Triangulation_on_hyperbolic_surface_2.h similarity index 81% rename from Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_surface_triangulation_2.h rename to Triangulation_on_hyperbolic_surface_2/include/CGAL/Triangulation_on_hyperbolic_surface_2.h index f0350326782..30d0142228f 100644 --- a/Hyperbolic_surface_triangulation_2/include/CGAL/Hyperbolic_surface_triangulation_2.h +++ b/Triangulation_on_hyperbolic_surface_2/include/CGAL/Triangulation_on_hyperbolic_surface_2.h @@ -10,10 +10,10 @@ // // Author(s) : Vincent Despré, Loïc Dubois, Marc Pouget, Monique Teillaud -// This file contains the declaration and the implementation of the class Hyperbolic_surface_triangulation_2 +// This file contains the declaration and the implementation of the class Triangulation_on_hyperbolic_surface_2 -#ifndef CGAL_HYPERBOLIC_SURFACE_TRIANGULATION_2 -#define CGAL_HYPERBOLIC_SURFACE_TRIANGULATION_2 +#ifndef CGAL_TRIANGULATION_ON_HYPERBOLIC_SURFACE_2_H +#define CGAL_TRIANGULATION_ON_HYPERBOLIC_SURFACE_2_H #include #include @@ -43,7 +43,8 @@ struct Combinatorial_map_with_cross_ratios_item{ }; template> -class Hyperbolic_surface_triangulation_2{ +class Triangulation_on_hyperbolic_surface_2 +{ public: typedef Combinatorial_map<2,Attributes> Combinatorial_map_with_cross_ratios; @@ -72,13 +73,13 @@ public: typedef Hyperbolic_isometry_2 Isometry; typedef Hyperbolic_fundamental_domain_2 Domain; - Hyperbolic_surface_triangulation_2() {}; - Hyperbolic_surface_triangulation_2(const Hyperbolic_fundamental_domain_2& domain); -// Hyperbolic_surface_triangulation_2(Combinatorial_map_with_cross_ratios& cmap); - Hyperbolic_surface_triangulation_2(Combinatorial_map_with_cross_ratios& cmap, Anchor& anchor); + Triangulation_on_hyperbolic_surface_2() {}; + Triangulation_on_hyperbolic_surface_2(const Hyperbolic_fundamental_domain_2& domain); +// Triangulation_on_hyperbolic_surface_2(Combinatorial_map_with_cross_ratios& cmap); + Triangulation_on_hyperbolic_surface_2(Combinatorial_map_with_cross_ratios& cmap, Anchor& anchor); - //Hyperbolic_surface_triangulation_2& operator=(Hyperbolic_surface_triangulation_2&& other); - Hyperbolic_surface_triangulation_2& operator=(Hyperbolic_surface_triangulation_2 other); + //Triangulation_on_hyperbolic_surface_2& operator=(Triangulation_on_hyperbolic_surface_2&& other); + Triangulation_on_hyperbolic_surface_2& operator=(Triangulation_on_hyperbolic_surface_2 other); Combinatorial_map_with_cross_ratios& combinatorial_map(); bool has_anchor() const; @@ -144,15 +145,15 @@ protected: void copy_from(Combinatorial_map_with_cross_ratios& cmap, const Anchor& anchor); }; - template std::ostream& operator<<(std::ostream& s, const Hyperbolic_surface_triangulation_2& triangulation); - template void operator>>(std::istream& s, Hyperbolic_surface_triangulation_2& triangulation); + template std::ostream& operator<<(std::ostream& s, const Triangulation_on_hyperbolic_surface_2& triangulation); + template void operator>>(std::istream& s, Triangulation_on_hyperbolic_surface_2& triangulation); //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// template -Hyperbolic_surface_triangulation_2::Hyperbolic_surface_triangulation_2(const Domain& domain){ +Triangulation_on_hyperbolic_surface_2::Triangulation_on_hyperbolic_surface_2(const Domain& domain){ // (Triangulates by adding an internal edge between domain.vertex(size-1) and the other vertices) _combinatorial_map.clear(); int size = domain.size(); @@ -226,19 +227,19 @@ Hyperbolic_surface_triangulation_2::Hyperbolic_surface_triang } /* template */ -/* Hyperbolic_surface_triangulation_2::Hyperbolic_surface_triangulation_2(Combinatorial_map_with_cross_ratios& cmap){ */ +/* Triangulation_on_hyperbolic_surface_2::Triangulation_on_hyperbolic_surface_2(Combinatorial_map_with_cross_ratios& cmap){ */ /* copy_from(cmap); */ /* } */ template - Hyperbolic_surface_triangulation_2::Hyperbolic_surface_triangulation_2(Combinatorial_map_with_cross_ratios& cmap, Anchor& anchor){ + Triangulation_on_hyperbolic_surface_2::Triangulation_on_hyperbolic_surface_2(Combinatorial_map_with_cross_ratios& cmap, Anchor& anchor){ copy_from(cmap, anchor); } //////////////////////////////////////////////////////////////////////////////// template - Hyperbolic_surface_triangulation_2& Hyperbolic_surface_triangulation_2::operator=(Hyperbolic_surface_triangulation_2 other){ + Triangulation_on_hyperbolic_surface_2& Triangulation_on_hyperbolic_surface_2::operator=(Triangulation_on_hyperbolic_surface_2 other){ CGAL_precondition(other->is_valid()); if (other.has_anchor()){ copy_from(other.combinatorial_map(), other.anchor()); @@ -252,26 +253,26 @@ template //////////////////////////////////////////////////////////////////////////////// template -typename Hyperbolic_surface_triangulation_2::Combinatorial_map_with_cross_ratios& Hyperbolic_surface_triangulation_2::combinatorial_map(){ +typename Triangulation_on_hyperbolic_surface_2::Combinatorial_map_with_cross_ratios& Triangulation_on_hyperbolic_surface_2::combinatorial_map(){ return _combinatorial_map; } template -bool Hyperbolic_surface_triangulation_2::has_anchor() const { +bool Triangulation_on_hyperbolic_surface_2::has_anchor() const { CGAL_precondition(is_valid()); return _has_anchor; } template -typename Hyperbolic_surface_triangulation_2::Anchor& -Hyperbolic_surface_triangulation_2::anchor() { +typename Triangulation_on_hyperbolic_surface_2::Anchor& +Triangulation_on_hyperbolic_surface_2::anchor() { CGAL_precondition(is_valid() && has_anchor()); return _anchor; } template -const typename Hyperbolic_surface_triangulation_2::Anchor& -Hyperbolic_surface_triangulation_2::anchor() const { +const typename Triangulation_on_hyperbolic_surface_2::Anchor& +Triangulation_on_hyperbolic_surface_2::anchor() const { CGAL_precondition(is_valid() && has_anchor()); return _anchor; } @@ -279,13 +280,13 @@ Hyperbolic_surface_triangulation_2::anchor() const { //////////////////////////////////////////////////////////////////////////////// template -bool Hyperbolic_surface_triangulation_2::is_Delaunay_flippable(Dart_const_descriptor dart) const{ +bool Triangulation_on_hyperbolic_surface_2::is_Delaunay_flippable(Dart_const_descriptor dart) const{ CGAL_precondition(is_valid()); return ( get_cross_ratio(dart).imag()>Number(0) ); } template -void Hyperbolic_surface_triangulation_2::flip(Dart_descriptor dart){ +void Triangulation_on_hyperbolic_surface_2::flip(Dart_descriptor dart){ CGAL_precondition(is_valid()); // First gather all the information needed @@ -369,7 +370,7 @@ void Hyperbolic_surface_triangulation_2::flip(Dart_descripto } template -bool Hyperbolic_surface_triangulation_2::is_Delaunay() const{ +bool Triangulation_on_hyperbolic_surface_2::is_Delaunay() const{ if (! is_valid()){ return false; } @@ -377,7 +378,7 @@ bool Hyperbolic_surface_triangulation_2::is_Delaunay() const } template -int Hyperbolic_surface_triangulation_2::make_Delaunay(){ +int Triangulation_on_hyperbolic_surface_2::make_Delaunay(){ CGAL_precondition(is_valid()); int number_of_flips_done = 0; @@ -393,7 +394,7 @@ int Hyperbolic_surface_triangulation_2::make_Delaunay(){ template -std::vector::Dart_const_descriptor, typename Hyperbolic_surface_triangulation_2::Point, typename Hyperbolic_surface_triangulation_2::Point, typename Hyperbolic_surface_triangulation_2::Point>> Hyperbolic_surface_triangulation_2::lift(bool center) const{ +std::vector::Dart_const_descriptor, typename Triangulation_on_hyperbolic_surface_2::Point, typename Triangulation_on_hyperbolic_surface_2::Point, typename Triangulation_on_hyperbolic_surface_2::Point>> Triangulation_on_hyperbolic_surface_2::lift(bool center) const{ CGAL_precondition(is_valid() && has_anchor()); std::vector> realizations; @@ -490,7 +491,7 @@ std::vector -bool Hyperbolic_surface_triangulation_2::is_valid() const{ +bool Triangulation_on_hyperbolic_surface_2::is_valid() const{ // 1. Check the combinatorial map // Check that the combinatorial map is valid @@ -528,7 +529,7 @@ bool Hyperbolic_surface_triangulation_2::is_valid() const{ //////////////////////////////////////////////////////////////////////////////// template -void Hyperbolic_surface_triangulation_2::to_stream(std::ostream& s) const{ +void Triangulation_on_hyperbolic_surface_2::to_stream(std::ostream& s) const{ CGAL_precondition(is_valid() && has_anchor()); // Give indices to the darts std::map darts_indices; @@ -568,7 +569,7 @@ void Hyperbolic_surface_triangulation_2::to_stream(std::ostr } template -void Hyperbolic_surface_triangulation_2::from_stream(std::istream& s){ +void Triangulation_on_hyperbolic_surface_2::from_stream(std::istream& s){ _combinatorial_map.clear(); // Load the number of darts @@ -634,58 +635,58 @@ void Hyperbolic_surface_triangulation_2::from_stream(std::is //////////////////////////////////////////////////////////////////////////////// template -std::ostream& operator<<(std::ostream& s, const Hyperbolic_surface_triangulation_2& triangulation){ +std::ostream& operator<<(std::ostream& s, const Triangulation_on_hyperbolic_surface_2& triangulation){ triangulation.to_stream(s); return s; } template -void operator>>(std::istream& s, Hyperbolic_surface_triangulation_2& triangulation){ +void operator>>(std::istream& s, Triangulation_on_hyperbolic_surface_2& triangulation){ triangulation.from_stream(s); } //////////////////////////////////////////////////////////////////////////////// template -typename Hyperbolic_surface_triangulation_2::Dart_descriptor Hyperbolic_surface_triangulation_2::ccw(Dart_descriptor dart){ +typename Triangulation_on_hyperbolic_surface_2::Dart_descriptor Triangulation_on_hyperbolic_surface_2::ccw(Dart_descriptor dart){ return _combinatorial_map.beta(dart, 1); } template -typename Hyperbolic_surface_triangulation_2::Dart_descriptor Hyperbolic_surface_triangulation_2::cw(Dart_descriptor dart){ +typename Triangulation_on_hyperbolic_surface_2::Dart_descriptor Triangulation_on_hyperbolic_surface_2::cw(Dart_descriptor dart){ return _combinatorial_map.beta(dart, 0); } template -typename Hyperbolic_surface_triangulation_2::Dart_descriptor Hyperbolic_surface_triangulation_2::opposite(Dart_descriptor dart){ +typename Triangulation_on_hyperbolic_surface_2::Dart_descriptor Triangulation_on_hyperbolic_surface_2::opposite(Dart_descriptor dart){ return _combinatorial_map.opposite(dart); } template -typename Hyperbolic_surface_triangulation_2::Dart_const_descriptor Hyperbolic_surface_triangulation_2::const_ccw(Dart_const_descriptor dart) const{ +typename Triangulation_on_hyperbolic_surface_2::Dart_const_descriptor Triangulation_on_hyperbolic_surface_2::const_ccw(Dart_const_descriptor dart) const{ return _combinatorial_map.beta(dart, 1); } template -typename Hyperbolic_surface_triangulation_2::Dart_const_descriptor Hyperbolic_surface_triangulation_2::const_cw(Dart_const_descriptor dart) const{ +typename Triangulation_on_hyperbolic_surface_2::Dart_const_descriptor Triangulation_on_hyperbolic_surface_2::const_cw(Dart_const_descriptor dart) const{ return _combinatorial_map.beta(dart, 0); } template -typename Hyperbolic_surface_triangulation_2::Dart_const_descriptor Hyperbolic_surface_triangulation_2::const_opposite(Dart_const_descriptor dart) const{ +typename Triangulation_on_hyperbolic_surface_2::Dart_const_descriptor Triangulation_on_hyperbolic_surface_2::const_opposite(Dart_const_descriptor dart) const{ return _combinatorial_map.opposite(dart); } //////////////////////////////////////////////////////////////////////////////// template -typename Hyperbolic_surface_triangulation_2::Complex_number Hyperbolic_surface_triangulation_2::get_cross_ratio(Dart_const_descriptor dart) const{ +typename Triangulation_on_hyperbolic_surface_2::Complex_number Triangulation_on_hyperbolic_surface_2::get_cross_ratio(Dart_const_descriptor dart) const{ return _combinatorial_map.template info_of_attribute<1>(_combinatorial_map.template attribute<1>(dart)); } //////////////////////////////////////////////////////////////////////////////// template - typename Hyperbolic_surface_triangulation_2::Dart_descriptor Hyperbolic_surface_triangulation_2::pick_edge_to_flip(){ + typename Triangulation_on_hyperbolic_surface_2::Dart_descriptor Triangulation_on_hyperbolic_surface_2::pick_edge_to_flip(){ auto &cm=_combinatorial_map.darts(); for (auto it = cm.begin(); it != cm.end(); ++it){ if ( is_Delaunay_flippable(it) ){ @@ -698,7 +699,7 @@ template //////////////////////////////////////////////////////////////////////////////// template - typename Hyperbolic_surface_triangulation_2::Dart_const_descriptor Hyperbolic_surface_triangulation_2::pick_edge_to_flip() const{ + typename Triangulation_on_hyperbolic_surface_2::Dart_const_descriptor Triangulation_on_hyperbolic_surface_2::pick_edge_to_flip() const{ const auto &cm=_combinatorial_map.darts(); for (auto it = cm.begin(); it != cm.end(); ++it){ if ( is_Delaunay_flippable(it) ){ @@ -711,14 +712,14 @@ template //////////////////////////////////////////////////////////////////////////////// template -void Hyperbolic_surface_triangulation_2::copy_from(Combinatorial_map_with_cross_ratios& cmap){ +void Triangulation_on_hyperbolic_surface_2::copy_from(Combinatorial_map_with_cross_ratios& cmap){ //_combinatorial_map.copy_from_const(cmap); _combinatorial_map.copy(cmap); _has_anchor = false; } template -void Hyperbolic_surface_triangulation_2::copy_from(Combinatorial_map_with_cross_ratios& cmap, const Anchor& anchor){ +void Triangulation_on_hyperbolic_surface_2::copy_from(Combinatorial_map_with_cross_ratios& cmap, const Anchor& anchor){ // Because of the anchor, we must operate the copy ourself _combinatorial_map.clear(); @@ -754,7 +755,7 @@ void Hyperbolic_surface_triangulation_2::copy_from(Combinato //////////////////////////////////////////////////////////////////////////////// template -typename Traits::Complex Hyperbolic_surface_triangulation_2::cross_ratio(const Point& a, const Point& b, const Point& c, const Point& d) const{ +typename Traits::Complex Triangulation_on_hyperbolic_surface_2::cross_ratio(const Point& a, const Point& b, const Point& c, const Point& d) const{ Complex_number za (a.x(), a.y()); Complex_number zb (b.x(), b.y()); Complex_number zc (c.x(), c.y()); @@ -763,7 +764,7 @@ typename Traits::Complex Hyperbolic_surface_triangulation_2: } template -typename Hyperbolic_surface_triangulation_2::Point Hyperbolic_surface_triangulation_2::fourth_point_from_cross_ratio(const Point& a, const Point& b, const Point& c, const Complex_number& cratio) const{ +typename Triangulation_on_hyperbolic_surface_2::Point Triangulation_on_hyperbolic_surface_2::fourth_point_from_cross_ratio(const Point& a, const Point& b, const Point& c, const Complex_number& cratio) const{ Complex_number za (a.x(), a.y()); Complex_number zb (b.x(), b.y()); Complex_number zc (c.x(), c.y()); @@ -773,4 +774,4 @@ typename Hyperbolic_surface_triangulation_2::Point Hyperboli } // namespace CGAL -#endif // CGAL_HYPERBOLIC_SURFACE_TRIANGULATION_2 +#endif // CGAL_TRIANGULATION_ON_HYPERBOLIC_SURFACE_2_H diff --git a/Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/copyright b/Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/copyright similarity index 100% rename from Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/copyright rename to Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/copyright diff --git a/Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/dependencies b/Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/dependencies similarity index 90% rename from Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/dependencies rename to Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/dependencies index 2a2367b5710..62d19a14d67 100644 --- a/Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/dependencies +++ b/Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/dependencies @@ -10,7 +10,6 @@ Distance_3 Filtered_kernel Hash_map Homogeneous_kernel -Hyperbolic_surface_triangulation_2 Installation Intersections_2 Intersections_3 @@ -24,3 +23,4 @@ Property_map Random_numbers STL_Extension Stream_support +Triangulation_on_hyperbolic_surface_2 diff --git a/Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/description.txt b/Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/description.txt similarity index 80% rename from Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/description.txt rename to Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/description.txt index a4ee45a0d2a..11623cbdb12 100644 --- a/Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/description.txt +++ b/Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/description.txt @@ -1,4 +1,4 @@ -Package Hyperbolic_surface_triangulation_2 : provides +Package Triangulation_on_hyperbolic_surface_2 : provides triangulations of closed oriented hyperbolic surfaces, Delaunay flip algorithm on those triangulations, construction of the triangulations from convex geodesic fundamental domains, diff --git a/Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/license.txt b/Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/license.txt similarity index 100% rename from Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/license.txt rename to Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/license.txt diff --git a/Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/maintainer b/Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/maintainer similarity index 100% rename from Hyperbolic_surface_triangulation_2/package_info/Hyperbolic_surface_triangulation_2/maintainer rename to Triangulation_on_hyperbolic_surface_2/package_info/Triangulation_on_hyperbolic_surface_2/maintainer diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/CMakeLists.txt b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt similarity index 89% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/CMakeLists.txt rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt index 29cb6e21740..569a98f8e94 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/CMakeLists.txt +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/CMakeLists.txt @@ -2,7 +2,7 @@ # This is the CMake script for compiling a CGAL application. cmake_minimum_required(VERSION 3.1...3.23) -project(Hyperbolic_surface_triangulation_2_Tests) +project(Triangulation_on_hyperbolic_surface_2_Tests) find_package(CGAL REQUIRED) diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_circular_kernel.cpp b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_circular_kernel.cpp similarity index 86% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_circular_kernel.cpp rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_circular_kernel.cpp index c15e3a3e377..fa3de900aa2 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_circular_kernel.cpp +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_circular_kernel.cpp @@ -1,24 +1,25 @@ -#include -#include -#include - -#include -#include #include #include + #include #include #include +#include +#include +#include #include -typedef CGAL::Circular_kernel_2,CGAL::Algebraic_kernel_for_circles_2_2> Kernel; -typedef CGAL::Hyperbolic_Delaunay_triangulation_CK_traits_2 ParentTraits; -typedef CGAL::Hyperbolic_surface_traits_2 Traits; -typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; -typedef CGAL::Hyperbolic_fundamental_domain_factory_2 Factory; -typedef CGAL::Hyperbolic_surface_triangulation_2 Triangulation; +#include +#include -typedef typename Traits::Hyperbolic_point_2 Point; +typedef CGAL::Circular_kernel_2,CGAL::Algebraic_kernel_for_circles_2_2> Kernel; +typedef CGAL::Hyperbolic_Delaunay_triangulation_CK_traits_2 ParentTraits; +typedef CGAL::Hyperbolic_surface_traits_2 Traits; +typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; +typedef CGAL::Hyperbolic_fundamental_domain_factory_2 Factory; +typedef CGAL::Triangulation_on_hyperbolic_surface_2 Triangulation; + +typedef typename Traits::Hyperbolic_point_2 Point; int main() { Factory factory; diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_complex.cpp b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_complex.cpp similarity index 99% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_complex.cpp rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_complex.cpp index 6f2a980a119..e1d1f8c231a 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_complex.cpp +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_complex.cpp @@ -1,6 +1,7 @@ #include #include #include + #include #include diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_domain.cpp b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_domain.cpp similarity index 99% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_domain.cpp rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_domain.cpp index 3ccff29bb5b..43f7a9347d7 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_domain.cpp +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_domain.cpp @@ -1,11 +1,12 @@ -#include -#include - -#include #include #include + +#include +#include #include +#include + typedef CGAL::Cartesian Kernel; typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; typedef CGAL::Hyperbolic_surface_traits_2 Traits; diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_factory.cpp b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_factory.cpp similarity index 94% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_factory.cpp rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_factory.cpp index a8aebd1e875..5101c49926d 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_factory.cpp +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_factory.cpp @@ -1,16 +1,17 @@ -#include -#include - -#include #include #include + +#include +#include #include -typedef CGAL::Cartesian Kernel; -typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; -typedef CGAL::Hyperbolic_surface_traits_2 Traits; -typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; -typedef CGAL::Hyperbolic_fundamental_domain_factory_2 Factory; +#include + +typedef CGAL::Cartesian Kernel; +typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; +typedef CGAL::Hyperbolic_surface_traits_2 Traits; +typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; +typedef CGAL::Hyperbolic_fundamental_domain_factory_2 Factory; typedef typename Traits::FT FT; typedef typename Traits::Hyperbolic_point_2 Point; diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_isometry.cpp b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_isometry.cpp similarity index 97% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_isometry.cpp rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_isometry.cpp index e91fa3d9fa8..5afcd227910 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_isometry.cpp +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_isometry.cpp @@ -1,15 +1,16 @@ -#include -#include - -#include #include #include + +#include +#include #include -typedef CGAL::Cartesian Kernel; -typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; -typedef CGAL::Hyperbolic_surface_traits_2 Traits; -typedef CGAL::Hyperbolic_isometry_2 Isometry; +#include + +typedef CGAL::Cartesian Kernel; +typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; +typedef CGAL::Hyperbolic_surface_traits_2 Traits; +typedef CGAL::Hyperbolic_isometry_2 Isometry; typedef typename Traits::FT FT; typedef typename Traits::Hyperbolic_point_2 Point; diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_lazy_exact_nt.cpp b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_lazy_exact_nt.cpp similarity index 92% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_lazy_exact_nt.cpp rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_lazy_exact_nt.cpp index a78bd159ef8..df8af42b506 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_lazy_exact_nt.cpp +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_lazy_exact_nt.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include @@ -9,14 +9,14 @@ #include #include -typedef CGAL::Cartesian> Kernel; +typedef CGAL::Cartesian> Kernel; typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; -typedef CGAL::Hyperbolic_surface_traits_2 Traits; +typedef CGAL::Hyperbolic_surface_traits_2 Traits; typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; typedef CGAL::Hyperbolic_fundamental_domain_factory_2 Factory; -typedef CGAL::Hyperbolic_surface_triangulation_2 Triangulation; +typedef CGAL::Triangulation_on_hyperbolic_surface_2 Triangulation; -typedef typename Traits::Hyperbolic_point_2 Point; +typedef typename Traits::Hyperbolic_point_2 Point; int main() { Factory factory; diff --git a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_triangulation.cpp b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_triangulation.cpp similarity index 94% rename from Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_triangulation.cpp rename to Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_triangulation.cpp index 374342bab37..e3184e4c105 100644 --- a/Hyperbolic_surface_triangulation_2/test/Hyperbolic_surface_triangulation_2/hs_test_triangulation.cpp +++ b/Triangulation_on_hyperbolic_surface_2/test/Triangulation_on_hyperbolic_surface_2/hs_test_triangulation.cpp @@ -1,17 +1,18 @@ #include -#include +#include -#include -#include #include #include #include -typedef CGAL::Cartesian Kernel; -typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; -typedef CGAL::Hyperbolic_surface_traits_2 Traits; +#include +#include + +typedef CGAL::Cartesian Kernel; +typedef CGAL::Hyperbolic_Delaunay_triangulation_traits_2 ParentTraits; +typedef CGAL::Hyperbolic_surface_traits_2 Traits; typedef CGAL::Hyperbolic_fundamental_domain_2 Domain; -typedef CGAL::Hyperbolic_surface_triangulation_2 Triangulation; +typedef CGAL::Triangulation_on_hyperbolic_surface_2 Triangulation; typedef typename Traits::FT FT; typedef typename Traits::Hyperbolic_point_2 Point;