Hyperbolic surface triangulation 2 (new package)

Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/CGAL/Hyperbolic_surface_traits_2.h

@@ -9,6 +9,16 @@ namespace CGAL{
 */
 template<class HyperbolicTraitsClass>
 class Hyperbolic_surface_traits_2 : public HyperbolicTraitsClass {
+public:
+  /// \name Types
+  /// @{
+  /*!
+          represents a complex number, model of
+          `ComplexNumber', over the field HyperbolicSurfaceTraits_2::FT for its real and
+          imaginary parts.
+  */
+  typedef unspecified_type                                   Complex;
+  /// @}
 };
 
 }; // namespace CGAL

Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Concepts/ComplexNumber.h

@@ -74,87 +74,87 @@ class ComplexNumber {
   /*!
     returns +z.
   */
-  ComplexNumber<FT> operator+(const ComplexNumber<FT>& z) const;
+  ComplexNumber operator+(const ComplexNumber& z) const;
 
   /*!
      returns -z.
   */
-  ComplexNumber<FT> operator-(const ComplexNumber<FT>& z) const;
+  ComplexNumber operator-(const ComplexNumber& z) const;
 
   /*!
     Unary complex addition.
   */
-  ComplexNumber<FT> operator+=(const ComplexNumber<FT>& other) const;
+  ComplexNumber operator+=(const ComplexNumber& other) const;
 
   /*!
     Unary complex substraction.
   */
-  ComplexNumber<FT> operator-=(const ComplexNumber<FT>& other) const;
+  ComplexNumber operator-=(const ComplexNumber& other) const;
 
   /*!
     Unary complex multiplication.
   */
-  ComplexNumber<FT> operator*=(const ComplexNumber<FT>& other) const;
+  ComplexNumber operator*=(const ComplexNumber& other) const;
 
   /*!
     Unary complex division.
   */
-  ComplexNumber<FT> operator/=(const ComplexNumber<FT>& other) const;
+  ComplexNumber operator/=(const ComplexNumber& other) const;
 
   /*!
     Copy operator.
   */
-  ComplexNumber<FT> operator=(const ComplexNumber<FT>& other) const;
+  ComplexNumber operator=(const ComplexNumber& other) const;
 
   /*!
     Equality test.
   */
-  bool operator==(const ComplexNumber<FT>& z1, const ComplexNumber<FT>& z2);
+  bool operator==(const ComplexNumber& z1, const ComplexNumber& z2);
   /*!
     Inequality test.
   */
-  bool operator!=(const ComplexNumber<FT>& z1, const ComplexNumber<FT>& z2);
+  bool operator!=(const ComplexNumber& z1, const ComplexNumber& z2);
 
   /*!
     Binary complex addition.
   */
-  ComplexNumber<FT> operator+(const ComplexNumber<FT>& z1, const ComplexNumber<FT>& z2);
+  ComplexNumber operator+(const ComplexNumber& z1, const ComplexNumber& z2);
 
   /*!
     Binary complex substraction.
   */
-  ComplexNumber<FT> operator-(const ComplexNumber<FT>& z1, const ComplexNumber<FT>& z2);
+  ComplexNumber operator-(const ComplexNumber& z1, const ComplexNumber& z2);
 
  /*!
     Binary complex multiplication.
   */
-  ComplexNumber<FT> operator*(const ComplexNumber<FT>& z1, const ComplexNumber<FT>& z2);
+  ComplexNumber operator*(const ComplexNumber& z1, const ComplexNumber& z2);
 
   /*!
     Binary complex division.
   */
-  ComplexNumber<FT> operator/(const ComplexNumber<FT>& z1, const ComplexNumber<FT>& z2);
+  ComplexNumber operator/(const ComplexNumber& z1, const ComplexNumber& z2);
 
   /*!
     writes the complex in a stream.
   */
-  std::ostream& operator<<(std::ostream& s, const ComplexNumber<FT>& z);
+  std::ostream& operator<<(std::ostream& s, const ComplexNumber& z);
   /*!
     reads the complex from a stream.
   */
-  void operator>>(std::istream& s, ComplexNumber<FT>& z);
+  void operator>>(std::istream& s, ComplexNumber& z);
   /// @}
 
   /// \relates ComplexNumber
   /// @{
   /*!
     returns the square of the modulus.
   */
-  FT norm(ComplexNumber<FT> z) const;
+  FT norm(ComplexNumber z) const;
 
   /*!
     returns the conjugate.
   */
-  ComplexNumber<FT> conj(ComplexNumber<FT> z) const;
+  ComplexNumber conj(ComplexNumber z) const;
   /// @}
 };

Hyperbolic_surface_triangulation_2/doc/Hyperbolic_surface_triangulation_2/Concepts/HyperbolicSurfaceTraits_2.h

@@ -2,19 +2,13 @@
 \ingroup PkgHyperbolicSurfaceTriangulation2Concepts
 \cgalConcept
 
+This traits class must have a type for complex numbers.
+
 \cgalRefines{HyperbolicDelaunayTriangulationTraits_2}
 
 \cgalHasModelsBegin
 \cgalHasModels{CGAL::Hyperbolic_surface_traits_2}
 \cgalHasModelsEnd
 */
 class HyperbolicSurfaceTraits_2 {
-public:
-  /// \name Types
-  /// @{
-  /*!
-          represents a complex number over a field: must be a model of `ComplexNumber`.
-  */
-  typedef unspecified_type                                   Complex;
-  /// @}
 };