diff --git a/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt b/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt index 8a80716409d..26601ea5928 100644 --- a/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt +++ b/Surface_mesh_approximation/doc/Surface_mesh_approximation/NamedParameters.txt @@ -133,26 +133,26 @@ set the plane approximated with the PCA algorithm in the meshing step.\n \b Default value is `false` \cgalNPEnd -\cgalNPBegin{facet_proxy_map} \anchor VSA_facet_proxy_map +\cgalNPBegin{face_proxy_map} \anchor VSA_face_proxy_map the property map outputs the proxy index of each face of the input polygon mesh.\n \b Type: a class model of `ReadWritePropertyMap` with `boost::graph_traits::%face_descriptor` as key type and the value type `std::size_t`\n \b Default : if this parameter is omitted, no output operation is performed \cgalNPEnd \cgalNPBegin{proxies} \anchor VSA_proxies -an `OutputIterator` to write proxies in.\n +an `OutputIterator` to put proxies in.\n \b Type : a class model of `OutputIterator` with `CGAL::VSA::L21_metric_vector_proxy_no_area_weighting::Proxy` value type.\n \b Default : if this parameter is omitted, no output operation is performed \cgalNPEnd \cgalNPBegin{anchors} \anchor VSA_anchors -an `OutputIterator` to write anchor points in.\n +an `OutputIterator` to put anchor points in.\n \b Type : a class model of `OutputIterator` with `GeomTraits::%Point_3` value type.\n \b Default : if this parameter is omitted, no output operation is performed \cgalNPEnd \cgalNPBegin{triangles} \anchor VSA_triangles -an `OutputIterator` to write indexed triangles in.\n +an `OutputIterator` to put indexed triangles in.\n \b Type : a class model of `OutputIterator` with `CGAL::cpp11::array` value type.\n \b Default : if this parameter is omitted, no output operation is performed \cgalNPEnd diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_approximation_2_example.cpp b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_approximation_2_example.cpp index 15575b1b995..0bfd5c07ac2 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_approximation_2_example.cpp +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_approximation_2_example.cpp @@ -36,7 +36,7 @@ int main() CGAL::VSA::parameters::min_error_drop(0.05). // seeding with minimum error drop nb_of_iterations(40). // set number of clustering iterations after seeding subdivision_ratio(0.3). // set chord subdivision ratio threshold when meshing - facet_proxy_map(fpxmap). // get facet partition map + face_proxy_map(fpxmap). // get facet partition map proxies(std::back_inserter(proxies)). // output proxies anchors(std::back_inserter(anchors)). // output anchor points triangles(std::back_inserter(triangles))); // output indexed triangles diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_segmentation_example.cpp b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_segmentation_example.cpp index d63fa3b6178..b3ddce69cea 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_segmentation_example.cpp +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/vsa_segmentation_example.cpp @@ -30,7 +30,7 @@ int main() CGAL::VSA::parameters::max_nb_of_proxies(200). // first stop criterion min_error_drop(0.05). // second stop criterion nb_of_iterations(30). // number of relaxation iterations after seeding - facet_proxy_map(fpxmap)); // output facet-proxy map + face_proxy_map(fpxmap)); // output facet-proxy map // iterates over facets and outputs segment id to console BOOST_FOREACH(Face_descriptor f, faces(input)) diff --git a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h index 02ca6a581d4..5e4cc9c6625 100644 --- a/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h +++ b/Surface_mesh_approximation/include/CGAL/Variational_shape_approximation.h @@ -938,12 +938,12 @@ public: * @brief Gets the facet-proxy index map. * @tparam FacetProxyMap `WritablePropertyMap` with * `boost::graph_traits::%face_descriptor` as key and `std::size_t` as value type - * @param[out] facet_proxy_map facet proxy index map + * @param[out] face_proxy_map facet proxy index map */ template - void proxy_map(FacetProxyMap &facet_proxy_map) const { + void proxy_map(FacetProxyMap &face_proxy_map) const { BOOST_FOREACH(face_descriptor f, faces(*m_ptm)) - facet_proxy_map[f] = get(m_fproxy_map, f); + face_proxy_map[f] = get(m_fproxy_map, f); } /*! diff --git a/Surface_mesh_approximation/include/CGAL/approximate_mesh.h b/Surface_mesh_approximation/include/CGAL/approximate_mesh.h index 88eae7a14c9..7e2fc6eaf93 100644 --- a/Surface_mesh_approximation/include/CGAL/approximate_mesh.h +++ b/Surface_mesh_approximation/include/CGAL/approximate_mesh.h @@ -85,7 +85,7 @@ unspecified_type all_default(); * \cgalParamEnd * \cgalParamBegin{pca_plane} set `true` if use PCA plane fitting, otherwise use the default area averaged plane parameters. * \cgalParamEnd - * \cgalParamBegin{facet_proxy_map} a ReadWritePropertyMap with + * \cgalParamBegin{face_proxy_map} a ReadWritePropertyMap with * `boost::graph_traits::%face_descriptor` as key and `std::size_t` as value type. * A proxy is a set of connected facets which are placed under the same proxy patch (see \cgalFigureRef{iterations}). * The proxy-ids are contiguous in range [0, number_of_proxies - 1]. @@ -169,12 +169,12 @@ bool approximate_mesh(const TriangleMesh &tm, const NamedParameters &np) // get proxy map typedef typename boost::lookup_named_param_def< - vsa_np::facet_proxy_map_t, + vsa_np::face_proxy_map_t, NamedParameters, vsa_np::dummy_output_t>::type Face_proxy_map; Face_proxy_map fproxymap = choose_param( - get_param(np, vsa_np::facet_proxy_map), vsa_np::dummy_output); - vsa_np::facet_proxy_map_helper(approx, fproxymap); + get_param(np, vsa_np::face_proxy_map), vsa_np::dummy_output); + vsa_np::face_proxy_map_helper(approx, fproxymap); if (!boost::is_same::value && (vl == CGAL::VSA::Main_steps || vl == CGAL::VSA::Verbose)) diff --git a/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/named_params_helper.h b/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/named_params_helper.h index 8ca11df0f55..dadb0e0b6fc 100644 --- a/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/named_params_helper.h +++ b/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/named_params_helper.h @@ -76,12 +76,12 @@ public: // output helper functions template -void facet_proxy_map_helper(const Approximation &approx, FacetProxyMap fproxymap) { +void face_proxy_map_helper(const Approximation &approx, FacetProxyMap fproxymap) { approx.proxy_map(fproxymap); } template -void facet_proxy_map_helper(const Approximation &, internal_np::dummy_output_t) {} +void face_proxy_map_helper(const Approximation &, internal_np::dummy_output_t) {} // proxies diff --git a/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h b/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h index ce344a688e1..e2db5ca42ab 100644 --- a/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h +++ b/Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/parameters_interface.h @@ -17,7 +17,7 @@ CGAL_add_named_parameter(optimize_anchor_location_t, optimize_anchor_location, o CGAL_add_named_parameter(pca_plane_t, pca_plane, pca_plane) // output parameters -CGAL_add_named_parameter(facet_proxy_map_t, facet_proxy_map, facet_proxy_map) +CGAL_add_named_parameter(face_proxy_map_t, face_proxy_map, face_proxy_map) CGAL_add_named_parameter(proxies_t, proxies, proxies) CGAL_add_named_parameter(anchors_t, anchors, anchors) CGAL_add_named_parameter(triangles_t, triangles, triangles) diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_approximation_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_approximation_test.cpp index ef3b1ae9fb9..292e16ac48c 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_approximation_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_approximation_test.cpp @@ -35,7 +35,7 @@ int main() nb_of_iterations(30). nb_of_relaxations(5). subdivision_ratio(0.5). - facet_proxy_map(fpxmap). + face_proxy_map(fpxmap). proxies(std::back_inserter(proxies)). anchors(std::back_inserter(points)). triangles(std::back_inserter(triangles))); diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_segmentation_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_segmentation_test.cpp index 557ec7ab6d9..6e21c81d31d 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_segmentation_test.cpp +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_segmentation_test.cpp @@ -37,7 +37,7 @@ int main() min_error_drop(0.05). // and minimum error drop stop criterion are specified nb_of_iterations(30). // number of clustering iterations after seeding nb_of_relaxations(5). // number of relaxations in seeding - facet_proxy_map(fpxmap). // output indexed face set + face_proxy_map(fpxmap). // output indexed face set proxies(std::back_inserter(proxies))); // number of iterations after seeding return EXIT_SUCCESS;