diff --git a/BGL/examples/BGL_triangulation_2/data/points.xy b/BGL/examples/BGL_triangulation_2/data/points.xy new file mode 100644 index 00000000000..c755edb71fb --- /dev/null +++ b/BGL/examples/BGL_triangulation_2/data/points.xy @@ -0,0 +1,5 @@ +0 0 +1 0 +0.2 0.2 +0 1 +0 2 diff --git a/BGL/examples/BGL_triangulation_2/dijkstra.cpp b/BGL/examples/BGL_triangulation_2/dijkstra.cpp index d5dc03e08a5..82e0393bbf8 100644 --- a/BGL/examples/BGL_triangulation_2/dijkstra.cpp +++ b/BGL/examples/BGL_triangulation_2/dijkstra.cpp @@ -4,6 +4,7 @@ #include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_2 Point; @@ -44,17 +45,18 @@ typedef boost::associative_property_map VertexIdPropertyMap; VertexIdPropertyMap vertex_index_pmap(vertex_id_map); int -main(int,char*[]) +main(int argc,char* argv[]) { + const char* filename = (argc > 1) ? argv[1] : "data/points.xy"; + std::ifstream input(filename); Triangulation t; Filter is_finite(t); Finite_triangulation ft(t, is_finite, is_finite); - t.insert(Point(0,0)); - t.insert(Point(1,0)); - t.insert(Point(0.2,0.2)); - t.insert(Point(0,1)); - t.insert(Point(0,2)); + Point p ; + while(input >> p){ + t.insert(p); + } vertex_iterator vit, ve; // Associate indices to the vertices diff --git a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp index 0a3d0d7b5c7..9b26686d725 100644 --- a/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp +++ b/BGL/examples/BGL_triangulation_2/dijkstra_with_internal_properties.cpp @@ -5,6 +5,7 @@ #include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_2 Point; @@ -42,17 +43,18 @@ typedef boost::graph_traits::vertex_iterator vertex_iterat int -main(int,char*[]) +main(int argc,char* argv[]) { + const char* filename = (argc > 1) ? argv[1] : "data/points.xy"; + std::ifstream input(filename); Triangulation t; Filter is_finite(t); Finite_triangulation ft(t, is_finite, is_finite); - t.insert(Point(0,0)); - t.insert(Point(1,0)); - t.insert(Point(0.2,0.2)); - t.insert(Point(0,1)); - t.insert(Point(0,2)); + Point p ; + while(input >> p){ + t.insert(p); + } vertex_iterator vit, ve; // associate indices to the vertices diff --git a/BGL/examples/BGL_triangulation_2/emst.cpp b/BGL/examples/BGL_triangulation_2/emst.cpp index 2ce5c8f1817..ca8282d3195 100644 --- a/BGL/examples/BGL_triangulation_2/emst.cpp +++ b/BGL/examples/BGL_triangulation_2/emst.cpp @@ -4,6 +4,7 @@ #include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef K::Point_2 Point; @@ -48,14 +49,16 @@ typedef boost::associative_property_map VertexIdPropertyMap; VertexIdPropertyMap vertex_index_pmap(vertex_id_map); int -main(int,char*[]) +main(int argc,char* argv[]) { + const char* filename = (argc > 1) ? argv[1] : "data/points.xy"; + std::ifstream input(filename); Triangulation t; Filter is_finite(t); Finite_triangulation ft(t, is_finite, is_finite); Point p ; - while(std::cin >> p){ + while(input >> p){ t.insert(p); }