From 5a0e3ef36e6b06a917e892fb8b29af8e21a2ed86 Mon Sep 17 00:00:00 2001
From: Simon Giraudot <simon.giraudot@geometryfactory.com>
Date: Mon, 26 Sep 2016 15:35:24 +0200
Subject: [PATCH] Update examples and tests

---
 .../examples/Point_set_3/point_set.cpp        | 13 ++++++----
 .../examples/Point_set_3/point_set_algo.cpp   |  1 +
 .../Point_set_3/point_set_read_ply.cpp        |  2 +-
 .../Point_set_3/point_set_read_xyz.cpp        |  4 +---
 .../test/Point_set_3/point_set_test.cpp       | 24 +++++++++++++++++--
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/Point_set_3/examples/Point_set_3/point_set.cpp b/Point_set_3/examples/Point_set_3/point_set.cpp
index 77134f3b23d..cbed5c79dd0 100644
--- a/Point_set_3/examples/Point_set_3/point_set.cpp
+++ b/Point_set_3/examples/Point_set_3/point_set.cpp
@@ -16,7 +16,8 @@ void print_point_set (const Point_set& point_set)
   std::cerr << "Content of point set:" << std::endl;
   for (Point_set::const_iterator it = point_set.begin();
        it != point_set.end(); ++ it)
-    std::cerr << "* Point " << point_set.point(*it) // or point_set[it]
+    std::cerr << "* Point " << *it
+              << ": " << point_set.point(*it) // or point_set[it]
               << " with normal " << point_set.normal(*it)
               << std::endl;
 }
@@ -37,9 +38,10 @@ int main (int, char**)
   print_point_set(point_set); // Normals have default values
 
   // Change normal values
-  point_set.normal(0) = Vector (1., 0., 0.);
-  point_set.normal(1) = Vector (0., 1., 0.);
-  point_set.normal(2) = Vector (0., 0., 1.);
+  Point_set::iterator it = point_set.begin();
+  point_set.normal(*(it++)) = Vector (1., 0., 0.);
+  point_set.normal(*(it++)) = Vector (0., 1., 0.);
+  point_set.normal(*(it++)) = Vector (0., 0., 1.);
 
   // Add point + normal
   point_set.insert (Point (1., 2., 3.), Vector (4., 5., 6.));
@@ -52,7 +54,8 @@ int main (int, char**)
 
   print_point_set(point_set); // New item has default values
 
-  point_set.remove (point_set.begin());
+  point_set.remove (point_set.begin() + 2,
+                    point_set.begin() + 4);
 
   print_point_set(point_set); // New item has default values
   
diff --git a/Point_set_3/examples/Point_set_3/point_set_algo.cpp b/Point_set_3/examples/Point_set_3/point_set_algo.cpp
index ccc72422528..24ff05ced95 100644
--- a/Point_set_3/examples/Point_set_3/point_set_algo.cpp
+++ b/Point_set_3/examples/Point_set_3/point_set_algo.cpp
@@ -1,6 +1,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Point_set_3.h>
 #include <CGAL/Point_set_3/Point_set_processing_3.h>
+#include <CGAL/Point_set_3/IO.h>
 #include <CGAL/grid_simplify_point_set.h>
 
 #include <CGAL/Shape_detection_3.h>
diff --git a/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp b/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp
index df78d559cd4..3d5bbcafa04 100644
--- a/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp
+++ b/Point_set_3/examples/Point_set_3/point_set_read_ply.cpp
@@ -1,6 +1,6 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Point_set_3.h>
-#include <CGAL/Point_set_3/Point_set_processing_3.h>
+#include <CGAL/Point_set_3/IO.h>
 
 #include <fstream>
 #include <limits>
diff --git a/Point_set_3/examples/Point_set_3/point_set_read_xyz.cpp b/Point_set_3/examples/Point_set_3/point_set_read_xyz.cpp
index d365bc662c7..d206bfc88c9 100644
--- a/Point_set_3/examples/Point_set_3/point_set_read_xyz.cpp
+++ b/Point_set_3/examples/Point_set_3/point_set_read_xyz.cpp
@@ -1,8 +1,6 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Point_set_3.h>
-#include <CGAL/IO/read_xyz_points.h>
-#include <CGAL/IO/write_off_points.h>
-#include <CGAL/Point_set_3/Point_set_processing_3.h>
+#include <CGAL/Point_set_3/IO.h>
 
 #include <fstream>
 #include <limits>
diff --git a/Point_set_3/test/Point_set_3/point_set_test.cpp b/Point_set_3/test/Point_set_3/point_set_test.cpp
index ac994dd4ea6..6a1a098b0a1 100644
--- a/Point_set_3/test/Point_set_3/point_set_test.cpp
+++ b/Point_set_3/test/Point_set_3/point_set_test.cpp
@@ -50,11 +50,29 @@ int main (int, char**)
   std::size_t size = point_set.size ();
   point_set.remove_from (first_to_remove);
   test ((point_set.size() + point_set.garbage_size() == size), "sizes before and after removal do not match.");
-  
+ 
+  Point_set::Point_range
+    range = point_set.points();
+
+  {
+    Point_set::const_iterator psit = point_set.begin();
+    bool range_okay = true;
+    for (Point_set::Point_range::const_iterator it = range.begin(); it != range.end(); ++ it)
+      {
+        if (*it != point_set.point (*psit))
+          {
+            range_okay = false;
+            break;
+          }
+        ++ psit;
+      }
+    test (range_okay, "range access does not follow property map based access.");
+  }
+
   test (point_set.has_garbage(), "point set should have garbage.");
   point_set.collect_garbage();
   test (!(point_set.has_garbage()), "point set shouldn't have garbage.");
-  
+
   test (!(point_set.has_property_map<Color> ("color")), "point set shouldn't have colors.");
   typename Point_set::Property_map<Color> color_prop;
   bool garbage;
@@ -81,6 +99,8 @@ int main (int, char**)
   point_set.remove_property_map<Color> (color_prop);
   test (!(point_set.has_property_map<Color> ("color")), "point set shouldn't have colors.");
 
+  
+
   std::cerr << nb_success << "/" << nb_test << " test(s) succeeded." << std::endl;
   
   return EXIT_SUCCESS;