From 9899ae167f281d10b1684dfcd02c6838c5bf28df Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Fri, 2 Feb 2018 13:51:45 +0100
Subject: GUDHI 2.1.0 as released by upstream in a tarball.

---
 .../example_witness_complex_sphere.cpp             | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'example/Witness_complex/example_witness_complex_sphere.cpp')

diff --git a/example/Witness_complex/example_witness_complex_sphere.cpp b/example/Witness_complex/example_witness_complex_sphere.cpp
index 124fd99b..a6e9b11a 100644
--- a/example/Witness_complex/example_witness_complex_sphere.cpp
+++ b/example/Witness_complex/example_witness_complex_sphere.cpp
@@ -25,6 +25,7 @@
 #include <gudhi/Simplex_tree.h>
 #include <gudhi/Euclidean_witness_complex.h>
 #include <gudhi/pick_n_random_points.h>
+#include <gudhi/choose_n_farthest_points.h>
 #include <gudhi/reader_utils.h>
 
 #include <CGAL/Epick_d.h>
@@ -41,27 +42,25 @@
 /** Write a gnuplot readable file.
  *  Data range is a random access range of pairs (arg, value)
  */
-template < typename Data_range >
-void write_data(Data_range & data, std::string filename) {
+template <typename Data_range>
+void write_data(Data_range& data, std::string filename) {
   std::ofstream ofs(filename, std::ofstream::out);
-  for (auto entry : data)
-    ofs << entry.first << ", " << entry.second << "\n";
+  for (auto entry : data) ofs << entry.first << ", " << entry.second << "\n";
   ofs.close();
 }
 
-int main(int argc, char * const argv[]) {
+int main(int argc, char* const argv[]) {
   using Kernel = CGAL::Epick_d<CGAL::Dynamic_dimension_tag>;
   using Witness_complex = Gudhi::witness_complex::Euclidean_witness_complex<Kernel>;
 
   if (argc != 2) {
-    std::cerr << "Usage: " << argv[0]
-        << " number_of_landmarks \n";
+    std::cerr << "Usage: " << argv[0] << " number_of_landmarks \n";
     return 0;
   }
 
   int number_of_landmarks = atoi(argv[1]);
 
-  std::vector< std::pair<int, double> > l_time;
+  std::vector<std::pair<int, double> > l_time;
 
   // Generate points
   for (int nbP = 500; nbP < 10000; nbP += 500) {
@@ -75,16 +74,17 @@ int main(int argc, char * const argv[]) {
 
     // Choose landmarks
     start = clock();
-    Gudhi::subsampling::pick_n_random_points(point_vector, number_of_landmarks, std::back_inserter(landmarks));
+    // Gudhi::subsampling::pick_n_random_points(point_vector, number_of_landmarks, std::back_inserter(landmarks));
+    Gudhi::subsampling::choose_n_farthest_points(K(), point_vector, number_of_landmarks,
+                                                 Gudhi::subsampling::random_starting_point,
+                                                 std::back_inserter(landmarks));
 
     // Compute witness complex
-    Witness_complex witness_complex(landmarks,
-                                    point_vector);
+    Witness_complex witness_complex(landmarks, point_vector);
     witness_complex.create_complex(simplex_tree, 0);
     end = clock();
     double time = static_cast<double>(end - start) / CLOCKS_PER_SEC;
-    std::cout << "Witness complex for " << number_of_landmarks << " landmarks took "
-        << time << " s. \n";
+    std::cout << "Witness complex for " << number_of_landmarks << " landmarks took " << time << " s. \n";
     std::cout << "Number of simplices is: " << simplex_tree.num_simplices() << "\n";
     l_time.push_back(std::make_pair(nbP, time));
   }
-- 
cgit v1.2.3