From 4897008e4382a10c831f6095a39a535f493aa1d8 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Sat, 20 Aug 2016 20:11:36 +0200
Subject: [PATCH 1/2] All examples now read from a file

---
 BGL/examples/BGL_triangulation_2/data/points.xy    |  5 +++++
 BGL/examples/BGL_triangulation_2/dijkstra.cpp      | 14 ++++++++------
 .../dijkstra_with_internal_properties.cpp          | 14 ++++++++------
 BGL/examples/BGL_triangulation_2/emst.cpp          |  7 +++++--
 4 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100755 BGL/examples/BGL_triangulation_2/data/points.xy

diff --git a/BGL/examples/BGL_triangulation_2/data/points.xy b/BGL/examples/BGL_triangulation_2/data/points.xy
new file mode 100755
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 <CGAL/boost/graph/dijkstra_shortest_paths.h>
 #include <boost/graph/filtered_graph.hpp>
+#include <fstream>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef K::Point_2 Point;
@@ -44,17 +45,18 @@ typedef boost::associative_property_map<VertexIndexMap> 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 <CGAL/boost/graph/dijkstra_shortest_paths.h>
 #include <boost/graph/filtered_graph.hpp>
+#include <fstream>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef K::Point_2 Point;
@@ -42,17 +43,18 @@ typedef boost::graph_traits<Finite_triangulation>::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 <boost/graph/kruskal_min_spanning_tree.hpp>
 #include <boost/graph/filtered_graph.hpp>
+#include <fstream>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef K::Point_2 Point;
@@ -48,14 +49,16 @@ typedef boost::associative_property_map<VertexIndexMap> 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);
   }
 

From 0c817cdbc586899773b9a5edfd1a07a9f1f5e82d Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Mon, 29 Aug 2016 12:31:26 +0200
Subject: [PATCH 2/2] chmod -x points.xy

---
 BGL/examples/BGL_triangulation_2/data/points.xy | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 BGL/examples/BGL_triangulation_2/data/points.xy

diff --git a/BGL/examples/BGL_triangulation_2/data/points.xy b/BGL/examples/BGL_triangulation_2/data/points.xy
old mode 100755
new mode 100644