Merge last trunk modification

Fix doc issue
Still doc issue


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

Former-commit-id: 0a99345f06e93a3525691699a6fe1505979e8e8e

4 files changed, 101 insertions, 0 deletions

diff --git a/src/Subsampling/example/CMakeLists.txt b/src/Subsampling/example/CMakeLists.txt
new file mode 100644
index 00000000..54349f0c
--- /dev/null
+++ b/src/Subsampling/example/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 2.6)
+project(Subsampling_examples)
+
+if(CGAL_FOUND)
+  if (NOT CGAL_VERSION VERSION_LESS 4.8.1)
+    if (EIGEN3_FOUND)
+      add_executable(Subsampling_example_pick_n_random_points example_pick_n_random_points.cpp)
+      add_executable(Subsampling_example_choose_n_farthest_points example_choose_n_farthest_points.cpp)
+      add_executable(Subsampling_example_sparsify_point_set example_sparsify_point_set.cpp)
+      target_link_libraries(Subsampling_example_sparsify_point_set ${CGAL_LIBRARY})
+
+      add_test(Subsampling_example_pick_n_random_points
+               ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_pick_n_random_points)
+      add_test(Subsampling_example_choose_n_farthest_points
+               ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_choose_n_farthest_points)
+      add_test(Subsampling_example_sparsify_point_set
+               ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_sparsify_point_set)
+    endif()
+  endif ()
+endif()
diff --git a/src/Subsampling/example/example_choose_n_farthest_points.cpp b/src/Subsampling/example/example_choose_n_farthest_points.cpp
new file mode 100644
index 00000000..533aba74
--- /dev/null
+++ b/src/Subsampling/example/example_choose_n_farthest_points.cpp
@@ -0,0 +1,27 @@
+#include <gudhi/choose_n_farthest_points.h>
+
+#include <CGAL/Epick_d.h>
+#include <CGAL/Random.h>
+
+#include <vector>
+#include <iterator>
+
+int main(void) {
+  typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K;
+  typedef typename K::Point_d Point_d;
+
+  CGAL::Random rd;
+
+  std::vector<Point_d> points;
+  for (int i = 0; i < 500; ++i)
+    points.push_back(Point_d(rd.get_double(-1., 1), rd.get_double(-1., 1),
+                             rd.get_double(-1., 1), rd.get_double(-1., 1)));
+
+  K k;
+  std::vector<Point_d> results;
+  Gudhi::subsampling::choose_n_farthest_points(k, points, 100, std::back_inserter(results));
+  std::cout << "Before sparsification: " << points.size() << " points.\n";
+  std::cout << "After  sparsification: " << results.size() << " points.\n";
+
+  return 0;
+}
diff --git a/src/Subsampling/example/example_pick_n_random_points.cpp b/src/Subsampling/example/example_pick_n_random_points.cpp
new file mode 100644
index 00000000..1e38e405
--- /dev/null
+++ b/src/Subsampling/example/example_pick_n_random_points.cpp
@@ -0,0 +1,27 @@
+#include <gudhi/pick_n_random_points.h>
+
+#include <CGAL/Epick_d.h>
+#include <CGAL/Random.h>
+
+#include <vector>
+#include <iterator>
+
+int main(void) {
+  typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K;
+  typedef typename K::Point_d Point_d;
+
+  CGAL::Random rd;
+
+  std::vector<Point_d> points;
+  for (int i = 0; i < 500; ++i)
+    points.push_back(Point_d(rd.get_double(-1., 1), rd.get_double(-1., 1),
+                             rd.get_double(-1., 1), rd.get_double(-1., 1)));
+
+  K k;
+  std::vector<Point_d> results;
+  Gudhi::subsampling::pick_n_random_points(points, 100, std::back_inserter(results));
+  std::cout << "Before sparsification: " << points.size() << " points.\n";
+  std::cout << "After  sparsification: " << results.size() << " points.\n";
+
+  return 0;
+}
diff --git a/src/Subsampling/example/example_sparsify_point_set.cpp b/src/Subsampling/example/example_sparsify_point_set.cpp
new file mode 100644
index 00000000..b35a18d9
--- /dev/null
+++ b/src/Subsampling/example/example_sparsify_point_set.cpp
@@ -0,0 +1,27 @@
+#include <gudhi/sparsify_point_set.h>
+
+#include <CGAL/Epick_d.h>
+#include <CGAL/Random.h>
+
+#include <vector>
+#include <iterator>
+
+int main(void) {
+  typedef CGAL::Epick_d<CGAL::Dimension_tag<4> > K;
+  typedef typename K::Point_d Point_d;
+
+  CGAL::Random rd;
+
+  std::vector<Point_d> points;
+  for (int i = 0; i < 500; ++i)
+    points.push_back(Point_d(rd.get_double(-1., 1), rd.get_double(-1., 1),
+                             rd.get_double(-1., 1), rd.get_double(-1., 1)));
+
+  K k;
+  std::vector<Point_d> results;
+  Gudhi::subsampling::sparsify_point_set(k, points, 0.4, std::back_inserter(results));
+  std::cout << "Before sparsification: " << points.size() << " points.\n";
+  std::cout << "After  sparsification: " << results.size() << " points.\n";
+
+  return 0;
+}