Changed the names of files as well

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

Former-commit-id: df3b82dc1d07b5d51b1c1bed4b5abd823129d4a8

3 files changed, 10 insertions, 10 deletions

diff --git a/src/Subsampling/example/example_choose_by_farthest_point.cpp b/src/Subsampling/example/example_choose_n_farthest_points.cpp
index 29ecbf9b..9955d0ec 100644
--- a/src/Subsampling/example/example_choose_by_farthest_point.cpp
+++ b/src/Subsampling/example/example_choose_n_farthest_points.cpp
@@ -1,4 +1,4 @@
-#include <gudhi/choose_by_farthest_point.h>
+#include <gudhi/choose_n_farthest_points.h>
 
 #include <CGAL/Epick_d.h>
 #include <CGAL/Random.h>
@@ -21,7 +21,7 @@ int main (void)
 
   K k;
   std::vector<Point_d> results;
-  Gudhi::subsampling::choose_by_farthest_point(k, points, 100, std::back_inserter(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";
 
diff --git a/src/Subsampling/include/gudhi/choose_by_farthest_point.h b/src/Subsampling/include/gudhi/choose_n_farthest_points.h
index b09192d9..b999213e 100644
--- a/src/Subsampling/include/gudhi/choose_by_farthest_point.h
+++ b/src/Subsampling/include/gudhi/choose_n_farthest_points.h
@@ -20,8 +20,8 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHOOSE_BY_FARTHEST_POINT_H_
-#define CHOOSE_BY_FARTHEST_POINT_H_
+#ifndef CHOOSE_N_FARTHEST_POINTS_H_
+#define CHOOSE_N_FARTHEST_POINTS_H_
 
 #include <boost/range.hpp>
 
@@ -54,7 +54,7 @@ namespace subsampling {
   template < typename Kernel,
              typename Point_container,
              typename OutputIterator>
-  void choose_by_farthest_point( Kernel const &k,
+  void choose_n_farthest_points( Kernel const &k,
                                  Point_container const &input_pts,
                                  unsigned final_size,
                                  unsigned starting_point,
@@ -105,7 +105,7 @@ namespace subsampling {
   template < typename Kernel,
              typename Point_container,
              typename OutputIterator>
-  void choose_by_farthest_point( Kernel& k,
+  void choose_n_farthest_points( Kernel& k,
                                  Point_container const &input_pts,
                                  int final_size,
                                  OutputIterator output_it)
@@ -115,11 +115,11 @@ namespace subsampling {
     std::mt19937 gen(rd());
     std::uniform_int_distribution<> dis(1, 6);
     int starting_point = dis(gen);
-    choose_by_farthest_point(k, input_pts, final_size, starting_point, output_it);
+    choose_n_farthest_points(k, input_pts, final_size, starting_point, output_it);
   }
   
 } // namespace subsampling
   
 }  // namespace Gudhi
 
-#endif  // CHOOSE_BY_FARTHEST_POINT_H_
+#endif  // CHOOSE_N_FARTHEST_POINTS_H_
diff --git a/src/Subsampling/test/test_choose_farthest_point.cpp b/src/Subsampling/test/test_choose_n_farthest_points.cpp
index a1929924..f79a4dfb 100644
--- a/src/Subsampling/test/test_choose_farthest_point.cpp
+++ b/src/Subsampling/test/test_choose_n_farthest_points.cpp
@@ -29,7 +29,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/mpl/list.hpp>
 
-#include <gudhi/choose_by_farthest_point.h>
+#include <gudhi/choose_n_farthest_points.h>
 #include <vector>
 #include <iterator>
 
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(test_choose_farthest_point) {
 
   landmarks.clear();
   K k;
-  Gudhi::subsampling::choose_by_farthest_point(k, points, 100, std::back_inserter(landmarks));
+  Gudhi::subsampling::choose_n_farthest_points(k, points, 100, std::back_inserter(landmarks));
   
   BOOST_CHECK(landmarks.size() == 100);
 }