Merge last trunk modifications and fix new rips interface

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2299 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 1e836cba1a372f609e94b66b6db512817a3d875e

1 files changed, 52 insertions, 0 deletions

diff --git a/src/Spatial_searching/example/example_spatial_searching.cpp b/src/Spatial_searching/example/example_spatial_searching.cpp
new file mode 100644
index 00000000..14b324ae
--- /dev/null
+++ b/src/Spatial_searching/example/example_spatial_searching.cpp
@@ -0,0 +1,52 @@
+#include <gudhi/Kd_tree_search.h>
+
+#include <CGAL/Epick_d.h>
+#include <CGAL/Random.h>
+
+#include <vector>
+
+namespace gss = Gudhi::spatial_searching;
+
+int main(void) {
+  typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K;
+  typedef typename K::Point_d Point;
+  typedef std::vector<Point> Points;
+
+  typedef gss::Kd_tree_search<K, Points> Points_ds;
+
+  CGAL::Random rd;
+
+  Points points;
+  for (int i = 0; i < 500; ++i)
+    points.push_back(Point(rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1), rd.get_double(-1., 1)));
+
+  Points_ds points_ds(points);
+
+  // 10-nearest neighbor query
+  std::cout << "10 nearest neighbors from points[20]:\n";
+  auto knn_range = points_ds.query_k_nearest_neighbors(points[20], 10, true);
+  for (auto const& nghb : knn_range)
+    std::cout << nghb.first << " (sq. dist. = " << nghb.second << ")\n";
+
+  // Incremental nearest neighbor query
+  std::cout << "Incremental nearest neighbors:\n";
+  auto inn_range = points_ds.query_incremental_nearest_neighbors(points[45]);
+  // Get the neighbors in distance order until we hit the first point
+  for (auto ins_iterator = inn_range.begin(); ins_iterator->first != 0; ++ins_iterator)
+    std::cout << ins_iterator->first << " (sq. dist. = " << ins_iterator->second << ")\n";
+
+  // 10-farthest neighbor query
+  std::cout << "10 farthest neighbors from points[20]:\n";
+  auto kfn_range = points_ds.query_k_farthest_neighbors(points[20], 10, true);
+  for (auto const& nghb : kfn_range)
+    std::cout << nghb.first << " (sq. dist. = " << nghb.second << ")\n";
+
+  // Incremental farthest neighbor query
+  std::cout << "Incremental farthest neighbors:\n";
+  auto ifn_range = points_ds.query_incremental_farthest_neighbors(points[45]);
+  // Get the neighbors in distance reverse order until we hit the first point
+  for (auto ifs_iterator = ifn_range.begin(); ifs_iterator->first != 0; ++ifs_iterator)
+    std::cout << ifs_iterator->first << " (sq. dist. = " << ifs_iterator->second << ")\n";
+
+  return 0;
+}