Added the forgotten files

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

Former-commit-id: f5fe0bce1c55e62c87bf0da9be915f081a90e9e7

2 files changed, 7 insertions, 69 deletions

diff --git a/src/Subsampling/include/gudhi/Landmark_choice_by_farthest_point.h b/src/Subsampling/include/gudhi/choose_by_farthest_point.h
index 198c9f9f..61a21f44 100644
--- a/src/Subsampling/include/gudhi/Landmark_choice_by_farthest_point.h
+++ b/src/Subsampling/include/gudhi/choose_by_farthest_point.h
@@ -20,8 +20,8 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LANDMARK_CHOICE_BY_FARTHEST_POINT_H_
-#define LANDMARK_CHOICE_BY_FARTHEST_POINT_H_
+#ifndef CHOOSE_BY_FARTHEST_POINT_H_
+#define CHOOSE_BY_FARTHEST_POINT_H_
 
 #include <gudhi/Spatial_tree_data_structure.h>
 
@@ -29,29 +29,8 @@
 #include <algorithm>  // for sort
 #include <vector>
 #include <random>
-#include <boost/heap/fibonacci_heap.hpp>
 
 namespace Gudhi {
-
-
-  template < typename Point_d,
-             typename Heap,
-             typename Tree,
-             typename Presence_table >
-  void update_heap( Point_d &l,
-                    unsigned nbL,
-                    Heap &heap,
-                    Tree &tree,
-                    Presence_table &table)
-  {
-    auto search = tree.query_incremental_ANN(l);
-    for (auto w: search) {
-      if (table[w.first].first)
-        if (w.second < table[w.first].second->second) {
-          heap.update(table[w.first].second, w);
-        }
-    }
-  }
   
   /** 
    *  \ingroup witness_complex
@@ -69,54 +48,13 @@ namespace Gudhi {
   template < typename Kernel,
              typename Point_container,
              typename OutputIterator>
-  void landmark_choice_by_farthest_point( Kernel& k,
+  void choose_by_farthest_point( Kernel& k,
                                           Point_container const &points,
                                           int nbL,
                                           OutputIterator output_it)
   {
-
-    // typedef typename Kernel::FT FT;
-    // typedef std::pair<unsigned, FT> Heap_node;
-    
-    // struct R_max_compare
-    // {
-    //   bool operator()(const Heap_node &rmh1, const Heap_node &rmh2) const
-    //   {
-    //     return rmh1.second < rmh2.second;
-    //   }
-    // };
-    
-    // typedef boost::heap::fibonacci_heap<Heap_node, boost::heap::compare<R_max_compare>> Heap;
-    // typedef Spatial_tree_data_structure<Kernel, Point_container> Tree;
-    // typedef std::vector< std::pair<bool, Heap_node*> > Presence_table;
-
     typename Kernel::Squared_distance_d sqdist = k.squared_distance_d_object();
     
-  //   Tree tree(points);
-  //   Heap heap;
-  //   Presence_table table(points.size());
-  //   for (auto p: table)
-  //     std::cout << p.first << "\n";
-  //   int number_landmarks = 0; // number of treated landmarks
-
-  //   double curr_max_dist = 0;                                      // used for defining the furhest point from L
-  //   const double infty = std::numeric_limits<double>::infinity();  // infinity (see next entry)
-  //   std::vector< double > dist_to_L(points.size(), infty);         // vector of current distances to L from points
-    
-  //   // Choose randomly the first landmark 
-  //   std::random_device rd;
-  //   std::mt19937 gen(rd());
-  //   std::uniform_int_distribution<> dis(1, 6);
-  //   int curr_landmark = dis(gen);
-    
-  //   do {
-  //     *output_landmarks++ = points[curr_landmark];
-  //     std::cout << curr_landmark << "\n";
-  //     number_landmarks++;
-  //   }
-  //   while (number_landmarks < nbL);
-  // }
-
     int nb_points = boost::size(points);
     assert(nb_points >= nbL);
 
@@ -155,4 +93,4 @@ namespace Gudhi {
   
 }  // namespace Gudhi
 
-#endif  // LANDMARK_CHOICE_BY_FARTHEST_POINT_H_
+#endif  // CHOOSE_BY_FARTHEST_POINT_H_
diff --git a/src/Subsampling/include/gudhi/Landmark_choice_by_random_point.h b/src/Subsampling/include/gudhi/pick_random_points.h
index daa05d1a..9a436ee3 100644
--- a/src/Subsampling/include/gudhi/Landmark_choice_by_random_point.h
+++ b/src/Subsampling/include/gudhi/pick_random_points.h
@@ -20,8 +20,8 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LANDMARK_CHOICE_BY_RANDOM_POINT_H_
-#define LANDMARK_CHOICE_BY_RANDOM_POINT_H_
+#ifndef PICK_RANDOM_POINTS_H_
+#define PICK_RANDOM_POINTS_H_
 
 #include <boost/range/size.hpp>
 
@@ -45,7 +45,7 @@ namespace Gudhi {
 
   template <typename Point_container,
             typename OutputIterator>
-  void landmark_choice_by_random_point(Point_container const &points,
+  void pick_random_points(Point_container const &points,
                                        unsigned nbL,
                                        OutputIterator output_it) {
 #ifdef GUDHI_LM_PROFILING