songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Weights-new_package-danston' into Weights-unification-danston

This commit is contained in:
Dmitry Anisimov 2021-06-25 14:35:44 +02:00
parent 8c67ed9a1f 9ccbea002d
commit fe18ebecc1
4 changed files with 1 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Weights/doc/Weights/PackageDescription.txt
View File

@ -434,39 +434,6 @@ a model of `AnalyticWeightTraits_3` for 3D points
\addtogroup PkgWeightsRefRegions
\defgroup PkgWeightsRefUtils Utility Functions
\ingroup PkgWeightsRef
Various related utility functions.
\defgroup PkgWeightsRefTangents Tangent
\ingroup PkgWeightsRefUtils
Given three points `p`, `q`, and `r`, these functions compute the tangent of
the angle `[p, q, r]` in 2D or 3D.
\tparam GeomTraits
a model of `AnalyticWeightTraits_2` for 2D points;
a model of `AnalyticWeightTraits_3` for 3D points
\addtogroup PkgWeightsRefUtils
\defgroup PkgWeightsRefCotangents Cotangent
\ingroup PkgWeightsRefUtils
Given three points `p`, `q`, and `r`, these functions compute the cotangent of
the angle `[p, q, r]` in 2D or 3D.
\tparam GeomTraits
a model of `AnalyticWeightTraits_2` for 2D points;
a model of `AnalyticWeightTraits_3` for 3D points
\addtogroup PkgWeightsRefUtils
\addtogroup PkgWeightsRef

1
Weights/examples/Weights/projection_traits.cpp
View File

@ -1,5 +1,4 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Weights/utils.h>
#include <CGAL/Weights/wachspress_weights.h>
#include <CGAL/Weights/mean_value_weights.h>
#include <CGAL/Projection_traits_xy_3.h>

4
Weights/examples/Weights/weighted_laplacian.cpp
View File

@ -1,10 +1,8 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Weights/utils.h>
#include <CGAL/Weights/cotangent_weights.h>
#include <CGAL/Weights/mixed_voronoi_region_weights.h>
#include <CGAL/Eigen_solver_traits.h>
#include <CGAL/Eigen_matrix.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/Weights.h>
// Typedefs.
using Kernel = CGAL::Simple_cartesian<double>;

108
Weights/include/CGAL/Weights/utils.h
View File

@ -23,114 +23,6 @@
namespace CGAL {
namespace Weights {
#if defined(DOXYGEN_RUNNING)
/*!
\ingroup PkgWeightsRefTangents
\brief computes the tangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 2D points `p`, `q` and `r`, given a traits class `traits` with geometric objects,
predicates, and constructions.
*/
template<typename GeomTraits>
typename GeomTraits::FT tangent(
const typename GeomTraits::Point_2& p,
const typename GeomTraits::Point_2& q,
const typename GeomTraits::Point_2& r,
const GeomTraits& traits) { }
/*!
\ingroup PkgWeightsRefTangents
\brief computes the tangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 3D points `p`, `q` and `r`, given a traits class `traits` with geometric objects,
predicates, and constructions.
*/
template<typename GeomTraits>
typename GeomTraits::FT tangent(
const typename GeomTraits::Point_3& p,
const typename GeomTraits::Point_3& q,
const typename GeomTraits::Point_3& r,
const GeomTraits& traits) { }
/*!
\ingroup PkgWeightsRefTangents
\brief computes the tangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 2D points `p`, `q` and `r` which are parameterized by a `Kernel` K.
*/
template<typename K>
typename K::FT tangent(
const CGAL::Point_2<K>& p,
const CGAL::Point_2<K>& q,
const CGAL::Point_2<K>& r) { }
/*!
\ingroup PkgWeightsRefTangents
\brief computes the tangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 3D points `p`, `q` and `r` which are parameterized by a `Kernel` K.
*/
template<typename K>
typename K::FT tangent(
const CGAL::Point_3<K>& p,
const CGAL::Point_3<K>& q,
const CGAL::Point_3<K>& r) { }
/*!
\ingroup PkgWeightsRefCotangents
\brief computes the cotangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 2D points `p`, `q` and `r`, given a traits class `traits` with geometric objects,
predicates, and constructions.
*/
template<typename GeomTraits>
typename GeomTraits::FT cotangent(
const typename GeomTraits::Point_2& p,
const typename GeomTraits::Point_2& q,
const typename GeomTraits::Point_2& r,
const GeomTraits& traits) { }
/*!
\ingroup PkgWeightsRefCotangents
\brief computes the cotangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 3D points `p`, `q` and `r`, given a traits class `traits` with geometric objects,
predicates, and constructions.
*/
template<typename GeomTraits>
typename GeomTraits::FT cotangent(
const typename GeomTraits::Point_3& p,
const typename GeomTraits::Point_3& q,
const typename GeomTraits::Point_3& r,
const GeomTraits& traits) { }
/*!
\ingroup PkgWeightsRefCotangents
\brief computes the cotangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 2D points `p`, `q` and `r` which are parameterized by a `Kernel` K.
*/
template<typename K>
typename K::FT cotangent(
const CGAL::Point_2<K>& p,
const CGAL::Point_2<K>& q,
const CGAL::Point_2<K>& r) { }
/*!
\ingroup PkgWeightsRefCotangents
\brief computes the cotangent of the angle between the vectors `[q, r]` and `[q, p]`
using the 3D points `p`, `q` and `r` which are parameterized by a `Kernel` K.
*/
template<typename K>
typename K::FT cotangent(
const CGAL::Point_3<K>& p,
const CGAL::Point_3<K>& q,
const CGAL::Point_3<K>& r) { }
#endif // DOXYGEN_RUNNING
/// \cond SKIP_IN_MANUAL
template<typename GeomTraits>
typename GeomTraits::FT tangent(