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

fix ErrorMetricProxy concept

This commit is contained in:
Lingjie Zhu 2018-04-01 17:48:36 +08:00
parent 6d3abb2405
commit da78cb080c
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetric.h → Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h
View File

@ -2,15 +2,15 @@
\ingroup PkgTSMAConcepts
\cgalConcept
The concept `FittingProxyErrorMetric` defines the notion of
proxy and computes the fitting error from a face to a `Proxy`,
used in CGAL::VSA_approximation.
The concept `ErrorMetricProxy` defines the notion of proxy,
computes the fitting error from a face to a proxy,
and fits a proxy from a range of faces.
\cgalHasModel `CGAL::L2_metric_plane_proxy`
\cgalHasModel `CGAL::L21_metric_plane_proxy`
\cgalHasModel `CGAL::VSA::L21_metric_vector_proxy`
\cgalHasModel `CGAL::VSA::L2_metric_plane_proxy`
*/
class FittingProxyErrorMetric {
class ErrorMetricProxy {
public:
/// Number type model of `Field` and `RealEmbeddable`
typedef unspecified_type FT;

4
Surface_mesh_approximation/include/CGAL/L2_metric_plane_proxy.h
View File

@ -16,9 +16,9 @@ namespace CGAL {
namespace VSA {
/// \ingroup PkgTSMA
/// @brief Approximation L2 metric.
/// @brief Approximation L2 metric of plane proxy.
///
/// \cgalModels `ErrorMetric`
/// \cgalModels `ErrorMetricProxy`
///
/// @tparam TriangleMesh a triangle `FaceListGraph`
/// @tparam VertexPointMap a property map with `boost::graph_traits<TriangleMesh>::%vertex_descriptor`

12
Surface_mesh_approximation/include/CGAL/VSA_approximation.h
View File

@ -61,12 +61,12 @@ enum Approximation_seeding_tag {
/// @brief Main class for Variational Shape Approximation algorithm.
/// @tparam TriangleMesh CGAL TriangleMesh
/// @tparam VertexPointMap vertex point map
/// @tparam ErrorMetric approximation metric type
/// @tparam ErrorMetricProxy approximation metric type
/// @tparam GeomTraits geometric traits type
/// @tparam Concurrency_tag concurrency tag
template <typename TriangleMesh,
typename VertexPointMap,
typename ErrorMetric = CGAL::Default,
typename ErrorMetricProxy = CGAL::Default,
typename GeomTraits = CGAL::Default,
typename Concurrency_tag = CGAL::Sequential_tag>
class VSA_approximation {
@ -85,12 +85,12 @@ public:
#else
typedef GeomTraits Geom_traits;
#endif
// ErrorMetric type
// ErrorMetricProxy type
#ifndef DOXYGEN_RUNNING
typedef typename CGAL::Default::Get<ErrorMetric,
typedef typename CGAL::Default::Get<ErrorMetricProxy,
CGAL::VSA::L21_metric_vector_proxy<TriangleMesh, VertexPointMap, Geom_traits> >::type Error_metric;
#else
typedef ErrorMetric Error_metric;
typedef ErrorMetricProxy Error_metric;
#endif
// Proxy type
typedef typename Error_metric::Proxy Proxy;
@ -342,7 +342,7 @@ public:
/*!
* @brief Sets the approximation traits.
* @param error_metric an `ErrorMetric` object.
* @param error_metric an `ErrorMetricProxy` object.
*/
void set_metric(const Error_metric &error_metric) {
m_metric = &error_metric;