From 0d881dc09227791b337b4eab8d4babb4bdca9376 Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Tue, 16 Jun 2015 14:14:52 +0200 Subject: [PATCH] extract_list_output => list_output --- .../demo/Reconstruction_simplification_2/scene.h | 2 +- .../Reconstruction_simplification_2/rs2_mass_example.cpp | 2 +- .../Reconstruction_simplification_2/rs2_output_example.cpp | 2 +- .../include/CGAL/Reconstruction_simplification_2.h | 4 ++-- .../Reconstruction_simplification_2/test_output_modules.cpp | 2 +- .../test_reconstruction_until.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/scene.h b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/scene.h index ac52e2ac9b4..784a2124697 100644 --- a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/scene.h +++ b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/scene.h @@ -406,7 +406,7 @@ public: std::vector isolated_points; std::vector edges; - m_pwsrec->extract_list_output(std::back_inserter(isolated_points), std::back_inserter(edges)); + m_pwsrec->list_output (std::back_inserter(isolated_points), std::back_inserter(edges)); diff --git a/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_mass_example.cpp b/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_mass_example.cpp index d044c97fafd..60de605d3be 100644 --- a/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_mass_example.cpp +++ b/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_mass_example.cpp @@ -57,7 +57,7 @@ int main () std::vector isolated_vertices; std::vector edges; - rs2.extract_list_output(std::back_inserter(isolated_vertices), std::back_inserter(edges)); + rs2.list_output (std::back_inserter(isolated_vertices), std::back_inserter(edges)); std::cerr << "Isolated vertices" << std::endl; std::vector::iterator vit; diff --git a/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_output_example.cpp b/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_output_example.cpp index 647e638e34b..775c1a7d015 100644 --- a/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_output_example.cpp +++ b/Reconstruction_simplification_2/examples/Reconstruction_simplification_2/rs2_output_example.cpp @@ -34,7 +34,7 @@ void list_output(Rs_2& rs2) std::vector isolated_points; std::vector segments; - rs2.extract_list_output( + rs2.list_output ( std::back_inserter(isolated_points), std::back_inserter(segments)); std::vector::iterator pit; diff --git a/Reconstruction_simplification_2/include/CGAL/Reconstruction_simplification_2.h b/Reconstruction_simplification_2/include/CGAL/Reconstruction_simplification_2.h index e4234280b0e..5c3527eb29c 100644 --- a/Reconstruction_simplification_2/include/CGAL/Reconstruction_simplification_2.h +++ b/Reconstruction_simplification_2/include/CGAL/Reconstruction_simplification_2.h @@ -1502,7 +1502,7 @@ bool create_pedge(const Edge& edge, Rec_edge_2& pedge) { std::vector isolated_points_; std::vector edges; - extract_list_output( + list_output ( std::back_inserter(isolated_points_), std::back_inserter(edges)); // vertices_of_edges @@ -1566,7 +1566,7 @@ bool create_pedge(const Edge& edge, Rec_edge_2& pedge) { \tparam SegmentOutputIterator The output iterator type for storing the edges as segments. */ template - void extract_list_output(PointOutputIterator v_it, SegmentOutputIterator e_it) { + void list_output (PointOutputIterator v_it, SegmentOutputIterator e_it) { for (Vertex_iterator vi = m_dt.vertices_begin(); vi != m_dt.vertices_end(); ++vi) diff --git a/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_output_modules.cpp b/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_output_modules.cpp index 50ce8bc28b8..0ba230056b7 100644 --- a/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_output_modules.cpp +++ b/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_output_modules.cpp @@ -109,7 +109,7 @@ void test_list_output(Rs_2& rs2) { std::vector isolated_points; std::vector edges; - rs2.extract_list_output(std::back_inserter(isolated_points), std::back_inserter(edges)); + rs2.list_output (std::back_inserter(isolated_points), std::back_inserter(edges)); int vertex_count = 0; for (std::vector::iterator it = isolated_points.begin(); diff --git a/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_reconstruction_until.cpp b/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_reconstruction_until.cpp index 9df1c0ff794..f62831c510a 100644 --- a/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_reconstruction_until.cpp +++ b/Reconstruction_simplification_2/test/Reconstruction_simplification_2/test_reconstruction_until.cpp @@ -39,7 +39,7 @@ int main () std::vector isolated_points; std::vector edges; - rs2.extract_list_output(std::back_inserter(isolated_points), std::back_inserter(edges)); + rs2.list_output (std::back_inserter(isolated_points), std::back_inserter(edges)); std::cout << "isolated_points " << isolated_points.size() << std::endl; std::cout << "edges " << edges.size() << std::endl;