From 9eaeb04023a660564abda7d67edb0bd931b42cb7 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 3 Jun 2019 18:20:42 +0200 Subject: [PATCH] Interpolation --- .../examples/Interpolation/sibson_interpolation_2.cpp | 4 ++-- .../examples/Interpolation/sibson_interpolation_rn_2.cpp | 5 ++--- .../Interpolation/surface_neighbor_coordinates_3.cpp | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Interpolation/examples/Interpolation/sibson_interpolation_2.cpp b/Interpolation/examples/Interpolation/sibson_interpolation_2.cpp index 9402cd4b60d..d902cc15297 100644 --- a/Interpolation/examples/Interpolation/sibson_interpolation_2.cpp +++ b/Interpolation/examples/Interpolation/sibson_interpolation_2.cpp @@ -43,9 +43,9 @@ int main() CGAL:: Data_access(value_function), Traits()); - for(Point_vector_map::iterator it = gradient_function.begin(); it != gradient_function.end(); ++it) + for(const Point_vector_map::value_type& pv : gradient_function) { - std::cout << it->first << " " << it->second << std::endl; + std::cout << pv.first << " " << pv.second << std::endl; } // coordinate computation K::Point_2 p(1.6, 1.4); diff --git a/Interpolation/examples/Interpolation/sibson_interpolation_rn_2.cpp b/Interpolation/examples/Interpolation/sibson_interpolation_rn_2.cpp index 3df9d430340..642329b4b28 100644 --- a/Interpolation/examples/Interpolation/sibson_interpolation_rn_2.cpp +++ b/Interpolation/examples/Interpolation/sibson_interpolation_rn_2.cpp @@ -52,9 +52,8 @@ int main() CGAL::Data_access(value_function), Traits()); - for(Point_vector_map::iterator it = gradient_function.begin(); - it != gradient_function.end(); ++it) { - std::cout << it->first << " " << it->second << std::endl; + for(const Point_vector_map::value_type& pv : gradient_function) { + std::cout << pv.first << " " << pv.second << std::endl; } //coordinate computation diff --git a/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp b/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp index 2a361c1a44f..e200c6cfd30 100644 --- a/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp +++ b/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.cpp @@ -48,9 +48,8 @@ int main() std::cout << "Testing the barycentric property " << std::endl; Point_3 b(0, 0, 0); - for(std::vector< std::pair< Point_3, Coord_type > >::const_iterator - it = coords.begin(); it!=coords.end(); ++it) - b = b + (it->second/norm) * (it->first - CGAL::ORIGIN); + for(const std::pair< Point_3, Coord_type >& pc : coords) + b = b + (pc.second/norm) * (pc.first - CGAL::ORIGIN); std::cout << " weighted barycenter: " << b <