From da78cb080cc5166990f2f9697e5d0e4f48c7846c Mon Sep 17 00:00:00 2001
From: Lingjie Zhu <lingjie.zhu@nlpr.ia.ac.cn>
Date: Sun, 1 Apr 2018 17:48:36 +0800
Subject: [PATCH] fix ErrorMetricProxy concept

---
 .../Concepts/{ErrorMetric.h => ErrorMetricProxy.h}   | 12 ++++++------
 .../include/CGAL/L2_metric_plane_proxy.h             |  4 ++--
 .../include/CGAL/VSA_approximation.h                 | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/{ErrorMetric.h => ErrorMetricProxy.h} (70%)

diff --git a/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetric.h b/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h
similarity index 70%
rename from Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetric.h
rename to Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h
index d018ddc4cd9..3e9f47e9bbd 100644
--- a/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetric.h
+++ b/Surface_mesh_approximation/doc/Surface_mesh_approximation/Concepts/ErrorMetricProxy.h
@@ -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;
diff --git a/Surface_mesh_approximation/include/CGAL/L2_metric_plane_proxy.h b/Surface_mesh_approximation/include/CGAL/L2_metric_plane_proxy.h
index 01046cb88e2..83e43c3b347 100644
--- a/Surface_mesh_approximation/include/CGAL/L2_metric_plane_proxy.h
+++ b/Surface_mesh_approximation/include/CGAL/L2_metric_plane_proxy.h
@@ -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`
diff --git a/Surface_mesh_approximation/include/CGAL/VSA_approximation.h b/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
index eed4e6429ce..0bde6eb5ce2 100644
--- a/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
+++ b/Surface_mesh_approximation/include/CGAL/VSA_approximation.h
@@ -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;